mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-01 15:29:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Notifications: refinement

Browse Source 
- Restore Detailed / Summarized view
- Show messages in groups of 10
- Support hyperlink in messages
This commit is contained in:
bergware
2023-02-11 13:38:09 +01:00
parent 479aae8d9a
commit ca5ab7e5e5
7 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/Notifications.page
+8
View File
@@ -115,6 +115,14 @@ $(function(){
<input type="hidden" name="docker_notify">
<input type="hidden" name="language_notify">
<input type="hidden" name="report">
_(Notifications display)_:
: <select class="a" name="display">
<?=mk_option($notify['display'], "0", _("Detailed"))?>
<?=mk_option($notify['display'], "1", _("Summarized"))?>
</select>
:notifications_display_help:
_(Date format)_:
: <select name="date" class="a">
<?=mk_option($notify['date'], "d-m-Y", _("DD-MM-YYYY"))?>
plugins/dynamix/include/DefaultPageLayout.php
+16 -13
View File
@@ -521,16 +521,17 @@ function digits(number) {
return 'three';
}
function openNotifier(filter) {
$.post('/webGui/include/Notify.php',{cmd:'get',csrf_token:csrf_token},function(json) {
var data = $.parseJSON(json);
$.each(data, function(i, notify) {
if (notify.importance == filter) {
$.post('/webGui/include/Notify.php',{cmd:'get',csrf_token:csrf_token},function(msg) {
$.each($.parseJSON(msg), function(i, notify) {
if (notify.importance==filter) {
$.jGrowl(notify.subject+'<br>'+notify.description, {
group: notify.importance,
header: notify.event+': '+notify.timestamp,
theme: notify.file,
sticky: true,
beforeOpen: function(e,m,o){if ($('div.jGrowl-notification').hasClass(notify.file)) return(false);},
afterOpen: function(e,m,o){if (notify.link) $(e).css('cursor','pointer');},
click: function(e,m,o){if (notify.link) location.replace(notify.link);},
close: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});}
});
}
@@ -538,10 +539,9 @@ function openNotifier(filter) {
});
}
function closeNotifier(filter) {
$.post('/webGui/include/Notify.php',{cmd:'get',csrf_token:csrf_token},function(json) {
var data = $.parseJSON(json);
$.each(data, function(i, notify) {
if (notify.importance == filter) $.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});
$.post('/webGui/include/Notify.php',{cmd:'get',csrf_token:csrf_token},function(msg) {
$.each($.parseJSON(msg), function(i, notify) {
if (notify.importance==filter) $.post('/webGui/include/Notify.php',{cmd:'archive',file:notify.file,csrf_token:csrf_token});
});
$('div.jGrowl').find('.'+filter).find('div.jGrowl-close').trigger('click');
});
@@ -562,9 +562,11 @@ $(function() {
updateTime();
$.jGrowl.defaults.closeTemplate = '<i class="fa fa-close"></i>';
$.jGrowl.defaults.closerTemplate = '<?=$notify['position'][0]=='b' ? '<div class="bottom">':'<div class="top">'?>[ <?=_("close all notifications")?> ]</div>';
$.jGrowl.defaults.check = 100;
$.jGrowl.defaults.position = '<?=$notify['position']?>';
$.jGrowl.defaults.theme = '';
$.jGrowl.defaults.themeState = '';
$.jGrowl.defaults.pool = 10;
$.jGrowl.defaults.life = 3000;
Shadowbox.setup('a.sb-enable', {modal:true});
// add any pre-existing reboot notices
$.post('/webGui/include/Report.php',{cmd:'notice'},function(notices){
@@ -830,24 +832,25 @@ defaultPage.on('message', function(msg,meta) {
case 2:
// notifications
var orb1 = 0, orb2 = 0, orb3 = 0;
var data = $.parseJSON(msg);
$.each(data, function(i, notify) {
$.each($.parseJSON(msg), function(i, notify) {
switch (notify.importance) {
case 'alert' : orb1++; break;
case 'warning': orb2++; break;
case 'normal' : orb3++; break;
}
<?if ($notify['display']==0):?>
if (notify.show) {
$.jGrowl(notify.subject+'<br>'+notify.description, {
group: notify.importance,
header: notify.event+': '+notify.timestamp,
theme: notify.file,
click: function(e,m,o) {if (notify.link) location.replace(notify.link);},
beforeOpen: function(e,m,o){if ($('div.jGrowl-notification').hasClass(notify.file)) return(false);},
afterOpen: function(e,m,o){if (notify.link) $(e).css("cursor","pointer");},
afterOpen: function(e,m,o){if (notify.link) $(e).css('cursor','pointer');},
click: function(e,m,o){if (notify.link) location.replace(notify.link);},
close: function(e,m,o){$.post('/webGui/include/Notify.php',{cmd:'hide',file:"<?=$notify['path'].'/unread/'?>"+notify.file,csrf_token:csrf_token});}
});
}
<?endif;?>
});
if (orb1) $('#orb1').removeClass('grey-orb').addClass('red-orb'); else $('#orb1').removeClass('red-orb').addClass('grey-orb');
if (orb2) $('#orb2').removeClass('grey-orb').addClass('yellow-orb'); else $('#orb2').removeClass('yellow-orb').addClass('grey-orb');
plugins/dynamix/scripts/notify
+1 -1
View File
@@ -229,7 +229,7 @@ case 'get':
usort($files, function($a,$b){return filemtime($a)-filemtime($b);});
$i = 0;
foreach ($files as $file) {
$fields = preg_split('/\n/', file_get_contents($file));
$fields = file($file,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
$time = true;
$output[$i]['file'] = basename($file);
$output[$i]['show'] = fileperms($file)==32768 ? 0 : 1;
plugins/dynamix/styles/dynamix-azure.css
+9 -9
View File
@@ -1,4 +1,4 @@
.jGrowl{position:fixed;z-index:9999;font-size:1.3rem}
.jGrowl{position:fixed;font-size:1.3rem}
.jGrowl.top-left{left:10px;top:90px}
.jGrowl.top-right{right:10px;top:90px}
.jGrowl.bottom-left{left:10px;bottom:24px}
@@ -11,17 +11,17 @@
.jGrowl-notification.default{color:#42453e;background-color:#808080;opacity:0.96;border:1px solid #42453e;box-shadow:2px 2px 1px #888888}
.jGrowl-notification{min-height:4rem;width:380px;padding:10px;margin:5px 0;text-align:left;border-radius:6px}
.jGrowl-notification .jGrowl-header{font-weight:bold}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.7rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.8rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close:hover{color:inherit;background:none}
.jGrowl-closer{width:400px;color:#808080;background-color:#121510;opacity:0.96;border:2px solid #b0b0b0;margin:5px 0;padding:4px 0;cursor:pointer;font-weight:bold;text-align:center;border-radius:6px}
.jGrowl-closer.top{position:fixed;top:130px}
#jGrowl {pointer-events: none !important;}
.jGrowl-notification:first-of-type {pointer-events: none !important;}
.jGrowl-notification {pointer-events:all !important;}
.jGrowl-closer.top {pointer-events:all !important;}
.jGrowl-closer.bottom {pointer-events:all !important;}
#jGrowl{pointer-events:none!important}
.jGrowl-notification:first-of-type{pointer-events:none!important}
.jGrowl-notification{pointer-events:all!important}
.jGrowl-closer.top{pointer-events:all!important}
.jGrowl-closer.bottom{pointer-events:all!important}
@media print{.jGrowl{display:none}}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg, transparent 60%, #606e7f 40%),linear-gradient(113.4deg, #606e7f 40%, transparent 60%);background-position:calc(100% - 8px),calc(100% - 4px);background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #606e7f;outline:none;height:3rem;line-height:3rem;cursor:pointer}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg,transparent 60%,#606e7f 40%),linear-gradient(113.4deg,#606e7f 40%,transparent 60%);background-position:calc(100% - 8px),calc(100% - 4px);background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #606e7f;outline:none;height:3rem;line-height:3rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:1px solid #606E7F;display:inline-block;cursor:pointer;padding:1px 14px 1px 6px}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 14px 1px 6px}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
@@ -63,7 +63,7 @@ table.tablesorter thead tr th{text-transform:uppercase;font-weight:normal;letter
table.tablesorter thead tr .tablesorter-header{background-repeat:no-repeat;background-position:center right;cursor:pointer}
table.tablesorter thead tr .tablesorter-headerAsc{background-image:url(../images/sort-asc.png)}
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:#e4e2e4}
table.tablesorter thead tr .tablesorter-headerAsc,table.tablesorter thead tr .tablesorter-headerDesc{background-color:#e4e2e4}
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}
plugins/dynamix/styles/dynamix-black.css
+9 -9
View File
@@ -1,4 +1,4 @@
.jGrowl{position:fixed;z-index:9999;font-size:1.3rem}
.jGrowl{position:fixed;font-size:1.3rem}
.jGrowl.top-left{left:10px;top:130px}
.jGrowl.top-right{right:10px;top:130px}
.jGrowl.bottom-left{left:10px;bottom:24px}
@@ -11,17 +11,17 @@
.jGrowl-notification.default{color:#42453e;background-color:#808080;opacity:0.96;border:1px solid #42453e;box-shadow:2px 2px 1px #888888}
.jGrowl-notification{min-height:1.2rem;width:380px;padding:10px;margin:5px 0;text-align:left;border-radius:6px}
.jGrowl-notification .jGrowl-header{font-weight:bold}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.7rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.8rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close:hover{color:inherit;background:none}
.jGrowl-closer{width:400px;color:#808080;background-color:#121510;opacity:0.96;border:2px solid #b0b0b0;margin:5px 0;padding:4px 0;cursor:pointer;font-weight:bold;text-align:center;border-radius:6px}
.jGrowl-closer.top{position:fixed;top:130px}
#jGrowl {pointer-events: none !important;}
.jGrowl-notification:first-of-type {pointer-events: none !important;}
.jGrowl-notification {pointer-events:all !important;}
.jGrowl-closer.top {pointer-events:all !important;}
.jGrowl-closer.bottom {pointer-events:all !important;}
#jGrowl{pointer-events:none!important}
.jGrowl-notification:first-of-type{pointer-events:none!important}
.jGrowl-notification{pointer-events:all!important}
.jGrowl-closer.top{pointer-events:all!important}
.jGrowl-closer.bottom{pointer-events:all!important}
@media print{.jGrowl{display:none}}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg, transparent 60%, #f2f2f2 40%),linear-gradient(113.4deg, #f2f2f2 40%, transparent 60%);background-position:calc(100% - 4px),100%;background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #f2f2f2;outline:none;height:2.5rem;line-height:2.5rem;cursor:pointer}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg,transparent 60%,#f2f2f2 40%),linear-gradient(113.4deg,#f2f2f2 40%,transparent 60%);background-position:calc(100% - 4px),100%;background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #f2f2f2;outline:none;height:2.5rem;line-height:2.5rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:none;border-bottom:1px solid #f2f2f2;outline:none;display:inline-block;cursor:pointer;padding:1px 0}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 0}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
@@ -63,7 +63,7 @@ table.tablesorter thead tr th{font-weight:normal;font-size:1.1rem;text-transform
table.tablesorter thead tr .tablesorter-header{background-repeat:no-repeat;background-position:center right;cursor:pointer}
table.tablesorter thead tr .tablesorter-headerAsc{background-image:url(../images/sort-asc.png)}
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:#262626}
table.tablesorter thead tr .tablesorter-headerAsc,table.tablesorter thead tr .tablesorter-headerDesc{background-color:#262626}
table.tablesorter tbody tr:nth-child(even){background-color:#212121}
table.tablesorter.four tbody tr:nth-child(4n-1){background-color:#212121}
table.tablesorter tbody tr.tr_last{background-color:#212121;border-top:1px solid #2b2b2b;border-bottom:1px solid #2b2b2b}
plugins/dynamix/styles/dynamix-gray.css
+9 -9
View File
@@ -1,4 +1,4 @@
.jGrowl{position:fixed;z-index:9999;font-size:1.3rem}
.jGrowl{position:fixed;font-size:1.3rem}
.jGrowl.top-left{left:10px;top:90px}
.jGrowl.top-right{right:10px;top:90px}
.jGrowl.bottom-left{left:10px;bottom:24px}
@@ -11,17 +11,17 @@
.jGrowl-notification.default{color:#42453e;background-color:#808080;opacity:0.96;border:1px solid #42453e;box-shadow:2px 2px 1px #888888}
.jGrowl-notification{min-height:4rem;width:380px;padding:10px;margin:5px 0;text-align:left;border-radius:6px}
.jGrowl-notification .jGrowl-header{font-weight:bold}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.7rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.8rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close:hover{color:inherit;background:none}
.jGrowl-closer{width:400px;color:#808080;background-color:#121510;opacity:0.96;border:2px solid #b0b0b0;margin:5px 0;padding:4px 0;cursor:pointer;font-weight:bold;text-align:center;border-radius:6px}
.jGrowl-closer.top{position:fixed;top:130px}
#jGrowl {pointer-events: none !important;}
.jGrowl-notification:first-of-type {pointer-events: none !important;}
.jGrowl-notification {pointer-events:all !important;}
.jGrowl-closer.top {pointer-events:all !important;}
.jGrowl-closer.bottom {pointer-events:all !important;}
#jGrowl{pointer-events:none!important}
.jGrowl-notification:first-of-type{pointer-events:none!important}
.jGrowl-notification{pointer-events:all!important}
.jGrowl-closer.top{pointer-events:all!important}
.jGrowl-closer.bottom{pointer-events:all!important}
@media print{.jGrowl{display:none}}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg, transparent 60%, #606e7f 40%),linear-gradient(113.4deg, #606e7f 40%, transparent 60%);background-position:calc(100% - 8px),calc(100% - 4px);background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #606e7f;outline:none;height:3rem;line-height:3rem;cursor:pointer}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg,transparent 60%,#606e7f 40%),linear-gradient(113.4deg,#606e7f 40%,transparent 60%);background-position:calc(100% - 8px),calc(100% - 4px);background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #606e7f;outline:none;height:3rem;line-height:3rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:1px solid #606E7F;display:inline-block;cursor:pointer;padding:1px 14px 1px 6px}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 14px 1px 6px}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
@@ -63,7 +63,7 @@ table.tablesorter thead tr th{text-transform:uppercase;font-weight:normal;letter
table.tablesorter thead tr .tablesorter-header{background-repeat:no-repeat;background-position:center right;cursor:pointer}
table.tablesorter thead tr .tablesorter-headerAsc{background-image:url(../images/sort-asc.png)}
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:#1b1d1b}
table.tablesorter thead tr .tablesorter-headerAsc,table.tablesorter thead tr .tablesorter-headerDesc{background-color:#1b1d1b}
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}
plugins/dynamix/styles/dynamix-white.css
+9 -9
View File
@@ -1,4 +1,4 @@
.jGrowl{position:fixed;z-index:9999;font-size:1.3rem}
.jGrowl{position:fixed;font-size:1.3rem}
.jGrowl.top-left{left:10px;top:130px}
.jGrowl.top-right{right:10px;top:130px}
.jGrowl.bottom-left{left:10px;bottom:24px}
@@ -11,17 +11,17 @@
.jGrowl-notification.default{color:#42453e;background-color:#808080;opacity:0.96;border:1px solid #42453e;box-shadow:2px 2px 1px #888888}
.jGrowl-notification{min-height:1.2rem;width:380px;padding:10px;margin:5px 0;text-align:left;border-radius:6px}
.jGrowl-notification .jGrowl-header{font-weight:bold}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.7rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close{float:right;text-align:right;margin:0;padding:0;background:none;color:inherit;border:none;cursor:pointer;font-size:1.8rem;min-width:auto;margin-left:2rem;line-height:1}
.jGrowl-notification .jGrowl-close:hover{color:inherit;background:none}
#jGrowl {pointer-events: none !important;}
.jGrowl-notification:first-of-type {pointer-events: none !important;}
.jGrowl-notification {pointer-events:all !important;}
.jGrowl-closer.top {pointer-events:all !important;}
.jGrowl-closer.bottom {pointer-events:all !important;}
#jGrowl{pointer-events:none!important}
.jGrowl-notification:first-of-type{pointer-events:none!important}
.jGrowl-notification{pointer-events:all!important}
.jGrowl-closer.top{pointer-events:all!important}
.jGrowl-closer.bottom{pointer-events:all!important}
.jGrowl-closer{width:400px;color:#808080;background-color:#121510;opacity:0.96;border:2px solid #b0b0b0;margin:5px 0;padding:4px 0;cursor:pointer;font-weight:bold;text-align:center;border-radius:6px}
.jGrowl-closer.top{position:fixed;top:130px}
@media print{.jGrowl{display:none}}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg, transparent 60%, #1c1b1b 40%),linear-gradient(113.4deg, #1c1b1b 40%, transparent 60%);background-position:calc(100% - 4px),100%;background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #1c1b1b;outline:none;height:2.5rem;line-height:2.5rem;cursor:pointer}
.ui-dropdownchecklist{background-color:transparent;background-image:linear-gradient(66.6deg,transparent 60%,#1c1b1b 40%),linear-gradient(113.4deg,#1c1b1b 40%,transparent 60%);background-position:calc(100% - 4px),100%;background-size:4px 6px,4px 6px;background-repeat:no-repeat;border:none;box-shadow:0 1px 0 #1c1b1b;outline:none;height:2.5rem;line-height:2.5rem;cursor:pointer}
.ui-dropdownchecklist-selector{border:none;border-bottom:1px solid #1c1b1b;outline:none;display:inline-block;cursor:pointer;padding:1px 0}
.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 0}
.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
@@ -63,7 +63,7 @@ table.tablesorter thead tr th{font-weight:normal;font-size:1.1rem;text-transform
table.tablesorter thead tr .tablesorter-header{background-repeat:no-repeat;background-position:center right;cursor:pointer}
table.tablesorter thead tr .tablesorter-headerAsc{background-image:url(../images/sort-asc.png)}
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:#e8e8e8}
table.tablesorter thead tr .tablesorter-headerAsc,table.tablesorter thead tr .tablesorter-headerDesc{background-color:#e8e8e8}
table.tablesorter tbody tr:nth-child(even){background-color:#ededed}
table.tablesorter.four tbody tr:nth-child(4n-1){background-color:#ededed}
table.tablesorter tbody tr.tr_last{background-color:#ededed;border-top:1px solid #e3e3e3;border-bottom:1px solid #e3e3e3}