diff options
author | Andrew Dolgov <[email protected]> | 2008-08-07 04:17:24 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2008-08-07 04:17:24 +0100 |
commit | 143a497306aea0198c1dae4c03ac8ca344e37f55 (patch) | |
tree | 5041e1b56530c9b6a75fd409e90b0d29b7b1f9f1 | |
parent | 8df9005793f1faad35022509a4a3d1ddfe63c2aa (diff) |
dialog layout tweaks
-rw-r--r-- | functions.js | 8 | ||||
-rw-r--r-- | modules/popup-dialog.php | 9 | ||||
-rw-r--r-- | modules/pref-feeds.php | 11 | ||||
-rw-r--r-- | modules/pref-filters.php | 27 |
4 files changed, 29 insertions, 26 deletions
diff --git a/functions.js b/functions.js index 17aaa238f..dd7f51ea6 100644 --- a/functions.js +++ b/functions.js @@ -1506,18 +1506,18 @@ function filterDlgCheckAction(sender) { return; } - var action_param = form.action_param; + var action_param = document.getElementById("filter_dlg_param_box"); if (!action_param) { - debug("filterDlgCheckAction: can't find action param!"); + debug("filterDlgCheckAction: can't find action param box!"); return; } // if selected action supports parameters, enable params field if (action == 4 || action == 6) { - action_param.disabled = false; + Element.show(action_param); } else { - action_param.disabled = true; + Element.hide(action_param); } } catch (e) { diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 215c51abe..912ab03a6 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -383,10 +383,13 @@ print "</select>"; - print " " . __("with params") . " "; + print "<span id=\"filter_dlg_param_box\" style=\"display : none\">"; + print " " . __("with parameters:") . " "; + print "<input size=\"20\" + name=\"action_param\">"; + print "</span>"; - print "<input disabled size=\"20\" - name=\"action_param\">"; + print " "; // tiny layout hack print "</div>"; diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 53a3185e8..be4016038 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -361,19 +361,16 @@ print "</form>"; print "<div class='dlgButtons'> + <div style=\"float : left\"> + <input type='submit' class='button' + onclick='return unsubscribeFeed($feed_id, \"$title\")' value=\"".__('Unsubscribe')."\"> + </div> <input type=\"submit\" class=\"button\" onclick=\"return feedEditSave()\" value=\"".__('Save')."\"> <input type='submit' class='button' onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\"> - <div style=\"float : left\"> - - <input type='submit' class='button' - onclick='return unsubscribeFeed($feed_id, \"$title\")' value=\"".__('Unsubscribe')."\"> - </div>"; - print "</div>"; - return; } diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 3946be5f3..05d2fb6af 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -74,12 +74,15 @@ print "</select>"; - print " " . __("with params") . " "; + $param_hidden = ($action_id == 4 || $action_id == 6) ? "" : "display : none"; - $param_disabled = ($action_id == 4 || $action_id == 6) ? "" : "disabled"; + print "<span id=\"filter_dlg_param_box\" style=\"$param_hidden\">"; + print " " . __("with parameters:") . " "; + print "<input size=\"20\" + name=\"action_param\" value=\"$action_param\">"; + print "</span>"; - print "<input $param_disabled size=\"20\" - name=\"action_param\" value=\"$action_param\">"; + print " "; // tiny layout hack print "</div>"; @@ -111,6 +114,14 @@ print "<div class=\"dlgButtons\">"; + $reg_exp = htmlspecialchars($reg_exp); // second escaping seems to be needed for javascript + + print "<div style=\"float : left\">"; + print "<input type=\"submit\" + class=\"button\" onclick='return removeFilter($filter_id, \"$reg_exp\")' + value=\"".__('Remove')."\"> "; + print "</div>"; + print "<input type=\"submit\" id=\"infobox_submit\" class=\"button\" onclick=\"return filterEditSave()\" @@ -120,14 +131,6 @@ type=\"submit\" onclick=\"return filterEditCancel()\" value=\"".__('Cancel')."\">"; - $reg_exp = htmlspecialchars($reg_exp); // second escaping seems to be needed for javascript - - print "<div style=\"float : left\">"; - print "<input type=\"submit\" - class=\"button\" onclick='return removeFilter($filter_id, \"$reg_exp\")' - value=\"".__('Remove')."\"> "; - print "</div>"; - print "</div>"; return; |