]> git.wh0rd.org - tt-rss.git/blobdiff - modules/pref-feeds.php
rework pref-feeds dialog; update other pref panes
[tt-rss.git] / modules / pref-feeds.php
index 4d7975056a6c529e928a209258a7e09dd2e75717..783dd34a1445bb64e7c84d0e2828bf73d8a2f6f1 100644 (file)
                        return;
                }
 
-/*             if ($subop == "massSubscribe") {
-                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
-
-                       $subscribed = array();
-
-                       foreach ($ids as $id) {
-
-                               if ($mode == 1) {
-                                       $result = db_query($link, "SELECT feed_url,title FROM ttrss_feeds
-                                               WHERE id = '$id'");
-                               } else if ($mode == 2) {
-                                       $result = db_query($link, "SELECT * FROM ttrss_archived_feeds
-                                               WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-                                       $orig_id = db_escape_string(db_fetch_result($result, 0, "id"));
-                                       $site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
-                               }
-       
-                               $feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
-                               $title = db_escape_string(db_fetch_result($result, 0, "title"));
-       
-                               $title_orig = db_fetch_result($result, 0, "title");
-       
-                               $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-                                               feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
-       
-                               if (db_num_rows($result) == 0) {                        
-                                       if ($mode == 1) {
-                                               $result = db_query($link,
-                                                       "INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id) 
-                                                       VALUES ('".$_SESSION["uid"]."', '$feed_url', '$title', NULL)");
-                                       } else if ($mode == 2) {
-                                               $result = db_query($link,
-                                                       "INSERT INTO ttrss_feeds (id,owner_uid,feed_url,title,cat_id,site_url) 
-                                                       VALUES ('$orig_id','".$_SESSION["uid"]."', '$feed_url', '$title', NULL, '$site_url')");
-                                       }
-                                       array_push($subscribed, $title_orig);
-                               }
-                       }
-
-                       if (count($subscribed) > 0) {
-                               $msg = "<b>".__('Subscribed to feeds:')."</b>".
-                                       "<ul class=\"nomarks\">";
-
-                               foreach ($subscribed as $title) {
-                                       $msg .= "<li>$title</li>";
-                               }
-                               $msg .= "</ul>";
-
-                               print format_notice($msg);
-                       }
-
-                       return;
-               } */
-
-/*             if ($subop == "browse") {
-
-                       print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
-                       
-                       print "<div class=\"infoBoxContents\">";
-
-                       $browser_search = db_escape_string($_REQUEST["search"]);
-
-                       //print "<p>".__("Showing top 25 registered feeds, sorted by popularity:")."</p>";
-
-                       print "<form onsubmit='return false;' display='inline' name='feed_browser' id='feed_browser'>";
-
-                       print "
-                               <div style='float : right'>
-                               <img style='display : none' 
-                                       id='feed_browser_spinner' src='images/indicator_white.gif'>
-                               <input name=\"search\" size=\"20\" type=\"search\"
-                                       onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
-                               <button onclick=\"javascript:updateFeedBrowser()\">".__('Search')."</button>
-                       </div>";
-
-                       print " <select name=\"mode\" onchange=\"updateFeedBrowser()\">
-                               <option value='1'>" . __('Popular feeds') . "</option>
-                               <option value='2'>" . __('Feed archive') . "</option>
-                               </select> ";
-
-                       print __("limit:");
-
-                       print " <select name=\"limit\" onchange='updateFeedBrowser()'>";
-
-                       foreach (array(25, 50, 100, 200) as $l) {
-                               $issel = ($l == $limit) ? "selected" : "";
-                               print "<option $issel>$l</option>";
-                       }
-                       
-                       print "</select> ";
-
-                       print "<p>";
-
-                       $owner_uid = $_SESSION["uid"];
-
-                       print "<ul class='browseFeedList' id='browseFeedList'>";
-                       print_feed_browser($link, $search, 25);
-                       print "</ul>";
-
-                       print "<div align='center'>
-                               <button onclick=\"feedBrowserSubscribe()\">".__('Subscribe')."</button>
-                               <button onclick=\"closeInfoBox()\" >".__('Cancel')."</button></div>";
+               if ($subop == "editfeed") {
+                       header("Content-Type: text/xml");
 
-                       print "</div>";
-                       return;
-               } */
+                       print "<dlg id=\"$subop\">";
+                       print "<title>".__('Feed Editor')."</title>";
+                       print "<content><![CDATA[";
 
