rework main action dropdown

This commit is contained in:
Andrew Dolgov 2010-11-29 12:13:52 +03:00
parent 0f9b4a60c2
commit c201af50ca
2 changed files with 22 additions and 30 deletions

View File

@ -357,14 +357,8 @@ function init_second_stage() {
} }
} }
function quickMenuChange(elem) {
quickMenuGo(elem.value);
elem.attr('value', 'qmcDefault');
}
function quickMenuGo(opid) { function quickMenuGo(opid) {
try { try {
if (opid == "qmcPrefs") { if (opid == "qmcPrefs") {
gotoPreferences(); gotoPreferences();
} }

View File

@ -121,7 +121,6 @@
title="News"> title="News">
<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top"> <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
<div id="main-toolbar" dojoType="dijit.Toolbar"> <div id="main-toolbar" dojoType="dijit.Toolbar">
<form id="main_toolbar_form" action="" onsubmit='return false'> <form id="main_toolbar_form" action="" onsubmit='return false'>
@ -163,30 +162,29 @@
</form> </form>
<div class="actionChooser"> <div class="actionChooser">
<select onchange="quickMenuChange(this)" dojoType="dijit.form.Select" <div dojoType="dijit.form.DropDownButton">
style="width : 150px"> <span><?php echo __('Actions...') ?></span>
<option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option> <div dojoType="dijit.Menu" style="display: none">
<option value="qmcSearch"><?php echo __('Search...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
<option disabled="1" value="x"><?php echo __('Feed actions:') ?></option> <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
<option value="qmcAddFeed"><?php echo __('Subscribe to feed...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
<option value="qmcEditFeed"><?php echo __('Edit this feed...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
<option value="qmcRescoreFeed"><?php echo __('Rescore feed') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRescoreFeed')"><?php echo __('Rescore feed') ?></div>
<option value="qmcRemoveFeed"><?php echo __('Unsubscribe') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
<option disabled="1" value="x"><?php echo __('All feeds:') ?></option> <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
<option value="qmcCatchupAll"><?php echo __('Mark as read') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
<option value="qmcShowOnlyUnread"><?php echo __('(Un)hide read feeds') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
<option disabled="1" value="x"><?php echo __('Other actions:') ?></option> <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
<option value="qmcDigest"><?php echo __('Switch to digest...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcDigest')"><?php echo __('Switch to digest...') ?></div>
<option value="qmcTagCloud"><?php echo __('Show tag cloud...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcTagCloud')"><?php echo __('Show tag cloud...') ?></div>
<option value="qmcAddLabel"><?php echo __('Create label...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
<option value="qmcAddFilter"><?php echo __('Create filter...') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
<option value="qmcHKhelp"><?php echo __('Keyboard shortcuts help') ?></option> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
</select> </div>
</div>
</div> </div>
</div> <!-- toolbar -->
</div> </div> <!-- toolbar pane -->
</div>
<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center"> <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">