diff options
author | Andrew Dolgov <[email protected]> | 2010-11-17 21:13:41 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-11-17 21:13:41 +0300 |
commit | 1985a5e0d780c1d873085fd8b47ff59d3ef8335f (patch) | |
tree | 449abd96e9bc7acef3acd6ffa5270db8ff9f568b /modules | |
parent | 556e5b46d8fdcf341b7255df5a3f9196c03f67a3 (diff) |
rework pref-feeds dialog; update other pref panes
Diffstat (limited to 'modules')
-rw-r--r-- | modules/pref-feeds.php | 75 | ||||
-rw-r--r-- | modules/pref-filters.php | 20 | ||||
-rw-r--r-- | modules/pref-labels.php | 17 |
3 files changed, 83 insertions, 29 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index d8df49ab3..783dd34a1 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -981,6 +981,7 @@ print "<div dojoType=\"dijit.Toolbar\">"; + /* print "<div style='float : right'> <input id=\"feed_search\" size=\"20\" type=\"search\" onfocus=\"disableHotkeys();\" @@ -988,22 +989,37 @@ onchange=\"updateFeedList()\" value=\"$feed_search\"> <button onclick=\"updateFeedList()\">". __('Search')."</button> - </div>"; - - print "<button onclick=\"quickAddFeed()\">" - .__('Subscribe to feed')."</button> "; + </div>"; */ + + print "<div dojoType=\"dijit.form.DropDownButton\">". + "<span>" . __('Select')."</span>"; + + print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; + print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\" + dojoType=\"dijit.MenuItem\">".__('All')."</div>"; + print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\" + dojoType=\"dijit.MenuItem\">".__('None')."</div>"; + print "</div>"; + + /* print "<div onclick=\"selectTableRows('prefFeedList', 'all')\">".__('All')."</div>, + <div href=\"#\" onclick=\"selectTableRows('prefFeedList', 'none')\">".__('None')."</div>"; */ + + print "</div>"; - print "<button onclick=\"editSelectedFeed()\">". - __('Edit feeds')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"quickAddFeed()\">" + .__('Subscribe to feed')."</button dojoType=\"dijit.form.Button\"> "; + + print "<button dojoType=\"dijit.form.Button\" onclick=\"editSelectedFeed()\">". + __('Edit feeds')."</button dojoType=\"dijit.form.Button\"> "; if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "<button onclick=\"editFeedCats()\">". - __('Edit categories')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"editFeedCats()\">". + __('Edit categories')."</button dojoType=\"dijit.form.Button\"> "; } - print "<button onclick=\"removeSelectedFeeds()\">" - .__('Unsubscribe')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedFeeds()\">" + .__('Unsubscribe')."</button dojoType=\"dijit.form.Button\"> "; if (defined('_ENABLE_FEED_DEBUGGING')) { @@ -1025,6 +1041,43 @@ print "</div>"; # toolbar + print "<div id=\"feedlistLoading\"> + <img src='images/indicator_tiny.gif'>". + __("Loading, please wait...")."</div>"; + + print "<div dojoType=\"dojo.data.ItemFileWriteStore\" jsId=\"feedStore\" + url=\"backend.php?op=feeds&root=1\"> + </div> + <div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"feedModel\" store=\"feedStore\" + query=\"{id:'root'}\" rootId=\"root\" rootLabel=\"Feeds\" + childrenAttrs=\"items\" checkboxStrict=\"false\" checkboxAll=\"false\"> + </div> + <div dojoType=\"lib.CheckBoxTree\" id=\"feedTree\" _dndController=\"dijit.tree.dndSource\" + betweenThreshold=\"1\" + model=\"feedModel\" openOnClick=\"false\"> + <script type=\"dojo/method\" event=\"onClick\" args=\"item\"> + var id = String(item.id); + var bare_id = id.substr(id.indexOf(':')+1); + + console.log('onClick: ' + id); + + if (id.match('FEED')) { + editFeed(bare_id, event); + } + + </script> + <script type=\"dojo/method\" event=\"onLoad\" args=\"item\"> + Element.hide(\"feedlistLoading\"); + </script> + <script type=\"dojo/method\" event=\"checkItemAcceptance\" args=\"item, source, position\"> + var source_item = dijit.getEnclosingWidget(source); + console.log(item); + console.log(source_item); + </script> + + </div>"; + + /* $feeds_sort = db_escape_string($_REQUEST["sort"]); if (!$feeds_sort || $feeds_sort == "undefined") { @@ -1234,7 +1287,7 @@ } print "</p>"; - } + } */ print "</div>"; # feeds pane diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 7b64b2a8f..d21f35335 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -299,25 +299,25 @@ print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">"; print "<div style='float : right; padding-right : 4px;'> - <input id=\"filter_search\" size=\"20\" type=\"search\" + <input dojoType=\"dijit.form.TextBox\" id=\"filter_search\" size=\"20\" type=\"search\" onfocus=\"javascript:disableHotkeys();\" onblur=\"javascript:enableHotkeys();\" onchange=\"javascript:updateFilterList()\" value=\"$filter_search\"> - <button onclick=\"javascript:updateFilterList()\">".__('Search')."</button> + <button dojoType=\"dijit.form.Button\" onclick=\"javascript:updateFilterList()\">".__('Search')."</button> </div>"; - print "<button onclick=\"return quickAddFilter()\">". - __('Create filter')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"return quickAddFilter()\">". + __('Create filter')."</button dojoType=\"dijit.form.Button\"> "; - print "<button onclick=\"return editSelectedFilter()\">". - __('Edit')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"return editSelectedFilter()\">". + __('Edit')."</button dojoType=\"dijit.form.Button\"> "; - print "<button onclick=\"return removeSelectedFilters()\">". - __('Remove')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"return removeSelectedFilters()\">". + __('Remove')."</button dojoType=\"dijit.form.Button\"> "; if (defined('_ENABLE_FEED_DEBUGGING')) { - print "<button onclick=\"rescore_all_feeds()\">". - __('Rescore articles')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"rescore_all_feeds()\">". + __('Rescore articles')."</button dojoType=\"dijit.form.Button\"> "; } print "</div>"; # toolbar diff --git a/modules/pref-labels.php b/modules/pref-labels.php index e683ab615..c794e023e 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -115,7 +115,7 @@ if (label_create($link, $caption)) { if (!$output) { - print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption)); + //print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption)); } } @@ -156,20 +156,21 @@ print "<div style='float : right; padding-right : 4px'> <input id=\"label_search\" size=\"20\" type=\"search\" + dojoType=\"dijit.form.TextBox\" onfocus=\"javascript:disableHotkeys();\" onblur=\"javascript:enableHotkeys();\" onchange=\"javascript:updateLabelList()\" value=\"$label_search\"> - <button onclick=\"javascript:updateLabelList()\">".__('Search')."</button> + <button dojoType=\"dijit.form.Button\" onclick=\"javascript:updateLabelList()\">".__('Search')."</button> </div>"; - print"<button onclick=\"return addLabel()\">". - __('Create label')."</button> "; + print"<button dojoType=\"dijit.form.Button\" onclick=\"return addLabel()\">". + __('Create label')."</button dojoType=\"dijit.form.Button\"> "; - print "<button onclick=\"removeSelectedLabels()\">". - __('Remove')."</button> "; + print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedLabels()\">". + __('Remove')."</button dojoType=\"dijit.form.Button\"> "; - print "<button onclick=\"labelColorReset()\">". - __('Clear colors')."</button>"; + print "<button dojoType=\"dijit.form.Button\" onclick=\"labelColorReset()\">". + __('Clear colors')."</button dojoType=\"dijit.form.Button\">"; print "</div>"; #toolbar |