valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefs: reorganize toolbar buttons

This commit is contained in:
Andrew Dolgov 2010-01-11 18:43:53 +03:00
parent 698776460d
commit 1e5548db54
5 changed files with 73 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
modules/pref-feeds.php
View File

@ -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 "</div>"; */
print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
<option value=\"facDefault\" selected>".__('Actions...')."</option>
<optgroup label=\"".__('Selection:')."\">
<option value=\"facEdit\">".__('Edit')."</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 "</optgroup>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<optgroup label=\"".__('Other:')."\">
<option value=\"facEditCats\">".__('Edit categories')."
</option>
</optgroup>";
}
print "</select>";
} else {
print "<p>";

25
modules/pref-filters.php
View File

@ -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>
&nbsp;
<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 "&nbsp;";
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>";

30
modules/pref-labels.php
View File

@ -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 "&nbsp;";
/* print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
print "<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
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 "&nbsp;";
/* print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
print "<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
print "<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
print "</p>";
} else {
print "<p>";

26
modules/pref-users.php
View File

@ -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) {

3
prefs.js
View File

@ -946,8 +946,7 @@ function editSelectedFeed() {
}
if (rows.length > 1) {
alert(__("Please select one feed."));
return;
return editSelectedFeeds();
}
notify("");