From 063b4f535a6289290da214097ae3252209e978b7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 20 Feb 2019 14:58:09 +0300
Subject: filter rule & label dialog updates

---
 classes/pref/filters.php | 33 +++++++++++++++++----------------
 classes/pref/labels.php  |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'classes')

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index f5ad6ff72..0951a261d 100755
--- a/classes/pref/filters.php
+++ b/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> ";
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index b4c4d425e..28befe42b 100644
--- a/classes/pref/labels.php
+++ b/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'>";
-- 
cgit v1.2.3