function batch_edit_cbox($elem, $label = false) {
print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
- onchange=\"batchFeedsToggleField(this, '$elem', '$label')\">";
+ onchange=\"dijit.byId('feedEditDlg').toggleField(this, '$elem', '$label')\">";
}
function module_pref_feeds($link) {
$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();
+ $cat['type'] = 'category';
+
+ $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"]);
}
if ($subop == "editfeed") {
- header("Content-Type: text/xml");
-
- print "<dlg id=\"$subop\">";
- print "<title>".__('Feed Editor')."</title>";
- print "<content><![CDATA[";
$feed_id = db_escape_string($_REQUEST["id"]);
$title = htmlspecialchars(db_fetch_result($result,
0, "title"));
- $icon_file = ICONS_DIR . "/$feed_id.ico";
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img width=\"16\" height=\"16\"
- src=\"" . ICONS_URL . "/$feed_id.ico\">";
- } else {
- $feed_icon = "";
- }
-
- print "<form id=\"edit_feed_form\" onsubmit=\"return false\">";
-
- print "<input type=\"hidden\" name=\"id\" value=\"$feed_id\">";
- print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
- print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$feed_id\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"editSave\">";
print "<div class=\"dlgSec\">".__("Feed")."</div>";
print "<div class=\"dlgSecCont\">";
/* Title */
- print "<input style=\"font-size : 16px\" size=\"40\" onkeypress=\"return filterCR(event, feedEditSave)\"
- name=\"title\" value=\"$title\">";
+ print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+ placeHolder=\"".__("Feed Title")."\"
+ style=\"font-size : 16px; width: 20em\" name=\"title\" value=\"$title\">";
/* Feed URL */
print "<br/>";
print __('URL:') . " ";
- print "<input size=\"40\" onkeypress=\"return filterCR(event, feedEditSave)\"
+ print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+ placeHolder=\"".__("Feed URL")."\"
+ regExp='^(http|https)://.*' style=\"width : 20em\"
name=\"feed_url\" value=\"$feed_url\">";
/* Category */
print __('Place in category:') . " ";
- print_feed_cat_select($link, "cat_id", $cat_id, $disabled);
+ print_feed_cat_select($link, "cat_id", $cat_id,
+ 'dojoType="dijit.form.Select"');
}
print "</div>";
$update_interval = db_fetch_result($result, 0, "update_interval");
- print_select_hash("update_interval", $update_interval, $update_intervals);
+ print_select_hash("update_interval", $update_interval, $update_intervals,
+ 'dojoType="dijit.form.Select"');
/* Update method */
- $update_method = db_fetch_result($result, 0, "update_method");
+ $update_method = db_fetch_result($result, 0, "update_method",
+ 'dojoType="dijit.form.Select"');
print " " . __('using') . " ";
- print_select_hash("update_method", $update_method, $update_methods);
+ print_select_hash("update_method", $update_method, $update_methods,
+ 'dojoType="dijit.form.Select"');
$purge_interval = db_fetch_result($result, 0, "purge_interval");
print __('Article purging:') . " ";
- print_select_hash("purge_interval", $purge_interval, $purge_intervals);
+ print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+ 'dojoType="dijit.form.Select"');
} else {
print "<input type='hidden' name='purge_interval' value='$purge_interval'>";
$auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login"));
- print "<tr><td>" . __('Login:') . "</td><td>";
+# print "<tr><td>" . __('Login:') . "</td><td>";
- print "<input size=\"20\" onkeypress=\"return filterCR(event, feedEditSave)\"
- name=\"auth_login\" value=\"$auth_login\">";
+ print "<input dojoType=\"dijit.form.TextBox\"
+ placeHolder=\"".__("Login")."\"
+ name=\"auth_login\" value=\"$auth_login\"><br/>";
- print "</tr><tr><td>" . __("Password:") . "</td><td>";
+# print "</tr><tr><td>" . __("Password:") . "</td><td>";
$auth_pass = htmlspecialchars(db_fetch_result($result, 0, "auth_pass"));
- print "<input size=\"20\" type=\"password\" name=\"auth_pass\"
- onkeypress=\"return filterCR(event, feedEditSave)\"
+ print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+ placeHolder=\"".__("Password")."\"
value=\"$auth_pass\">";
- print "</td></tr></table>";
+# print "</td></tr></table>";
print "</div>";
print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecCont\">";
-
print "<div style=\"line-height : 100%\">";
+
# print "<div style=\"line-height : 100%\">";
$private = sql_bool_to_bool(db_fetch_result($result, 0, "private"));
if ($private) {
- $checked = "checked";
+ $checked = "checked=\"1\"";
} else {
$checked = "";
}
- print "<input type=\"checkbox\" name=\"private\" id=\"private\"
+ print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
$checked> <label for=\"private\">".__('Hide from Popular feeds')."</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
if ($rtl_content) {
- $checked = "checked";
+ $checked = "checked=\"1\"";
} else {
$checked = "";
}
- print "<br/><input type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
+ print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
$checked> <label for=\"rtl_content\">".__('Right-to-left content')."</label>";
$include_in_digest = sql_bool_to_bool(db_fetch_result($result, 0, "include_in_digest"));
if ($include_in_digest) {
- $checked = "checked";
+ $checked = "checked=\"1\"";
} else {
$checked = "";
}
- print "<br/><input type=\"checkbox\" id=\"include_in_digest\"
+ print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
name=\"include_in_digest\"
$checked> <label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
$checked = "";
}
- print "<br/><input type=\"checkbox\" id=\"always_display_enclosures\"
+ print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
name=\"always_display_enclosures\"
$checked> <label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
if ($cache_images) {
- $checked = "checked";
+ $checked = "checked=\"1\"";
} else {
$checked = "";
}
- if (SIMPLEPIE_CACHE_IMAGES) {
- $disabled = "";
- $label_class = "";
- } else {
- $disabled = "disabled";
- $label_class = "class='insensitive'";
- }
-
- print "<br/><input type=\"checkbox\" id=\"cache_images\"
- name=\"cache_images\" $disabled
- $checked> <label $label_class for=\"cache_images\">".
- __('Cache images locally')."</label>";
+ print "<br/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\"
+ name=\"cache_images\"
+ $checked> <label for=\"cache_images\">".
+ __('Cache images locally (SimplePie only)')."</label>";
+# print "</div>";
print "</div>";
- print "</div>";
-
- print "</form>";
/* Icon */
<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
<input type=\"hidden\" name=\"subop\" value=\"uploadicon\">
- <button onclick=\"return uploadFeedIcon();\"
+ <button dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button>
- <button onclick=\"return removeFeedIcon($feed_id);\"
+ <button dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
type=\"submit\">".__('Remove')."</button>
</form>";
print "<div class='dlgButtons'>
<div style=\"float : left\">
- <button onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+ <button dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
__('Unsubscribe')."</button>
</div>
- <button onclick=\"return feedEditSave()\">".__('Save')."</button>
- <button onclick=\"return feedEditCancel()\">".__('Cancel')."</button>
- </div>";
-
- print "]]></content></dlg>";
+ <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
+ <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
+ </div>";
return;
}
if ($subop == "editfeeds") {
$feed_ids = db_escape_string($_REQUEST["ids"]);
-
- 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\">";
- print "<input type=\"hidden\" name=\"ids\" value=\"$feed_ids\">";
- print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
- print "<input type=\"hidden\" name=\"subop\" value=\"batchEditSave\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"ids\" value=\"$feed_ids\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"batchEditSave\">";
print "<div class=\"dlgSec\">".__("Feed")."</div>";
print "<div class=\"dlgSecCont\">";
/* Title */
- print "<input disabled style=\"font-size : 16px\" size=\"35\" onkeypress=\"return filterCR(event, feedEditSave)\"
- name=\"title\" value=\"$title\">";
+ print "<input dojoType=\"dijit.form.ValidationTextBox\"
+ disabled=\"1\" style=\"font-size : 16px; width : 20em;\" required=\"1\"
+ name=\"title\" value=\"$title\">";
batch_edit_cbox("title");
print "<br/>";
print __('URL:') . " ";
- print "<input disabled size=\"40\" onkeypress=\"return filterCR(event, feedEditSave)\"
+ print "<input dojoType=\"dijit.form.ValidationTextBox\" disabled=\"1\"
+ required=\"1\" regExp='^(http|https)://.*' style=\"width : 20em\"
name=\"feed_url\" value=\"$feed_url\">";
batch_edit_cbox("feed_url");
print __('Place in category:') . " ";
- print_feed_cat_select($link, "cat_id", $cat_id, "disabled");
+ print_feed_cat_select($link, "cat_id", $cat_id,
+ 'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("cat_id");
/* Update Interval */
print_select_hash("update_interval", $update_interval, $update_intervals,
- "disabled");
+ 'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("update_interval");
print " " . __('using') . " ";
print_select_hash("update_method", $update_method, $update_methods,
- "disabled");
+ 'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("update_method");
/* Purge intl */
- if (FORCE_ARTICLE_PURGE != 0) {
+ if (FORCE_ARTICLE_PURGE == 0) {
print "<br/>";
print __('Article purging:') . " ";
print_select_hash("purge_interval", $purge_interval, $purge_intervals,
- "disabled");
+ 'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("purge_interval");
}
print "<div class=\"dlgSec\">".__("Authentication")."</div>";
print "<div class=\"dlgSecCont\">";
- print __('Login:') . " ";
- print "<input disabled size=\"15\" onkeypress=\"return filterCR(event, feedEditSave)\"
+ print "<input dojoType=\"dijit.form.TextBox\"
+ placeHolder=\"".__("Login")."\" disabled=\"1\"
name=\"auth_login\" value=\"$auth_login\">";
batch_edit_cbox("auth_login");
- print " " . __("Password:") . " ";
-
- print "<input disabled size=\"15\" type=\"password\" name=\"auth_pass\"
- onkeypress=\"return filterCR(event, feedEditSave)\"
+ print "<br/><input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+ placeHolder=\"".__("Password")."\" disabled=\"1\"
value=\"$auth_pass\">";
batch_edit_cbox("auth_pass");
print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecCont\">";
- print "<div style=\"line-height : 100%\">";
-
- print "<input disabled type=\"checkbox\" name=\"private\" id=\"private\"
- $checked> <label id=\"private_l\" class='insensitive' for=\"private\">".__('Hide from Popular feeds')."</label>";
+ print "<input disabled=\"1\" type=\"checkbox\" name=\"private\" id=\"private\"
+ dojoType=\"dijit.form.CheckBox\"> <label id=\"private_l\" class='insensitive' for=\"private\">".__('Hide from Popular feeds')."</label>";
print " "; batch_edit_cbox("private", "private_l");
- print "<br/><input disabled type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
- $checked> <label class='insensitive' id=\"rtl_content_l\" for=\"rtl_content\">".__('Right-to-left content')."</label>";
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
+ dojoType=\"dijit.form.CheckBox\"> <label class='insensitive' id=\"rtl_content_l\" for=\"rtl_content\">".__('Right-to-left content')."</label>";
print " "; batch_edit_cbox("rtl_content", "rtl_content_l");
- print "<br/><input disabled type=\"checkbox\" id=\"include_in_digest\"
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"include_in_digest\"
name=\"include_in_digest\"
- $checked> <label id=\"include_in_digest_l\" class='insensitive' for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
+ dojoType=\"dijit.form.CheckBox\"> <label id=\"include_in_digest_l\" class='insensitive' for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
print " "; batch_edit_cbox("include_in_digest", "include_in_digest_l");
- print "<br/><input disabled type=\"checkbox\" id=\"always_display_enclosures\"
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"always_display_enclosures\"
name=\"always_display_enclosures\"
- $checked> <label id=\"always_display_enclosures_l\" class='insensitive' for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
+ dojoType=\"dijit.form.CheckBox\"> <label id=\"always_display_enclosures_l\" class='insensitive' for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
print " "; batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
- print "<br/><input disabled type=\"checkbox\" id=\"cache_images\"
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"cache_images\"
name=\"cache_images\"
- $checked> <label class='insensitive' id=\"cache_images_l\"
+ dojoType=\"dijit.form.CheckBox\"> <label class='insensitive' id=\"cache_images_l\"
for=\"cache_images\">".
__('Cache images locally')."</label>";
- if (SIMPLEPIE_CACHE_IMAGES) {
- print " "; batch_edit_cbox("cache_images", "cache_images_l");
- }
+ print " "; batch_edit_cbox("cache_images", "cache_images_l");
- print "</div>";
print "</div>";
- print "</form>";
-
print "<div class='dlgButtons'>
<input type=\"submit\" class=\"button\"
- onclick=\"return feedsEditSave()\" value=\"".__('Save')."\">
+ onclick=\"return dijit.byId('feedEditDlg').execute()\"
+ value=\"".__('Save')."\">
<input type='submit' class='button'
- onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
+ onclick=\"return dijit.byId('feedEditDlg').hide()\"
+ value=\"".__('Cancel')."\">
</div>";
-
- print "]]></content></dlg>";
-
+
return;
}
db_query($link, "COMMIT");
}
-
+ return;
}
if ($subop == "remove") {
}
- header("Content-Type: text/xml");
- print "<dlg id=\"$subop\">";
- print "<title>".__('Category editor')."</title>";
- print "<content><![CDATA[";
-
if ($action == "add") {
$feed_cat = db_escape_string(trim($_REQUEST["cat"]));
}
}
- print "<div>
- <input id=\"fadd_cat\"
- onkeypress=\"return filterCR(event, addFeedCat)\"
- size=\"40\">
- <button onclick=\"addFeedCat()\">".
- __('Create category')."</button></div>";
+ print "<div dojoType=\"dijit.Toolbar\">
+ <input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"newcat\">
+ <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedCatEditDlg').addCategory()\">".
+ __('Create category')."</button></div>";
$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
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 "<div class=\"prefFeedCatHolder\">";
- print "<form id=\"feed_cat_edit_form\" onsubmit=\"return false\">";
+# print "<form id=\"feed_cat_edit_form\" onsubmit=\"return false\">";
print "<table width=\"100%\" class=\"prefFeedCatList\"
cellspacing=\"0\" id=\"prefFeedCatList\">";
$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);
+ updateFeedList();
+ }
+ });
+ </script>
+ </span>";
+
+ print "</td></tr>";
++$lnum;
}
print "</table>";
- print "</form>";
+# print "</form>";
print "</div>";
print "<div class='dlgButtons'>
<div style='float : left'>
- <button onclick=\"return removeSelectedFeedCats()\">".
- __('Remove')."</button>
+ <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedCatEditDlg').removeSelected()\">".
+ __('Remove selected categories')."</button>
</div>";
- print "<button onclick=\"selectTab('feedConfig')\">".
+ print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedCatEditDlg').hide()\">".
__('Close this window')."</button></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");
+ print "<div id=\"pref-feeds-feeds\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds')."\">";
$result = db_query($link, "SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
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"]);
dojoType=\"dijit.MenuItem\">".__('None')."</div>";
print "</div></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\"> ";
+ 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 dojoType=\"dijit.form.Button\" onclick=\"editFeedCats()\">".
- __('Edit categories')."</button dojoType=\"dijit.form.Button\"> ";
}
+ print $error_button;
+
print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedFeeds()\">"
.__('Unsubscribe')."</button dojoType=\"dijit.form.Button\"> ";
<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\">
+ 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=\"lib.CheckBoxTree\" id=\"feedTree\" _dndController=\"dijit.tree.dndSource\"
- betweenThreshold=\"1\"
+ <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);
- console.log('onClick: ' + id);
-
- if (id.match('FEED')) {
+ 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>
- <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") {
- $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 "<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='toggleSelectRowById(this, \"FEEDR-".$line['id']."\");'
- 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 "<div dojoType=\"dijit.Tooltip\" connectId=\"feedTree\" position=\"below\">
+ <b>Hint:</b> you can drag feeds and categories around.
+ </div>";
print "</div>"; # feeds pane
$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'
- type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
+ $check_box = "<input onclick='toggleSelectListRow2(this)'
+ dojoType=\"dijit.form.CheckBox\"
+ type=\"checkbox\" \">";
$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>";
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB'
- type=\"checkbox\" id=\"FBCHK-" . $line["id"] . "\">";
+ $check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\"
+ type=\"checkbox\">";
$class = ($feedctr % 2) ? "even" : "odd";
git.wh0rd.org / tt-rss.git / blobdiff