mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-03 08:19:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correction in display of notifications archive

Browse Source
This commit is contained in:
bergware
2017-09-03 22:54:18 +02:00
parent 84838c7cef
commit 30723543d0
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/NotificationsArchive.page
+2 -2
View File
@@ -80,7 +80,7 @@ $(function(){
// Adjust the width of thead cells when window resizes
</script>
<table class="tablesorter left shift" id="archive_table">
<thead><tr><th>Time</th><th>Event</th><th>Subject</th><th>Description</th><th>Importance</th><th style="text-align:right"><?if ($files):?><a href="#" onclick="askConfirmation();return false" title="Delete all notifications"><i class="fa fa-trash"></i></a><?endif;?></th></tr></thead>
<tbody id="archive_list"><tr><td colspan="5" style="text-align:center;padding-top:12px"><i class='fa fa-spinner fa-spin icon'></i><em>Please wait, loading information ...</em></td></tr></tbody>
<thead><tr><th>Time</th><th>Event</th><th>Subject</th><th>Description</th><th>Importance</th><th><?if ($files):?><a href="#" onclick="askConfirmation();return false" title="Delete all notifications"><i class="fa fa-trash"></i></a><?endif;?></th></tr></thead>
<tbody id="archive_list"><tr><td></td><td colspan="4" style="text-align:center;padding-top:12px"><i class='fa fa-spinner fa-spin icon'></i><em>Please wait, loading information ...</em></td><td></td></tr></tbody>
</table>
<input type="button" value="Done" onclick="done()">
plugins/dynamix/include/NotificationsArchive.php
+4 -4
View File
@@ -34,15 +34,15 @@ foreach ($files as $file) {
foreach ($fields as $field) {
if ($c==5) break;
$text = $field ? explode('=',$field,2)[1] : "-";
$tag = $c<4 ? "" : " data='".str_replace(['alert','warning','normal'],['0','1','2'],$text)."'";
$tag = ($c<4) ? "" : " data='".str_replace(['alert','warning','normal'],['0','1','2'],$text)."'";
echo (!$c++) ? "<tr>".str_replace('*',$text,$td_).date($dynamix['notify']['date'].' '.$dynamix['notify']['time'],$text)."$_td" : "<td$tag>$text</td>";
}
echo "<td style='text-align:right'><a href='#' onclick='$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){archiveList();});return false' title='Delete notification'><i class='fa fa-trash-o'></i></a></td></tr>";
echo "<td><a href='#' onclick='$.post(\"/webGui/include/DeleteLogFile.php\",{log:\"$archive\"},function(){archiveList();});return false' title='Delete notification'><i class='fa fa-trash-o'></i></a></td></tr>";
if ($extra) {
$text = explode('=',$field,2)[1];
echo "<tr class='tablesorter-childRow row$row'><td colspan='5'>$text</td></tr><tr class='tablesorter-childRow row$row'><td colspan='5'></td></tr>";
echo "<tr class='tablesorter-childRow row$row'><td colspan='4'>$text</td><td></td></tr><tr class='tablesorter-childRow row$row'><td colspan='5'></td></tr>";
$row++;
}
}
if ($empty) echo "<tr><td colspan='6' style='text-align:center;padding-top:12px'><em>No notifications present</em></td></tr>";
if ($empty) echo "<tr><td></td><td colspan='4' style='text-align:center;padding-top:12px'><em>No notifications present</em></td><td></td></tr>";
?>
plugins/dynamix/styles/dynamix-azure.css
+5 -1
View File
@@ -56,15 +56,19 @@ table.tablesorter thead tr .tablesorter-headerAsc{background-image:url(../images
table.tablesorter thead tr .tablesorter-headerDesc{background-image:url(../images/sort-desc.png)}
table.tablesorter thead tr .tablesorter-headerAsc, table.tablesorter thead tr .tablesorter-headerDesc{background-color:#EDEAEF}
table.tablesorter tbody tr{border-bottom:#EDEAEF 1px solid}
table.tablesorter tbody tr.tablesorter-childRow{border-bottom:none}
table.tablesorter tbody tr.tr_last{border-bottom:1px solid #606E7F}
table.tablesorter tbody tr.tr_last td{padding:8px 20px 8px 6px}
table.tablesorter tbody tr td{padding:4px 20px 4px 6px;vertical-align:middle;text-align:justify}
table.tablesorter.left tbody td{text-align:left}
table.tablesorter.plugins td:first-child{width:64px;text-align:center}
table.tablesorter.plugins tr>td+td+td{width:9%;white-space:nowrap}
table.tablesorter.plugins td:last-child{width:96px;padding:0}
table.tablesorter .desc_readmore strong,table.tablesorter .desc_readmore h4{font-size:13px}
table.tablesorter .desc_readmore h4,table.tablesorter .desc_readmore p:first-child{margin:0}
table.tablesorter.left th,table.tablesorter.left td{text-align:left;width:20%}
table.tablesorter.left th:first-child,table.tablesorter.left td:first-child{width:8%}
table.tablesorter.left th:nth-last-child(2),table.tablesorter.left td:nth-last-child(2){width:8%}
table.tablesorter.left th:last-child,table.tablesorter.left td:last-child{text-align:right;width:4%}
table.tablesorter.shift{margin-top:10px}
table.tablesorter.kvm{display:block;padding-top:24px}
table.tablesorter thead.fixed{display:table;width:100%}
plugins/dynamix/styles/dynamix-black.css
+4 -1
View File
@@ -57,10 +57,13 @@ table.tablesorter tbody tr:nth-child(even){background-color:#0C0C0C}
table.tablesorter tbody tr.tr_last{background:#181818;border-top:1px solid #202020;border-bottom:1px solid #202020}
table.tablesorter tbody tr.tr_last td{padding:8px 20px 8px 6px}
table.tablesorter tbody td{padding:4px 20px 4px 6px;vertical-align:middle;text-align:justify}
table.tablesorter.left tbody td{text-align:left}
table.tablesorter.plugins td:first-child{width:64px;text-align:center}
table.tablesorter.plugins tr>td+td+td{width:9%;white-space:nowrap}
table.tablesorter.plugins td:last-child{width:96px;padding:0}
table.tablesorter.left th,table.tablesorter.left td{text-align:left;width:20%}
table.tablesorter.left th:first-child,table.tablesorter.left td:first-child{width:8%}
table.tablesorter.left th:nth-last-child(2),table.tablesorter.left td:nth-last-child(2){width:8%}
table.tablesorter.left th:last-child,table.tablesorter.left td:last-child{text-align:right;width:4%}
table.tablesorter.shift{margin-top:-21px}
table.tablesorter thead.fixed{display:table;width:100%}
table.tablesorter tbody.fixed{display:block;overflow:auto}
plugins/dynamix/styles/dynamix-gray.css
+5 -1
View File
@@ -56,15 +56,19 @@ table.tablesorter thead tr .tablesorter-headerAsc{background-image:url(../images
table.tablesorter thead tr .tablesorter-headerDesc{background-image:url(../images/sort-desc.png)}
table.tablesorter thead tr .tablesorter-headerAsc, table.tablesorter thead tr .tablesorter-headerDesc{background-color:#121510}
table.tablesorter tbody tr{border-bottom:#121510 1px solid}
table.tablesorter tbody tr.tablesorter-childRow{border-bottom:none}
table.tablesorter tbody tr.tr_last{border-bottom:1px solid #606E7F}
table.tablesorter tbody tr.tr_last td{padding:8px 20px 8px 6px}
table.tablesorter tbody tr td{padding:4px 20px 4px 6px;vertical-align:middle;text-align:justify}
table.tablesorter.left tbody td{text-align:left}
table.tablesorter.plugins td:first-child{width:64px;text-align:center}
table.tablesorter.plugins tr>td+td+td{width:9%;white-space:nowrap}
table.tablesorter.plugins td:last-child{width:96px;padding:0}
table.tablesorter .desc_readmore strong,table.tablesorter .desc_readmore h4{font-size:13px}
table.tablesorter .desc_readmore h4,table.tablesorter .desc_readmore p:first-child{margin:0}
table.tablesorter.left th,table.tablesorter.left td{text-align:left;width:20%}
table.tablesorter.left th:first-child,table.tablesorter.left td:first-child{width:8%}
table.tablesorter.left th:nth-last-child(2),table.tablesorter.left td:nth-last-child(2){width:8%}
table.tablesorter.left th:last-child,table.tablesorter.left td:last-child{text-align:right;width:4%}
table.tablesorter.shift{margin-top:10px}
table.tablesorter.kvm{display:block;padding-top:24px}
table.tablesorter thead.fixed{display:table;width:100%}
plugins/dynamix/styles/dynamix-white.css
+4 -1
View File
@@ -57,10 +57,13 @@ table.tablesorter tbody tr:nth-child(even){background-color:#F8F8F8}
table.tablesorter tbody tr.tr_last{background:#F0F0F0;border-top:1px solid #E8E8E8;border-bottom:1px solid #E8E8E8}
table.tablesorter tbody tr.tr_last td{padding:8px 20px 8px 6px}
table.tablesorter tbody td{padding:4px 20px 4px 6px;vertical-align:middle;text-align:justify}
table.tablesorter.left tbody td{text-align:left}
table.tablesorter.plugins td:first-child{width:64px;text-align:center}
table.tablesorter.plugins tr>td+td+td{width:9%;white-space:nowrap}
table.tablesorter.plugins td:last-child{width:96px;padding:0}
table.tablesorter.left th,table.tablesorter.left td{text-align:left;width:20%}
table.tablesorter.left th:first-child,table.tablesorter.left td:first-child{width:8%}
table.tablesorter.left th:nth-last-child(2),table.tablesorter.left td:nth-last-child(2){width:8%}
table.tablesorter.left th:last-child,table.tablesorter.left td:last-child{text-align:right;width:4%}
table.tablesorter.shift{margin-top:-21px}
table.tablesorter thead.fixed{display:table;width:100%}
table.tablesorter tbody.fixed{display:block;overflow:auto}