label editor: rework help link

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index c40c51702dd4beb8376576c145ac8ceb4fd80b94..a63c65f56ec345acee90b81094b80716384c131c 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -228,12 +228,6 @@
 
                        print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
                                         rows=\"4\" name=\"sql_exp\" class=\"iedit\"></textarea>";
-
-                       print "</td></tr>";
-                       print "<tr><td>";
-                       print "<a class='small' href=\"javascript:displayHelpInfobox(1)\">
-                       ".__('Click here for help')."</a>";
-
                        print "</td></tr></table>";
 
                        print "</form>";
@@ -242,6 +236,10 @@
 
                        print "<div align='right'>";
 
+                       print "<input type=\"submit\" 
+                               class=\"button\" onclick=\"return displayHelpInfobox(1)\" 
+                               value=\"".__('Help')."\"> ";
+
                        print "<input type=\"submit\" onclick=\"labelTest()\" value=\"".__('Test')."\">
                                ";
 

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 552dbc58847d050314a5e27f7c79e485a7d3d0ff..b7124f01c7cb8dfdba5dee09877a4ae5e380e4f9 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -48,12 +48,6 @@
 
                        print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
                                         rows=\"4\" name=\"sql_exp\" class=\"iedit\">$sql_exp</textarea>";
-
-                       print "</td></tr>";
-                       print "<tr><td>";
-                       print "<a class='small' href=\"javascript:displayHelpInfobox(1)\">
-                       ".__('Click here for help')."</a>";
-
                        print "</td></tr></table>";
 
                        print "</form>";
@@ -62,6 +56,10 @@
 
                        print "<div align='right'>";
 
+                       print "<input type=\"submit\" 
+                               class=\"button\" onclick=\"return displayHelpInfobox(1)\" 
+                               value=\"".__('Help')."\"> ";
+
                        $is_disabled = (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== FALSE) ? "disabled" : "";
 
                        print "<input $is_disabled type=\"submit\" onclick=\"return labelTest()\" value=\"Test\">

diff --git a/prefs.js b/prefs.js
index dcb7a2a7bfcccbc5e8866e056b0a8adf62ae3a17..e64d51173b7774f12564dc4b8591d1f0e2c072c1 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -864,6 +864,8 @@ function displayHelpInfobox(topic_id) {
 
        var w = window.open(url, "ttrss_help", 
                "status=0,toolbar=0,location=0,width=450,height=500,scrollbars=1,menubar=0");
+
+       return false;
 }
 
 function labelEditCancel() {