diff options
Diffstat (limited to 'classes/pref/filters.php')
-rwxr-xr-x | classes/pref/filters.php | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 0bb1493e5..ec980d5f9 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -199,8 +199,8 @@ class Pref_Filters extends Handler_Protected { print "<div><img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'> <span id='prefFilterProgressMsg'>Looking for articles...</span></div>"; - print "<br/><div class=\"filterTestHolder\">"; - print "<table width=\"100%\" cellspacing=\"0\" id=\"prefFilterTestResultList\">"; + print "<br/><div class='panel panel-scrollable'>"; + print "<table width='100%' id='prefFilterTestResultList'>"; print "</table></div>"; print "<div style='text-align : center'>"; @@ -320,10 +320,10 @@ class Pref_Filters extends Handler_Protected { $label_sth->execute([$line['action_param'], $_SESSION['uid']]); if ($label_row = $label_sth->fetch()) { - $fg_color = $label_row["fg_color"]; + //$fg_color = $label_row["fg_color"]; $bg_color = $label_row["bg_color"]; - $name[1] = "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-right : 4px'>α</span>" . $name[1]; + $name[1] = "<i class=\"material-icons\" style='color : $bg_color; margin-right : 4px'>label</i>" . $name[1]; } } @@ -333,6 +333,7 @@ class Pref_Filters extends Handler_Protected { $filter['name'] = $name[0]; $filter['param'] = $name[1]; $filter['checkbox'] = false; + $filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null; $filter['enabled'] = $line["enabled"]; $filter['rules'] = $this->getfilterrules_concise($line['id']); @@ -518,7 +519,7 @@ class Pref_Filters extends Handler_Protected { __('Remove')."</button>"; print "</div>"; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">". + print "<button dojoType=\"dijit.form.Button\" class=\"alt-info\" onclick=\"return dijit.byId('filterEditDlg').test()\">". __('Test')."</button> "; print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". @@ -771,9 +772,9 @@ class Pref_Filters extends Handler_Protected { $filter_search = $_SESSION["prefs_filter_search"]; } - print "<div id=\"pref-filter-wrap\" dojoType=\"dijit.layout.BorderContainer\" gutters=\"false\">"; - print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">"; - print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">"; + print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; + print "<div dojoType='dijit.Toolbar'>"; if (array_key_exists("search", $_REQUEST)) { $_SESSION["prefs_filter_search"] = $filter_search; @@ -815,9 +816,9 @@ class Pref_Filters extends Handler_Protected { print "</div>"; # toolbar print "</div>"; # toolbar-frame - print "<div id=\"pref-filter-content\" dojoType=\"dijit.layout.ContentPane\" region=\"center\">"; + print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>"; - print "<div id=\"filterlistLoading\"> + print "<div id='filterlistLoading'> <img src='images/indicator_tiny.gif'>". __("Loading, please wait...")."</div>"; @@ -857,7 +858,7 @@ class Pref_Filters extends Handler_Protected { function newfilter() { - print "<form name='filter_new_form' id='filter_new_form'>"; + print "<form name='filter_new_form' id='filter_new_form' onsubmit='return false'>"; print_hidden("op", "pref-filters"); print_hidden("method", "add"); @@ -935,10 +936,10 @@ class Pref_Filters extends Handler_Protected { print "<div class=\"dlgButtons\">"; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">". + print "<button dojoType=\"dijit.form.Button\" class=\"alt-info\" onclick=\"return dijit.byId('filterEditDlg').test()\">". __('Test')."</button> "; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". + print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". __('Create')."</button> "; print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">". |