dialog related bugfixes; reposition infobox

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index a9f1e2d71c3e36fe246dc08aeacbbf163ab7108c..215c51abe4ec15ebbbb96abd3e4202636d38233b 100644 (file)
--- 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 9daff269ad0ee7778b94b5533a74d55086a1ec1b..eed74c263c05b0a4c93792133b46e941a8a45f40 100644 (file)
--- 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 b02832f6c802dd6e3376641a7f98398a17d962a8..7d6c369fc3a3a867a78edfb3ec99d859671735e2 100644 (file)
--- 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 3a72bb6ed6fa913ba28917b0a5950f91ac0a85db..6b5cc390cff46e42000fdb9cc8f6cb528caec010 100644 (file)
--- 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;