-               if ($subop == "editfeed") {
                        $feed_id = db_escape_string($_REQUEST["id"]);
 
                        $result = db_query($link, 
                                $feed_icon = "";
                        }
 
-                       print "<div id=\"infoBoxTitle\">".__('Feed Editor')."</div>";
-
-                       print "<div class=\"infoBoxContents\">";
-
                        print "<form id=\"edit_feed_form\" onsubmit=\"return false\">"; 
 
                        print "<input type=\"hidden\" name=\"id\" value=\"$feed_id\">";
                                <button onclick=\"return feedEditCancel()\">".__('Cancel')."</button>
                                </div>";
 
+                       print "]]></content></dlg>";
+
                        return;
                }
 
                if ($subop == "editfeeds") {
 
                        $feed_ids = db_escape_string($_REQUEST["ids"]);
-
-                       print "<div id=\"infoBoxTitle\">".__('Multiple Feed Editor')."</div>";
-
-                       print "<div class=\"infoBoxContents\">";
+                       
+                       header("Content-Type: text/xml");
+                       print "<dlg id=\"$subop\">";
+                       print "<title>".__('Multiple Feed Editor')."</title>";
+                       print "<content><![CDATA[";
 
                        print "<form id=\"batch_edit_feed_form\" onsubmit=\"return false\">";   
 
                                onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
                                </div>";
 
+                       print "]]></content></dlg>";
+
                        return;
                }
 
 
                        }
 
-                       print "<div id=\"infoBoxTitle\">".__('Category editor')."</div>";
-                       
-                       print "<div class=\"infoBoxContents\">";
-
+                       header("Content-Type: text/xml");
+                       print "<dlg id=\"$subop\">";
+                       print "<title>".__('Category editor')."</title>";
+                       print "<content><![CDATA[";
 
                        if ($action == "add") {
 
                        print "<button onclick=\"selectTab('feedConfig')\">".
                                __('Close this window')."</button></div>";
 
-                       print "</div>";
+                       print "]]></content></dlg>";
 
                        return;
 
 
                if ($quiet) return;
 
+               print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds')."\">";
+
                set_pref($link, "_PREFS_ACTIVE_TAB", "feedConfig");
 
                $result = db_query($link, "SELECT COUNT(id) AS num_errors
                        $feed_search = $_SESSION["prefs_feed_search"];
                }
 
+               print "<div dojoType=\"dijit.Toolbar\">";
+
+               /* 
                print "<div style='float : right'> 
                        <input id=\"feed_search\" size=\"20\" type=\"search\"
                                onfocus=\"disableHotkeys();\" 
                                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 "<button onclick=\"editSelectedFeed()\">".
-                       __('Edit feeds')."</button> ";
+               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 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')) {
 
 
                }
 
+               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") {
 
                if (db_num_rows($result) != 0) {
 
-//                     print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
-
                        print "<p><table width=\"100%\" cellspacing=\"0\" 
                                class=\"prefFeedList\" id=\"prefFeedList\">";
                        print "<tr><td class=\"selectPrompt\" colspan=\"8\">".
                                        $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
                                }
                                
-                               print "<td class='feedSelect'><input onclick='toggleSelecRow(this);' 
+                               print "<td class='feedSelect'><input 
+                               onclick='toggleSelectRowById(this, \"FEEDR-".$line['id']."\");' 
                                type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
 
                                $onclick = "onclick='editFeed($feed_id, event)' title='".__('Click to edit')."'";
                        }
                        print "</p>";
 
-               }
+               } */
 
-               print "<h3>".__('OPML')."</h3>";
+               print "</div>"; # feeds pane
 
-/*             print "<div style='float : left'>
-               <form   enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
-               ".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
-                       <input type=\"hidden\" name=\"op\" value=\"Import\">
-                       <button onclick=\"return validateOpmlImport();\"
-                               type=\"submit\">".__('Import')."</button>
-                               </form></div>";
-
-               print "&nbsp;"; */
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">";
 
                print "<p>" . __("Using OPML you can export and import your feeds and Tiny Tiny RSS settings.");
 
                        </form>";
                print "</div>&nbsp;";
 
-               print "<button onclick=\"gotoExportOpml()\">".
-                       __('Export OPML')."</button>";
+               print "<button onclick=\"gotoExportOpml()\">".__('Export OPML')."</button>";
 
                print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.');
 
                        __('Display URL')."</button> ";
 
 
-               if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
-       
-                       print "<h3>" . __("Firefox Integration") . "</h3>";
+               print "</div>"; # pane
+
+               if (true || strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
+
+                       print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Firefox integration')."\">";
                 
                        print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
 
                                "</button>";
 
                        print "</p>";
-               }
 
-               print "<h3>".__("Subscribing via bookmarklet")."</h3>";
+                       print "</div>"; # pane
+               }
 
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Subscribing using bookmarklet')."\">";
+               
                print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
 
                $bm_subscribe_url = str_replace('%s', '', add_feed_url());
 
                print "<a href=\"$bm_url\" class='visibleLink'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
 
-               print "<h3>".__("Published articles")."</h3>";
+               print "</div>"; #pane
+
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published articles and generated feeds')."\">";
 
                print "<p>".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."</p>";
 
                print "<button onclick=\"return clearFeedAccessKeys()\">".
                        __('Clear all generated URLs')."</button> ";
 
+               print "</div>"; #pane
+               print "</div>"; #container
+
        }
 
        function print_feed_browser($link, $search, $limit, $mode = 1) {