$quiet = $_REQUEST["quiet"];
$mode = $_REQUEST["mode"];
+ if ($subop == "renamecat") {
+ $title = db_escape_string($_REQUEST['title']);
+ $id = db_escape_string($_REQUEST['id']);
+
+ if ($title) {
+ db_query($link, "UPDATE ttrss_feed_categories SET
+ title = '$title' WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+ }
+ return;
+ }
+
+ if ($subop == "getfeedtree") {
+
+ $root = array();
+ $root['id'] = 'root';
+ $root['name'] = __('Feeds');
+ $root['items'] = array();
+ $root['type'] = 'category';
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+ $result = db_query($link, "SELECT id, title FROM ttrss_feed_categories
+ WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY order_id, title");
+
+ while ($line = db_fetch_assoc($result)) {
+ $cat = array();
+ $cat['id'] = 'CAT:' . $line['id'];
+ $cat['bare_id'] = $feed_id;
+ $cat['name'] = $line['title'];
+ $cat['items'] = array();
+ $cat['type'] = 'category';
+
+ $feed_result = db_query($link, "SELECT id, title, last_error
+ FROM ttrss_feeds
+ WHERE cat_id = '".$line['id']."' AND owner_uid = ".$_SESSION["uid"].
+ " ORDER BY order_id, title");
+
+ while ($feed_line = db_fetch_assoc($feed_result)) {
+ $feed = array();
+ $feed['id'] = 'FEED:' . $feed_line['id'];
+ $feed['bare_id'] = $feed_line['id'];
+ $feed['name'] = $feed_line['title'];
+ $feed['checkbox'] = false;
+ $feed['error'] = $feed_line['last_error'];
+ $feed['icon'] = getFeedIcon($feed_line['id']);
+
+ array_push($cat['items'], $feed);
+ }
+
+ array_push($root['items'], $cat);
+ }
+
+ /* Uncategorized is a special case */
+
+ $cat = array();
+ $cat['id'] = 'CAT:0';
+ $cat['bare_id'] = 0;
+ $cat['name'] = __("Uncategorized");
+ $cat['items'] = array();
+
+ $feed_result = db_query($link, "SELECT id, title,last_error
+ FROM ttrss_feeds
+ WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
+ " ORDER BY order_id, title");
+
+ while ($feed_line = db_fetch_assoc($feed_result)) {
+ $feed = array();
+ $feed['id'] = 'FEED:' . $feed_line['id'];
+ $feed['bare_id'] = $feed_line['id'];
+ $feed['name'] = $feed_line['title'];
+ $feed['checkbox'] = false;
+ $feed['error'] = $feed_line['last_error'];
+ $feed['icon'] = getFeedIcon($feed_line['id']);
+
+ array_push($cat['items'], $feed);
+ }
+
+ array_push($root['items'], $cat);
+ } else {
+ $feed_result = db_query($link, "SELECT id, title, last_error
+ FROM ttrss_feeds
+ WHERE owner_uid = ".$_SESSION["uid"].
+ " ORDER BY order_id, title");
+
+ while ($feed_line = db_fetch_assoc($feed_result)) {
+ $feed = array();
+ $feed['id'] = 'FEED:' . $feed_line['id'];
+ $feed['bare_id'] = $feed_line['id'];
+ $feed['name'] = $feed_line['title'];
+ $feed['checkbox'] = false;
+ $feed['error'] = $feed_line['last_error'];
+ $feed['icon'] = getFeedIcon($feed_line['id']);
+
+ array_push($root['items'], $feed);
+ }
+ }
+
+ $fl = array();
+ $fl['identifier'] = 'id';
+ $fl['label'] = 'name';
+ $fl['items'] = array($root);
+
+ print json_encode($fl);
+ return;
+ }
+
+ if ($subop == "catsortreset") {
+ db_query($link, "UPDATE ttrss_feed_categories
+ SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
+ return;
+ }
+
+ if ($subop == "feedsortreset") {
+ db_query($link, "UPDATE ttrss_feeds
+ SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
+ return;
+ }
+
+ if ($subop == "savefeedorder") {
+# if ($_POST['payload']) {
+# file_put_contents("/tmp/blahblah.txt", $_POST['payload']);
+# $data = json_decode($_POST['payload'], true);
+# } else {
+# $data = json_decode(file_get_contents("/tmp/blahblah.txt"), true);
+# }
+
+ $data = json_decode($_POST['payload'], true);
+
+ if (is_array($data) && is_array($data['items'])) {
+ $cat_order_id = 0;
+
+ $data_map = array();
+
+ foreach ($data['items'] as $item) {
+
+ if ($item['id'] != 'root') {
+ if (is_array($item['items'])) {
+ if (isset($item['items']['_reference'])) {
+ $data_map[$item['id']] = array($item['items']);
+ } else {
+ $data_map[$item['id']] =& $item['items'];
+ }
+ }
+ }
+ }
+
+ foreach ($data['items'][0]['items'] as $item) {
+ $id = $item['_reference'];
+ $bare_id = substr($id, strpos($id, ':')+1);
+
+ ++$cat_order_id;
+
+ if ($bare_id > 0) {
+ db_query($link, "UPDATE ttrss_feed_categories
+ SET order_id = '$cat_order_id' WHERE id = '$bare_id' AND
+ owner_uid = " . $_SESSION["uid"]);
+ }
+
+ $feed_order_id = 0;
+
+ if (is_array($data_map[$id])) {
+ foreach ($data_map[$id] as $feed) {
+ $id = $feed['_reference'];
+ $feed_id = substr($id, strpos($id, ':')+1);
+
+ if ($bare_id != 0)
+ $cat_query = "cat_id = '$bare_id'";
+ else
+ $cat_query = "cat_id = NULL";
+
+ db_query($link, "UPDATE ttrss_feeds
+ SET order_id = '$feed_order_id',
+ $cat_query
+ WHERE id = '$feed_id' AND
+ owner_uid = " . $_SESSION["uid"]);
+
+ ++$feed_order_id;
+ }
+ }
+ }
+ }
+
+ return;
+ }
+
if ($subop == "removeicon") {
$feed_id = db_escape_string($_REQUEST["feed_id"]);
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>";
+ if ($subop == "editfeed") {
+ header("Content-Type: text/xml");
- print "<div align='center'>
- <button onclick=\"feedBrowserSubscribe()\">".__('Subscribe')."</button>
- <button onclick=\"closeInfoBox()\" >".__('Cancel')."</button></div>";
+ print "<dlg id=\"$subop\">";
+ print "<title>".__('Feed Editor')."</title>";
+ print "<content><![CDATA[";
- print "</div>";
- return;
- } */
-
- 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 "<div>
+ print "<div dojoType=\"dijit.Toolbar\">
<input id=\"fadd_cat\"
onkeypress=\"return filterCR(event, addFeedCat)\"
size=\"40\">
WHERE owner_uid = ".$_SESSION["uid"]."
ORDER BY title");
if (db_num_rows($result) != 0) {
- print __('Select:')."
-
<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>,
-
<a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>";
-
+# print __('Select:')."
+
# <a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'all')\">".__('All')."</a>,
+
# <a href=\"#\" onclick=\"selectTableRows('prefFeedCatList', 'none')\">".__('None')."</a>";
+#
print "<div class=\"prefFeedCatHolder\">";
print "<form id=\"feed_cat_edit_form\" onsubmit=\"return false\">";
$cat_id = $line["id"];
$this_row_id = "id=\"FCATR-$cat_id\"";
- print "<tr class=\"$class\" $this_row_id>";
+ print "<tr class=\"\" $this_row_id>";
$edit_title = htmlspecialchars($line["title"]);
print "<td width='5%' align='center'><input
- onclick='toggleSelectRow(this);'
+ onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" id=\"FCCHK-$cat_id\"></td>";
- print "<td><span id=\"FCATT-$cat_id\">" .
- $edit_title . "</span></td>";
+ print "<td>";
- print "</tr>";
+# print "<span id=\"FCATT-$cat_id\">" .
+# $edit_title . "</span>";
+
+ print "<span dojoType=\"dijit.InlineEditBox\"
+ width=\"300px\" autoSave=\"false\"
+ cat-id=\"$cat_id\">" . $edit_title .
+ "<script type=\"dojo/method\" event=\"onChange\" args=\"item\">
+ var elem = this;
+ dojo.xhrPost({
+ url: 'backend.php',
+ content: {op: 'pref-feeds', subop: 'editCats',
+ action: 'save',
+ value: this.value,
+ cid: this.srcNodeRef.getAttribute('cat-id')},
+ load: function(response) {
+ elem.attr('value', response);
+ }
+ });
+ </script>
+ </span>";
+
+ print "</td></tr>";
++$lnum;
}
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
if ($num_errors > 0) {
- print format_notice("<a href=\"javascript:showFeedsWithErrors()\">".
- __('Some feeds have update errors (click for details)')."</a>");
+ $error_button = "<button dojoType=\"dijit.form.Button\"
+ onclick=\"showFeedsWithErrors\" id=\"errorButton\">" .
+ __("Feeds with errors") . "</button>";
+
+// print format_notice("<a href=\"javascript:showFeedsWithErrors()\">".
+// __('Some feeds have update errors (click for details)')."</a>");
}
$feed_search = db_escape_string($_REQUEST["search"]);
$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> ";
-
- print "<button onclick=\"editSelectedFeed()\">".
- __('Edit feeds')."</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></div>";
+
+ print "<div dojoType=\"dijit.form.DropDownButton\">".
+ "<span>" . __('Feeds')."</span>";
+ print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+ print "<div onclick=\"quickAddFeed()\"
+ dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
+ print "<div onclick=\"editSelectedFeed()\"
+ dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
+ print "<div onclick=\"resetFeedOrder()\"
+ dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
+ print "</div></div>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<div dojoType=\"dijit.form.DropDownButton\">".
+ "<span>" . __('Categories')."</span>";
+ print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+ print "<div onclick=\"editFeedCats()\"
+ dojoType=\"dijit.MenuItem\">".__('Edit categories')."</div>";
+ print "<div onclick=\"resetCatOrder()\"
+ dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
+ print "</div></div>";
- print "<button onclick=\"editFeedCats()\">".
- __('Edit categories')."</button> ";
}
- print "<button onclick=\"removeSelectedFeeds()\">"
- .__('Unsubscribe')."</button> ";
+ print $error_button;
+
+ print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedFeeds()\">"
+ .__('Unsubscribe')."</button dojoType=\"dijit.form.Button\"> ";
if (defined('_ENABLE_FEED_DEBUGGING')) {
}
- $feeds_sort = db_escape_string($_REQUEST["sort"]);
-
- if (!$feeds_sort || $feeds_sort == "undefined") {
- $feeds_sort = $_SESSION["pref_sort_feeds"];
- if (!$feeds_sort) $feeds_sort = "title";
- }
-
- $_SESSION["pref_sort_feeds"] = $feeds_sort;
-
- if ($feed_search) {
-
- $feed_search = split(" ", $feed_search);
- $tokens = array();
-
- foreach ($feed_search as $token) {
-
- $token = trim($token);
-
- array_push($tokens, "(UPPER(F1.title) LIKE UPPER('%$token%') OR
- UPPER(C1.title) LIKE UPPER('%$token%') OR
- UPPER(F1.feed_url) LIKE UPPER('%$token%'))");
- }
-
- $search_qpart = "(" . join($tokens, " AND ") . ") AND ";
-
- } else {
- $search_qpart = "";
- }
-
- $show_last_article_info = false;
- $show_last_article_checked = "";
- $show_last_article_qpart = "";
-
- if ($_REQUEST["slat"] == "true") {
- $show_last_article_info = true;
- $show_last_article_checked = "checked";
- $show_last_article_qpart = ", (SELECT ".SUBSTRING_FOR_DATE."(MAX(updated),1,16) FROM ttrss_user_entries,
- ttrss_entries WHERE ref_id = ttrss_entries.id
- AND feed_id = F1.id) AS last_article";
- } else if ($feeds_sort == "last_article") {
- $feeds_sort = "title";
- }
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- $order_by_qpart = "category,$feeds_sort,title";
- } else {
- $order_by_qpart = "$feeds_sort,title";
- }
-
- $result = db_query($link, "SELECT
- F1.id,
- F1.title,
- F1.feed_url,
- ".SUBSTRING_FOR_DATE."(F1.last_updated,1,16) AS last_updated,
- F1.update_interval,
- F1.last_error,
- F1.purge_interval,
- F1.cat_id,
- C1.title AS category,
- F1.include_in_digest
- $show_last_article_qpart
- FROM
- ttrss_feeds AS F1
- LEFT JOIN ttrss_feed_categories AS C1
- ON (F1.cat_id = C1.id)
- WHERE
- $search_qpart F1.owner_uid = '".$_SESSION["uid"]."'
- ORDER by $order_by_qpart");
-
- 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\">".
- "<div style='float : right'>".
- "<input id='show_last_article_times' type='checkbox' onchange='feedlistToggleSLAT()'
- $show_last_article_checked><label
- for='show_last_article_times'>".__('Show last article times')."</label></div>".
- __('Select:')."
- <a href=\"#\" onclick=\"selectTableRows('prefFeedList', 'all')\">".__('All')."</a>,
- <a href=\"#\" onclick=\"selectTableRows('prefFeedList', 'none')\">".__('None')."</a>
- </td</tr>";
-
- if (!get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<tr class=\"title\">
- <td width='5%' align='center'> </td>";
-
- print "<td width='3%'> </td>";
-
- print "<td width='60%'><a href=\"#\" onclick=\"updateFeedList('title')\">".__('Title')."</a></td>";
-
- if ($show_last_article_info) {
- print "<td width='20%' align='right'><a href=\"#\" onclick=\"updateFeedList('last_article')\">".__('Last Article')."</a></td>";
- }
-
- print "<td width='20%' align='right'><a href=\"#\" onclick=\"updateFeedList('last_updated')\">".__('Updated')."</a></td>";
- }
-
- $lnum = 0;
-
- $cur_cat_id = -1;
-
- while ($line = db_fetch_assoc($result)) {
-
- $feed_id = $line["id"];
- $cat_id = $line["cat_id"];
-
- $edit_title = htmlspecialchars($line["title"]);
- $edit_cat = htmlspecialchars($line["category"]);
-
- $last_error = $line["last_error"];
-
- if (!$edit_cat) $edit_cat = __("Uncategorized");
-
- $last_updated = $line["last_updated"];
-
- if (!$last_updated) {
- $last_updated = "—";
- } else {
- $last_updated = make_local_datetime($link, $last_updated, false);
- }
-
- $last_article = $line["last_article"];
-
- if (!$last_article) {
- $last_article = "—";
- } else {
- $last_article = make_local_datetime($link, $last_article, false);
- }
-
- if (get_pref($link, 'ENABLE_FEED_CATS') && $cur_cat_id != $cat_id) {
- $lnum = 0;
-
- print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
-
- print "<tr class=\"title\">
- <td width='5%'> </td>";
-
- print "<td width='3%'> </td>";
-
- print "<td width='60%'><a href=\"#\" onclick=\"updateFeedList('title')\">".__('Title')."</a></td>";
-
- if ($show_last_article_info) {
- print "<td width='20%' align='right'>
- <a href=\"#\" onclick=\"updateFeedList('last_article')\">".__('Last Article')."</a></td>";
- }
-
- print "<td width='20%' align='right'>
- <a href=\"#\" onclick=\"updateFeedList('last_updated')\">".__('Updated')."</a></td>";
-
- $cur_cat_id = $cat_id;
- }
-
- $class = ($lnum % 2) ? "even" : "odd";
- $this_row_id = "id=\"FEEDR-$feed_id\"";
-
- print "<tr class=\"$class\" $this_row_id>";
-
- $icon_file = ICONS_DIR . "/$feed_id.ico";
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL . "/$feed_id.ico\">";
- } else {
- $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
- }
-
- print "<td class='feedSelect'><input onclick='toggleSelecRow(this);'
- type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
-
- $onclick = "onclick='editFeed($feed_id, event)' title='".__('Click to edit')."'";
-
- print "<td $onclick class='feedIcon'>$feed_icon</td>";
-
- if ($last_error) {
- $edit_title = "<span class=\"feed_error\">$edit_title</span>";
- $last_updated = "<span class=\"feed_error\">$last_updated</span>";
- $last_article = "<span class=\"feed_error\">$last_article</span>";
- }
-
- print "<td $onclick>" . $edit_title . "</td>";
-
- if ($show_last_article_info) {
- print "<td align='right' $onclick>" .
- "$last_article</td>";
- }
-
- print "<td $onclick align='right'>$last_updated</td>";
-
- print "</tr>";
-
- ++$lnum;
- }
-
- print "</table>";
-
- print "<p>";
-
- } else {
-
- print "<p>";
-
- if (!$feed_search) {
- print_warning(__("You don't have any subscribed feeds."));
- } else {
- print_warning(__('No matching feeds found.'));
- }
- print "</p>";
-
- }
-
- print "<h3>".__('OPML')."</h3>";
+ print "</div>"; # toolbar
+
+ print "<div id=\"feedlistLoading\">
+ <img src='images/indicator_tiny.gif'>".
+ __("Loading, please wait...")."</div>";
+
+ print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
+ url=\"backend.php?op=pref-feeds&subop=getfeedtree\">
+ </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=\"fox.PrefFeedTree\" id=\"feedTree\"
+ dndController=\"dijit.tree.dndSource\"
+ betweenThreshold=\"5\"
+ 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);
+
+ if (id.match('FEED:')) {
+ editFeed(bare_id, event);
+ } else if (id.match('CAT:')) {
+ editCat(bare_id, item, event);
+ }
+ </script>
+ <script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
+ Element.hide(\"feedlistLoading\");
+ </script>
+ </div>";
+
+ print "<div dojoType=\"dijit.Tooltip\" connectId=\"feedTree\" position=\"below\">
+ <b>Hint:</b> you can drag feeds and categories around.
+ </div>";
-/* 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\">
- <input type=\"hidden\" name=\"op\" value=\"Import\">
- <button onclick=\"return validateOpmlImport();\"
- type=\"submit\">".__('Import')."</button>
- </form></div>";
+ print "</div>"; # feeds pane
- print " "; */
+ 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> ";
- 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> ";
+ print "</div>"; # pane
+
if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
-
- print "<h3>" . __("Firefox Integration") . "</h3>";
+
+ 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>";
- print "<p";
+ print "<p>";
print "<button onclick='window.navigator.registerContentHandler(" .
"\"application/vnd.mozilla.maybe.feed\", " .
"</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) {
$icon_file = ICONS_DIR . "/" . $details["id"] . ".ico";
if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
+ $feed_icon = "<img style=\"vertical-align : middle\" class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
"/".$details["id"].".ico\">";
} else {
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- $check_box = "<input onclick='toggleSelectListRow(this)'
- class='feedBrowseCB'
+ $check_box = "<input onclick='toggleSelectListRow2(this)'
+ dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
$class = ($feedctr % 2) ? "even" : "odd";
src='images/feed-icon-12x12.png'></a>";
print "<li title=\"".htmlspecialchars($details["site_url"])."\"
- class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
+ id=\"FBROW-".$details["id"]."\">$check_box".
"$feed_icon $feed_url " . htmlspecialchars($details["title"]) .
" <span class='subscribers'>($subscribers)</span>
$site_url</li>";
git.wh0rd.org / tt-rss.git / blobdiff