Browse Source

filter rule & label dialog updates

Andrew Dolgov 3 months ago
parent
commit
063b4f535a

+ 17 - 16
classes/pref/filters.php

@@ -346,7 +346,7 @@ class Pref_Filters extends Handler_Protected {
 			print_hidden("method", "editSave");
 			print_hidden("csrf_token", $_SESSION['csrf_token']);
 
-			print "<div class='dlgSecHoriz'>".__("Caption")."</div>";
+			print "<div class='dlgSec'>".__("Caption")."</div>";
 			print "<div class='dlgSecCont'>";
 
 			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("csrf_token", $_SESSION['csrf_token']);
 
-		print "<div class='dlgSecHoriz'>".__("Caption")."</div>";
+		print "<div class='dlgSec'>".__("Caption")."</div>";
 
 		print "<div class='dlgSecCont'>";
 		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)")."
 		</div>";
 
-		print "<hr/>";
-		print "<input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\"
-			 name=\"inverse\" $inverse_checked/>";
-		print "<label for=\"filterDlg_inverse\">".__("Inverse regular expression matching")."</label>";
+		print "<fieldset>";
+		print "<label class='checkbox'><input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\"
+			 name=\"inverse\" $inverse_checked/> ".
+		 	__("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,
 			'dojoType="dijit.form.Select"');
+		print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
 
-		print "<hr/>";
-
-		print __("in") . " ";
+		print "</fieldset>";
 
+		print "<fieldset>";
 		print "<span id='filterDlg_feeds'>";
 		print_feed_multi_select("feed_id",
 			$feed_id,
-			'dojoType="dijit.form.MultiSelect"');
+			'style="width : 500px; height : 300px" dojoType="dijit.form.MultiSelect"');
 		print "</span>";
 
-		print "</div>";
+		print "</fieldset>";
 
-		print "<div class=\"dlgButtons\">";
+		print "</div>";
 
-		print "<div style=\"float : left\">
-			<a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/wiki/ContentFilters\">".__("Wiki: Filters")."</a>
-		</div>";
+		print "<div class='dlgButtons'>";
 
+		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()\">".
 			($rule ? __("Save rule") : __('Add rule'))."</button> ";

+ 1 - 1
classes/pref/labels.php

@@ -39,7 +39,7 @@ class Pref_Labels extends Handler_Protected {
 
 			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>";
 
 			print "<tr><td style='padding-right : 10px'>";

+ 3 - 0
css/default.css

@@ -432,6 +432,9 @@ body.ttrss_main .dijitDialog .dlgSecHoriz {
 body.ttrss_main .dijitDialog .dlgSecCont {
   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.dlgSecSimple fieldset > label {
   font-weight: bold;

File diff suppressed because it is too large
+ 1 - 1
css/default.css.map


+ 4 - 0
css/tt-rss.less

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

+ 3 - 0
themes/night.css

@@ -433,6 +433,9 @@ body.ttrss_main .dijitDialog .dlgSecHoriz {
 body.ttrss_main .dijitDialog .dlgSecCont {
   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.dlgSecSimple fieldset > label {
   font-weight: bold;

File diff suppressed because it is too large
+ 1 - 1
themes/night.css.map


+ 3 - 0
themes/night_blue.css

@@ -433,6 +433,9 @@ body.ttrss_main .dijitDialog .dlgSecHoriz {
 body.ttrss_main .dijitDialog .dlgSecCont {
   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.dlgSecSimple fieldset > label {
   font-weight: bold;

File diff suppressed because it is too large
+ 1 - 1
themes/night_blue.css.map