From bcf5ed46e304efad2da6dcb632d7b9d45df42cad Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 21 Nov 2010 22:55:57 +0300
Subject: small dialog tweaks to better center elements vertically

---
 modules/popup-dialog.php | 10 +++++-----
 modules/pref-feeds.php   | 18 ++++++++----------
 modules/pref-filters.php |  6 +++---
 tt-rss.css               | 11 +++++++++--
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index ec41ec4ee..0a272d1a3 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -262,7 +262,7 @@
 				placeHolder=\"".__("Feed URL")."\"
 				dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"feed\" id=\"feedDlg_feedUrl\">";
 
-			print "<br/>";
+			print "<hr/>";
 
 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
 				print __('Place in category:') . " ";
@@ -399,7 +399,7 @@
 			}
 
 
-			print "<br/>".__('Limit search to:')." ";
+			print "<hr/>".__('Limit search to:')." ";
 			
 			print "<select name=\"search_mode\" dojoType=\"dijit.form.Select\">
 				<option value=\"all_feeds\">".__('All feeds')."</option>";
@@ -481,11 +481,11 @@
 				__('Check it')."</button>";
 			print "</span>";
 
-			print "<br/>" .  __("on field") . " ";
+			print "<hr/>" .  __("on field") . " ";
 			print_select_hash("filter_type", 1, $filter_types,
 				'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
 
-			print "<br/>";
+			print "<hr/>";
 
 			print __("in") . " ";
 			print_feed_select($link, "feed_id", $active_feed_id, 
@@ -528,7 +528,7 @@
 			print "<div class=\"dlgSecCont\">";
 
 			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" checked=\"1\">
-					<label for=\"enabled\">".__('Enabled')."</label><br/>";
+					<label for=\"enabled\">".__('Enabled')."</label><hr/>";
 
 			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"inverse\" id=\"inverse\">
 				<label for=\"inverse\">".__('Inverse match')."</label>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 859b11ee9..d4bde4892 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -274,7 +274,7 @@
 			$feed_url = htmlspecialchars(db_fetch_result($result,
 				0, "feed_url"));
 
-			print "<br/>";
+			print "<hr/>";
 
 			print __('URL:') . " ";
 			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
@@ -288,7 +288,7 @@
 
 				$cat_id = db_fetch_result($result, 0, "cat_id");
 
-				print "<br/>";
+				print "<hr/>";
 
 				print __('Place in category:') . " ";
 
@@ -323,7 +323,7 @@
 
 				/* Purge intl */
 
-				print "<br/>";
+				print "<hr/>";
 
 				print __('Article purging:') . " ";
 
@@ -347,7 +347,7 @@
 
 			print "<input dojoType=\"dijit.form.TextBox\" 
 				placeHolder=\"".__("Login")."\"
-				name=\"auth_login\" value=\"$auth_login\"><br/>";
+				name=\"auth_login\" value=\"$auth_login\"><hr/>";
 
 #			print "</tr><tr><td>" . __("Password:") . "</td><td>";
 
@@ -384,7 +384,7 @@
 				$checked = "";
 			}
 
-			print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
 				$checked>&nbsp;<label for=\"rtl_content\">".__('Right-to-left content')."</label>";
 
 			$include_in_digest = sql_bool_to_bool(db_fetch_result($result, 0, "include_in_digest"));
@@ -395,7 +395,7 @@
 				$checked = "";
 			}
 
-			print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\" 
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\" 
 				name=\"include_in_digest\"
 				$checked>&nbsp;<label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
 
@@ -408,7 +408,7 @@
 				$checked = "";
 			}
 
-			print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\" 
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\" 
 				name=\"always_display_enclosures\"
 				$checked>&nbsp;<label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
 
@@ -421,7 +421,7 @@
 				$checked = "";
 			}
 
-			print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\" 
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\" 
 				name=\"cache_images\"
 				$checked>&nbsp;<label for=\"cache_images\">".
 				__('Cache images locally (SimplePie only)')."</label>";
@@ -432,8 +432,6 @@
 
 			/* Icon */
 
-			print "<br/>";
-
 			print "<div class=\"dlgSec\">".__("Icon")."</div>";
 			print "<div class=\"dlgSecCont\">";
 
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 168afb820..cf44c55f9 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -164,11 +164,11 @@
 				__('Check it')."</button>";
 			print "</span>";
 
-			print "<br/> " . __("on field") . " ";
+			print "<hr/> " . __("on field") . " ";
 			print_select_hash("filter_type", $filter_type, $filter_types,
 				'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"');
 
-			print "<br/>";
+			print "<hr/>";
 
 			print __("in") . " ";
 			print_feed_select($link, "feed_id", $feed_id,
@@ -228,7 +228,7 @@
 			}
 
 			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
-					<label for=\"enabled\">".__('Enabled')."</label><br/>";
+					<label for=\"enabled\">".__('Enabled')."</label><hr/>";
 
 			if ($inverse) {
 				$checked = "checked=\"1\"";
diff --git a/tt-rss.css b/tt-rss.css
index e97ab9636..d14e6f473 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1273,9 +1273,16 @@ div.dlgSecCont {
 	font-weight : normal;
 }
 
+div.dlgSecCont hr {
+	height : 0px;
+	line-height : 0px;
+	border : 0px solid transparent;
+	margin : 2px;
+}
+
 div.dlgSecCont > * {
-	margin-top : 4px;
-	vertical-align : bottom;
+	position : relative;
+	top : -2px;
 }
 
 div.dlgButtons {
-- 
cgit v1.2.3