valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filter rule & label dialog updates

This commit is contained in:
Andrew Dolgov 2019-02-20 14:58:09 +03:00
parent 4d9141d762
commit 063b4f535a
9 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
classes/pref/filters.php
View File

@ -346,7 +346,7 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "editSave"); print_hidden("method", "editSave");
print_hidden("csrf_token", $_SESSION['csrf_token']); print_hidden("csrf_token", $_SESSION['csrf_token']);
print "<div class='dlgSecHoriz'>".__("Caption")."</div>"; print "<div class='dlgSec'>".__("Caption")."</div>";
print "<div class='dlgSecCont'>"; print "<div class='dlgSecCont'>";
print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">"; print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"$title\">";
@ -849,7 +849,7 @@ class Pref_Filters extends Handler_Protected {
print_hidden("method", "add"); print_hidden("method", "add");
print_hidden("csrf_token", $_SESSION['csrf_token']); print_hidden("csrf_token", $_SESSION['csrf_token']);
print "<div class='dlgSecHoriz'>".__("Caption")."</div>"; print "<div class='dlgSec'>".__("Caption")."</div>";
print "<div class='dlgSecCont'>"; print "<div class='dlgSecCont'>";
print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">"; print "<input required=\"true\" dojoType=\"dijit.form.ValidationTextBox\" style=\"width : 20em;\" name=\"title\" value=\"\">";
@ -992,33 +992,34 @@ class Pref_Filters extends Handler_Protected {
".__("Regular expression, without outer delimiters (i.e. slashes)")." ".__("Regular expression, without outer delimiters (i.e. slashes)")."
</div>"; </div>";
print "<hr/>"; print "<fieldset>";
print "<input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\" print "<label class='checkbox'><input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\"
name=\"inverse\" $inverse_checked/>"; name=\"inverse\" $inverse_checked/> ".
print "<label for=\"filterDlg_inverse\">".__("Inverse regular expression matching")."</label>"; __("Inverse regular expression matching")."</label>";
print "</fieldset>";
print "<hr/>" . __("on field") . " "; print "<fieldset>";
print "<label style='display : inline'>". __("on field") . "</label> ";
print_select_hash("filter_type", $filter_type, $filter_types, print_select_hash("filter_type", $filter_type, $filter_types,
'dojoType="dijit.form.Select"'); 'dojoType="dijit.form.Select"');
print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
print "<hr/>"; print "</fieldset>";
print __("in") . " ";
print "<fieldset>";
print "<span id='filterDlg_feeds'>"; print "<span id='filterDlg_feeds'>";
print_feed_multi_select("feed_id", print_feed_multi_select("feed_id",
$feed_id, $feed_id,
'dojoType="dijit.form.MultiSelect"'); 'style="width : 500px; height : 300px" dojoType="dijit.form.MultiSelect"');
print "</span>"; print "</span>";
print "</fieldset>";
print "</div>"; print "</div>";
print "<div class=\"dlgButtons\">"; print "<div class='dlgButtons'>";
print "<div style=\"float : left\">
<a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/wiki/ContentFilters\">".__("Wiki: Filters")."</a>
</div>";
print "<a style='float : left' target='_blank' href='http://tt-rss.org/wiki/ContentFilters'>".__("Wiki: Filters")."</a>";
print "<button dojoType=\"dijit.form.Button\" class=\"alt-primary \" type=\"submit\" onclick=\"return dijit.byId('filterNewRuleDlg').execute()\">". print "<button dojoType=\"dijit.form.Button\" class=\"alt-primary \" type=\"submit\" onclick=\"return dijit.byId('filterNewRuleDlg').execute()\">".
($rule ? __("Save rule") : __('Add rule'))."</button> "; ($rule ? __("Save rule") : __('Add rule'))."</button> ";

2
classes/pref/labels.php
View File

@ -39,7 +39,7 @@ class Pref_Labels extends Handler_Protected {
print "<table cellspacing=\"0\">"; print "<table cellspacing=\"0\">";
print "<tr><td>".__("Foreground:")."</td><td>".__("Background:"). print "<tr><th style='text-align : left'>".__("Foreground:")."</th><th style='text-align : left'>".__("Background:").
"</td></tr>"; "</td></tr>";
print "<tr><td style='padding-right : 10px'>"; print "<tr><td style='padding-right : 10px'>";

3
css/default.css
View File

@ -432,6 +432,9 @@ body.ttrss_main .dijitDialog .dlgSecHoriz {
body.ttrss_main .dijitDialog .dlgSecCont { body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px; margin: 10px 20px;
} }
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0px;
}
body.ttrss_main .dijitDialog div.dlgSecCont fieldset > label, body.ttrss_main .dijitDialog div.dlgSecCont fieldset > label,
body.ttrss_main .dijitDialog div.dlgSecSimple fieldset > label { body.ttrss_main .dijitDialog div.dlgSecSimple fieldset > label {
font-weight: bold; font-weight: bold;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

4
css/tt-rss.less
View File

@ -500,6 +500,10 @@ body.ttrss_main {
margin : 10px 20px; margin : 10px 20px;
} }
.dlgSecHoriz + .dlgSecCont {
margin : 10px 0px;
}
div.dlgSecCont, div.dlgSecSimple { div.dlgSecCont, div.dlgSecSimple {
fieldset { fieldset {

3
themes/night.css
View File

@ -433,6 +433,9 @@ body.ttrss_main .dijitDialog .dlgSecHoriz {
body.ttrss_main .dijitDialog .dlgSecCont { body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px; margin: 10px 20px;
} }
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0px;
}
body.ttrss_main .dijitDialog div.dlgSecCont fieldset > label, body.ttrss_main .dijitDialog div.dlgSecCont fieldset > label,
body.ttrss_main .dijitDialog div.dlgSecSimple fieldset > label { body.ttrss_main .dijitDialog div.dlgSecSimple fieldset > label {
font-weight: bold; font-weight: bold;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long

3
themes/night_blue.css
View File

@ -433,6 +433,9 @@ body.ttrss_main .dijitDialog .dlgSecHoriz {
body.ttrss_main .dijitDialog .dlgSecCont { body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px; margin: 10px 20px;
} }
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0px;
}
body.ttrss_main .dijitDialog div.dlgSecCont fieldset > label, body.ttrss_main .dijitDialog div.dlgSecCont fieldset > label,
body.ttrss_main .dijitDialog div.dlgSecSimple fieldset > label { body.ttrss_main .dijitDialog div.dlgSecSimple fieldset > label {
font-weight: bold; font-weight: bold;

2
themes/night_blue.css.map
View File

File diff suppressed because one or more lines are too long