From 8df9005793f1faad35022509a4a3d1ddfe63c2aa Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 7 Aug 2008 04:06:53 +0100
Subject: dialog related bugfixes; reposition infobox

---
 modules/popup-dialog.php | 4 ++--
 modules/pref-labels.php  | 2 +-
 modules/pref-users.php   | 6 +++---
 tt-rss.css               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index a9f1e2d71..215c51abe 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -232,7 +232,7 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<input onkeypress=\"return filterCR(event, labelEditSave)\"
+			print "<input onkeypress=\"return filterCR(event, addLabel)\"
 					onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					 name=\"description\" size=\"30\" value=\"$description\">";
@@ -352,7 +352,7 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<input onkeypress=\"return filterCR(event, filterEditSave)\"
+			print "<input onkeypress=\"return filterCR(event, createFilter)\"
 					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					 onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 9daff269a..eed74c263 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -92,7 +92,7 @@
 			$expr = str_replace(";", "", $expr);
 
 			if (!$expr) {
-				print "<div>Error: SQL expression is blank.</div>";
+				print "<p>".__("Error: SQL expression is blank.")."</p>";
 				return;
 			}
 
diff --git a/modules/pref-users.php b/modules/pref-users.php
index b02832f6c..7d6c369fc 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -36,7 +36,7 @@
 			print "<div class=\"dlgSecCont\">";
 
 			print "<input size=\"30\" style=\"font-size : 16px\" 
-				onkeypress=\"return filterCR(event)\" $sel_disabled
+				onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
 				name=\"login\" value=\"$login\">";
 
 			print "</div>";
@@ -52,7 +52,7 @@
 			print "<br/>";
 
 			print __('Change password to') .
-				" <input size=\"20\" onkeypress=\"return filterCR(event)\"
+				" <input size=\"20\" onkeypress=\"return filterCR(event, userEditSave)\"
 				name=\"password\">";
 
 			print "</div>";
@@ -61,7 +61,7 @@
 			print "<div class=\"dlgSecCont\">";
 
 			print __('E-mail: ').
-				" <input size=\"30\" name=\"email\" onkeypress=\"return filterCR(event)\"
+				" <input size=\"30\" name=\"email\" onkeypress=\"return filterCR(event, userEditSave)\"
 				value=\"$email\">";
 
 			print "</div>";
diff --git a/tt-rss.css b/tt-rss.css
index 3a72bb6ed..6b5cc390c 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -589,7 +589,7 @@ html>body #infoBox {
 	background-image : url("images/shadow.png");
 	background-position : bottom right;
 	left : 25%;
-	top : 100px;
+	top : 70px;
 	width : 50%;
 	z-index : 5;
 	position : absolute;
-- 
cgit v1.2.3