diff options
author | Andrew Dolgov <[email protected]> | 2010-01-11 18:43:53 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-01-11 18:43:53 +0300 |
commit | 1e5548db5423d9dae79ee0c607392f3838ca7e6d (patch) | |
tree | 5e75955a1d5a330534940969e6a8fd23db1654d7 | |
parent | 698776460d3cd7075024b8795dbbaf7132415890 (diff) |
prefs: reorganize toolbar buttons
-rw-r--r-- | modules/pref-feeds.php | 63 | ||||
-rw-r--r-- | modules/pref-filters.php | 25 | ||||
-rw-r--r-- | modules/pref-labels.php | 30 | ||||
-rw-r--r-- | modules/pref-users.php | 26 | ||||
-rw-r--r-- | prefs.js | 3 |
5 files changed, 73 insertions, 74 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 5330a4ffa..86c7c9ebc 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -1133,7 +1133,37 @@ print "<input onclick=\"javascript:displayDlg('quickAddFeed')\" type=\"submit\" id=\"subscribe_to_feed_btn\" - class=\"button\" value=\"".__('Subscribe to feed')."\">"; + class=\"button\" value=\"".__('Subscribe to feed')."\"> "; + + print "<input onclick=\"javascript:editSelectedFeed()\" + type=\"submit\" + class=\"button\" value=\"".__('Edit feeds')."\"> "; + + if (get_pref($link, 'ENABLE_FEED_CATS')) { + + print "<input onclick=\"javascript:editFeedCats()\" + type=\"submit\" + class=\"button\" value=\"".__('Edit categories')."\"> "; + } + + print "<input onclick=\"javascript:removeSelectedFeeds()\" + type=\"submit\" + class=\"button\" value=\"".__('Unsubscribe')."\"> "; + +/* print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> + <option value=\"facDefault\" selected>".__('Other actions...')."</option>"; + + if (FORCE_ARTICLE_PURGE == 0) { + print + "<option value=\"facPurge\">".__('Manual purge')."</option>"; + } + + print " + <option value=\"facClear\">".__('Clear feed data')."</option> + <option value=\"facRescore\">".__('Rescore articles')."</option> + <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>"; + + print "</select>"; */ /* if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { print " <input type=\"submit\" class=\"button\" @@ -1362,7 +1392,7 @@ print "<p>"; - print "<div id=\"feedOpToolbar\">"; +/* print "<div id=\"feedOpToolbar\">"; if (get_pref($link, 'ENABLE_FEED_CATS')) { @@ -1375,35 +1405,8 @@ __('Recategorize')."\">"; } - print "</div>"; - - print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> - <option value=\"facDefault\" selected>".__('Actions...')."</option> - <optgroup label=\"".__('Selection:')."\"> - <option value=\"facEdit\">".__('Edit')."</option>"; + print "</div>"; */ - if (FORCE_ARTICLE_PURGE == 0) { - print - "<option value=\"facPurge\">".__('Manual purge')."</option>"; - } - - print " - <option value=\"facClear\">".__('Clear feed data')."</option> - <option value=\"facRescore\">".__('Rescore articles')."</option> - <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>"; - - print "</optgroup>"; - - if (get_pref($link, 'ENABLE_FEED_CATS')) { - - print "<optgroup label=\"".__('Other:')."\"> - <option value=\"facEditCats\">".__('Edit categories')." - </option> - </optgroup>"; - - } - - print "</select>"; } else { print "<p>"; diff --git a/modules/pref-filters.php b/modules/pref-filters.php index a0760de4e..afa8eb312 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -305,8 +305,9 @@ onchange=\"javascript:updateFilterList()\" value=\"$filter_search\"> <input type=\"submit\" class=\"button\" onclick=\"javascript:updateFilterList()\" value=\"".__('Search')."\"> - <p<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\"> - <img src='images/sign_quest.gif'></a></p> + + <a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\"> + <img src='images/sign_quest.gif'></a> </div>"; @@ -314,14 +315,19 @@ class=\"button\" onclick=\"return displayDlg('quickAddFilter', false)\" id=\"create_filter_btn\" - value=\"".__('Create filter')."\">"; + value=\"".__('Create filter')."\"> "; - print " "; + print "<input type=\"submit\" class=\"button\" + onclick=\"return editSelectedFilter()\" value=\"".__('Edit')."\"> "; + + print "<input type=\"submit\" class=\"button\" + onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\"> "; print "<input type=\"submit\" class=\"button\" onclick=\"rescore_all_feeds()\" - value=\"".__('Rescore articles')."\">"; + value=\"".__('Rescore articles')."\"> "; + if ($filter_search) { $filter_search = split(' ', db_escape_string($filter_search)); @@ -508,15 +514,6 @@ print "</table>"; - print "<p id=\"filterOpToolbar\">"; - - print "<input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"return editSelectedFilter()\" value=\"".__('Edit')."\"> - <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\">"; - - print "</p>"; - } else { print "<p>"; diff --git a/modules/pref-labels.php b/modules/pref-labels.php index e67cb7e3b..a6324c7a2 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -137,7 +137,21 @@ print"<input type=\"submit\" class=\"button\" id=\"label_create_btn\" onclick=\"return addLabel()\" - value=\"".__('Create label')."\"></div>"; + value=\"".__('Create label')."\"> "; + + print "<input type=\"submit\" class=\"button\" + onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">"; + + print " "; +/* print " <input type=\"submit\" class=\"button\" disabled=\"true\" + onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\"> "; + print "<input type=\"submit\" class=\"button\" disabled=\"true\" + onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\"> "; */ + print "<input type=\"submit\" class=\"button\" + onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">"; + + + print "</div>"; if ($label_search) { @@ -233,20 +247,6 @@ print "</table>"; - print "<p id=\"labelOpToolbar\">"; - - print "<input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">"; - - print " "; -/* print " <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\"> "; - print "<input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\"> "; */ - print "<input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">"; - - print "</p>"; } else { print "<p>"; diff --git a/modules/pref-users.php b/modules/pref-users.php index 6b4df8854..7c47a3dbf 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -371,7 +371,19 @@ print "<input type=\"submit\" class=\"button\" id=\"user_add_btn\" - onclick=\"javascript:addUser()\" value=\"".__('Create user')."\"></div>"; + onclick=\"javascript:addUser()\" value=\"".__('Create user')."\">"; + + print " + <input type=\"submit\" class=\"button\" + onclick=\"javascript:selectedUserDetails()\" value=\"".__('Details')."\"> + <input type=\"submit\" class=\"button\" + onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\"> + <input type=\"submit\" class=\"button\" + onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\"> + <input type=\"submit\" class=\"button\" + onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">"; + + print "</div>"; if ($user_search) { @@ -473,18 +485,6 @@ print "</table>"; - print "<p id='userOpToolbar'>"; - - print " - <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"javascript:selectedUserDetails()\" value=\"".__('User details')."\"> - <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\"> - <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\"> - <input type=\"submit\" class=\"button\" disabled=\"true\" - onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">"; - } else { print "<p>"; if (!$user_search) { @@ -946,8 +946,7 @@ function editSelectedFeed() { } if (rows.length > 1) { - alert(__("Please select one feed.")); - return; + return editSelectedFeeds(); } notify(""); |