gui: Add folder label to global changes, use bootstrap table (fixes #4828) (#4838)

This commit is contained in:
Audrius Butkevicius 2018-03-26 10:29:06 +01:00 committed by Jakob Borg
parent a5e40563de
commit 3c920c61e9
2 changed files with 10 additions and 21 deletions

View File

@ -271,21 +271,6 @@ ul.three-columns li, ul.two-columns li {
z-index: 980; z-index: 980;
} }
.globalChanges-path-col {
/* These are technically the same, but use both */
overflow-wrap: break-word;
word-wrap: break-word;
-ms-word-break: break-all;
/* This is the dangerous one in WebKit, as it breaks things wherever */
word-break: break-all;
/* Instead use this non-standard one: */
word-break: break-word;
}
.globalChanges-time-col {
width: 100px;
}
/** Footer nav on small devices **/ /** Footer nav on small devices **/
@media (max-width: 1199px) { @media (max-width: 1199px) {
/* Stay at the end of the page, with space reserved for the footer /* Stay at the end of the page, with space reserved for the footer

View File

@ -1,27 +1,31 @@
<style> th, td { padding: 6px; } </style> <style> th, td { padding: 6px; } </style>
<modal id="globalChanges" status="default" icon="{{'info-circle'}}" heading="{{'Recent Changes' | translate}}" large="yes" closeable="yes"> <modal id="globalChanges" status="default" icon="{{'info-circle'}}" heading="{{'Recent Changes' | translate}}" large="yes" closeable="yes">
<div class="modal-body"> <div class="modal-body">
<table> <div class="table-responsive">
<thead> <table class="table-condensed table-striped table" style="table-layout: auto;">
<thead>
<tr> <tr>
<th translate>Device</th> <th translate>Device</th>
<th translate>Action</th> <th translate>Action</th>
<th translate>Type</th> <th translate>Type</th>
<th translate>Folder</th>
<th translate>Path</th> <th translate>Path</th>
<th translate>Time</th> <th translate>Time</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="changeEvent in globalChangeEvents"> <tr ng-repeat="changeEvent in globalChangeEvents">
<td ng-if="changeEvent.data.modifiedBy">{{friendlyNameFromShort(changeEvent.data.modifiedBy)}}</td> <td ng-if="changeEvent.data.modifiedBy">{{friendlyNameFromShort(changeEvent.data.modifiedBy)}}</td>
<td ng-if="!changeEvent.data.modifiedBy"><span translate>Unknown</span></td> <td ng-if="!changeEvent.data.modifiedBy"><span translate>Unknown</span></td>
<td>{{changeEvent.data.action}}</td> <td>{{changeEvent.data.action}}</td>
<td>{{changeEvent.data.type}}</td> <td>{{changeEvent.data.type}}</td>
<td class="globalChanges-path-col">{{changeEvent.data.path}}</td> <td class="no-overflow-ellipse">{{changeEvent.data.label}}</td>
<td class="globalChanges-time-col">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td> <td class="no-overflow-ellipse">{{changeEvent.data.path}}</td>
<td class="no-overflow-ellipse">{{changeEvent.time | date:"yyyy-MM-dd HH:mm:ss"}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal"> <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">