From 911d4c0836cf6d1be53be5917739defc91277a7e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 16:49:06 +0400 Subject: add experimental digest thingie --- modules/backend-rpc.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'modules') diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index b21e161e4..f8233a7cd 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -978,6 +978,42 @@ return; } + if ($subop == "digest-init") { + print ""; + + $tmp_feeds = api_get_feeds($link, false, true, false, 0); + $feeds = array(); + + foreach ($tmp_feeds as $f) { + if ($f['id'] > 0) array_push($feeds, $f); + } + + function feeds_sort_by_unread_rev($a, $b) { + $a = $a['unread']; + $b = $b['unread']; + + if ($a == $b) { + return 0; + } + return ($a < $b) ? 1 : -1; + } + +// uasort($feeds, 'feeds_sort_by_unread_rev'); +// $feeds = array_slice($feeds, 0, 10); + + print ""; + + $headlines = api_get_headlines($link, -4, 20, 0, + '', true, true, false, "all_articles", "updated DESC"); + + //function api_get_headlines($link, $feed_id, $limit, $offset, + // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { + + print ""; + print ""; + return; + } + print "Unknown method: $subop"; } ?> -- cgit v1.2.3-54-g00ecf From b41c254984df3fcb9fc7db4bb5218f2391e62164 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 19:02:12 +0400 Subject: small digest page improvements --- digest.css | 8 +++++ digest.js | 57 +++++++++++++++++++++++++++++--- digest.php | 1 - functions.php | 88 ++++++++++++++++++++++++++----------------------- modules/backend-rpc.php | 14 +++++--- 5 files changed, 115 insertions(+), 53 deletions(-) (limited to 'modules') diff --git a/digest.css b/digest.css index 5139114f0..62852adb0 100644 --- a/digest.css +++ b/digest.css @@ -126,6 +126,14 @@ a:hover { padding : 0px; } +#feeds ul#feeds-content li a { + color : #659a4c; +} + +#feeds ul#feeds-content li a:hover { + color : gray; +} + #headlines { padding : 5px; font-size : 14px; diff --git a/digest.js b/digest.js index 7bfd9df27..3d58ca95f 100644 --- a/digest.js +++ b/digest.js @@ -1,5 +1,19 @@ var last_feeds = []; +function view(feed_id) { + try { + + new Ajax.Request("backend.php", { + parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id, + onComplete: function(transport) { + digest_update(transport); + } }); + + } catch (e) { + exception_error("view", e); + } +} + function find_feed(feeds, feed_id) { try { for (var i = 0; i < feeds.length; i++) { @@ -14,16 +28,40 @@ function find_feed(feeds, feed_id) { } } +function get_feed_icon(feed) { + try { + if (feed.has_icon) + return 'icons/' + feed.id + '.ico'; + + if (feed.id == -1) + return 'images/mark_set.png'; + + if (feed.id == -2) + return 'images/pub_set.png'; + + if (feed.id == -3) + return 'images/fresh.png'; + + if (feed.id == -4) + return 'images/tag.png'; + + if (feed.id < -10) + return 'images/label.png'; + + } catch (e) { + exception_error("get_feed_icon", e); + } +} + function add_feed_entry(feed) { try { var icon_part = ""; - if (feed.has_icon) - icon_part = "zz"; + icon_part = ""; var tmp_html = "
  • " + icon_part + - feed.title + + "" + feed.title + "
    " + feed.unread + "
    " + "
    • "; @@ -34,8 +72,11 @@ function add_feed_entry(feed) { } } -function add_latest_entry(article) { +function add_latest_entry(article, feed) { try { + + + //$("latest-content").innerHTML += "bbb"; } catch (e) { exception_error("add_latest_entry", e); @@ -55,7 +96,7 @@ function add_headline_entry(article, feed) { "" + article.title + "" + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + - article.updated + "
    " + + new Date(article.updated * 1000) + "" + ""; $("headlines-content").innerHTML += tmp_html; @@ -75,6 +116,8 @@ function digest_update(transport) { feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + $('feeds-content').innerHTML = ""; + for (var i = 0; i < feeds.length; i++) { add_feed_entry(feeds[i]); } @@ -83,9 +126,13 @@ function digest_update(transport) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + $('headlines-content').innerHTML = ""; + for (var i = 0; i < headlines.length; i++) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } + + $('headlines-content').innerHTML += "
  • More articles...
    • "; } } catch (e) { diff --git a/digest.php b/digest.php index cfe16cfe4..94489eb0b 100644 --- a/digest.php +++ b/digest.php @@ -39,7 +39,6 @@ - diff --git a/functions.php b/functions.php index 78e0d4f18..ce1a06a62 100644 --- a/functions.php +++ b/functions.php @@ -6653,51 +6653,9 @@ } function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) { - if ($limit) { - $limit_qpart = "LIMIT $limit OFFSET $offset"; - } else { - $limit_qpart = ""; - } - - if (!$cat_id) { - $result = db_query($link, "SELECT - id, feed_url, cat_id, title, ". - SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated - FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . - " ORDER BY cat_id, title " . $limit_qpart); - } else { - $result = db_query($link, "SELECT - id, feed_url, cat_id, title, ". - SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated - FROM ttrss_feeds WHERE - cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . - " ORDER BY cat_id, title " . $limit_qpart); - } $feeds = array(); - while ($line = db_fetch_assoc($result)) { - - $unread = getFeedUnread($link, $line["id"]); - - $has_icon = feed_has_icon($line['id']); - - if ($unread || !$unread_only) { - - $row = array( - "feed_url" => $line["feed_url"], - "title" => $line["title"], - "id" => (int)$line["id"], - "unread" => (int)$unread, - "has_icon" => $has_icon, - "cat_id" => (int)$line["cat_id"], - "last_updated" => strtotime($line["last_updated"]) - ); - - array_push($feeds, $row); - } - } - /* Labels */ if (!$cat_id || $cat_id == -2) { @@ -6741,6 +6699,52 @@ } } + + /* Real feeds */ + + if ($limit) { + $limit_qpart = "LIMIT $limit OFFSET $offset"; + } else { + $limit_qpart = ""; + } + + if (!$cat_id) { + $result = db_query($link, "SELECT + id, feed_url, cat_id, title, ". + SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . + " ORDER BY cat_id, title " . $limit_qpart); + } else { + $result = db_query($link, "SELECT + id, feed_url, cat_id, title, ". + SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + FROM ttrss_feeds WHERE + cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . + " ORDER BY cat_id, title " . $limit_qpart); + } + + while ($line = db_fetch_assoc($result)) { + + $unread = getFeedUnread($link, $line["id"]); + + $has_icon = feed_has_icon($line['id']); + + if ($unread || !$unread_only) { + + $row = array( + "feed_url" => $line["feed_url"], + "title" => $line["title"], + "id" => (int)$line["id"], + "unread" => (int)$unread, + "has_icon" => $has_icon, + "cat_id" => (int)$line["cat_id"], + "last_updated" => strtotime($line["last_updated"]) + ); + + array_push($feeds, $row); + } + } + return $feeds; } diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index f8233a7cd..edf2ae2e4 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -979,13 +979,17 @@ } if ($subop == "digest-init") { + $feed_id = db_escape_string($_REQUEST['feed_id']); + + if (!$feed_id) $feed_id = -4; + print ""; $tmp_feeds = api_get_feeds($link, false, true, false, 0); $feeds = array(); foreach ($tmp_feeds as $f) { - if ($f['id'] > 0) array_push($feeds, $f); + if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f); } function feeds_sort_by_unread_rev($a, $b) { @@ -998,13 +1002,13 @@ return ($a < $b) ? 1 : -1; } -// uasort($feeds, 'feeds_sort_by_unread_rev'); -// $feeds = array_slice($feeds, 0, 10); + //uasort($feeds, 'feeds_sort_by_unread_rev'); + //$feeds = array_slice($feeds, 0, 10); print ""; - $headlines = api_get_headlines($link, -4, 20, 0, - '', true, true, false, "all_articles", "updated DESC"); + $headlines = api_get_headlines($link, $feed_id, 10, 0, + '', ($feed_id == -4), true, false, "all_articles", "updated DESC"); //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { -- cgit v1.2.3-54-g00ecf From 1ca8997bcc818bdfa12f3c979b9e0981422cdbc0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 21:44:04 +0400 Subject: more digest page improvements --- digest.css | 9 +++++++-- digest.js | 45 ++++++++++++++++++++++++++++++++++++--------- modules/backend-rpc.php | 29 ++++++++++++++++++++--------- 3 files changed, 63 insertions(+), 20 deletions(-) (limited to 'modules') diff --git a/digest.css b/digest.css index 62852adb0..3c770b765 100644 --- a/digest.css +++ b/digest.css @@ -156,6 +156,7 @@ a:hover { #headlines ul#headlines-content li { margin : 0px 0px 10px 0px; color : #909090; + clear : left; } #headlines ul#headlines-content a.title { @@ -164,12 +165,16 @@ a:hover { } #headlines ul#headlines-content div.excerpt { - margin-left : 22px; color : #404040; } +#headlines ul#headlines-content div.body { + margin-left : 21px; +} + #headlines ul#headlines-content div.info { - margin-left : 22px; + margin-top : 2px; + font-size : 11px; } #headlines ul#headlines-content div.info a { diff --git a/digest.js b/digest.js index 3d58ca95f..f27f15f86 100644 --- a/digest.js +++ b/digest.js @@ -1,12 +1,29 @@ var last_feeds = []; -function view(feed_id) { +var _active_feed_id = false; +var _active_feed_offset = false; + +function viewfeed(feed_id, offset) { try { + if (!feed_id) feed_id = _active_feed_id; + + if (!offset) + offset = 0; + else + offset = _active_feed_offset + offset; + + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + + "&offset=" + offset; + + console.log(query); + new Ajax.Request("backend.php", { - parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id, + parameters: query, onComplete: function(transport) { digest_update(transport); + _active_feed_id = feed_id; + _active_feed_offset = offset; } }); } catch (e) { @@ -61,7 +78,7 @@ function add_feed_entry(feed) { var tmp_html = "
  • " + icon_part + - "" + feed.title + + "" + feed.title + "
    " + feed.unread + "
    " + "
    • "; @@ -89,15 +106,15 @@ function add_headline_entry(article, feed) { var icon_part = ""; if (article.has_icon) - icon_part = "zz"; + icon_part = ""; var tmp_html = "
  • " + icon_part + "" + article.title + "" + - "
    " + article.excerpt + "
    " + + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + - "
    • "; + ""; $("headlines-content").innerHTML += tmp_html; @@ -112,15 +129,17 @@ function digest_update(transport) { var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; if (feeds) { - last_feeds = feeds; - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + last_feeds = feeds; + $('feeds-content').innerHTML = ""; for (var i = 0; i < feeds.length; i++) { add_feed_entry(feeds[i]); } + } else { + feeds = last_feeds; } if (headlines) { @@ -128,11 +147,18 @@ function digest_update(transport) { $('headlines-content').innerHTML = ""; + Element.hide('headlines-content'); + for (var i = 0; i < headlines.length; i++) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } - $('headlines-content').innerHTML += "
  • More articles...
    • "; + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; + + new Effect.Appear('headlines-content'); + } } catch (e) { @@ -147,6 +173,7 @@ function digest_init() { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { digest_update(transport); + window.setTimeout('viewfeed(-4)', 100); } }); } catch (e) { diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index edf2ae2e4..80eda7c3f 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -978,11 +978,29 @@ return; } - if ($subop == "digest-init") { + if ($subop == "digest-update") { $feed_id = db_escape_string($_REQUEST['feed_id']); - + $offset = db_escape_string($_REQUEST['offset']); + if (!$feed_id) $feed_id = -4; + if (!$offset) $offset = 0; + + print ""; + + $headlines = api_get_headlines($link, $feed_id, 10, $offset, + '', ($feed_id == -4), true, false, "unread", "updated DESC"); + + //function api_get_headlines($link, $feed_id, $limit, $offset, + // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { + + print ""; + + print ""; + return; + } + + if ($subop == "digest-init") { print ""; $tmp_feeds = api_get_feeds($link, false, true, false, 0); @@ -1007,13 +1025,6 @@ print ""; - $headlines = api_get_headlines($link, $feed_id, 10, 0, - '', ($feed_id == -4), true, false, "all_articles", "updated DESC"); - - //function api_get_headlines($link, $feed_id, $limit, $offset, - // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { - - print ""; print ""; return; } -- cgit v1.2.3-54-g00ecf From 118e9399b7896472af1f3e3c349c35a9a94072b1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 13:59:21 +0400 Subject: more digest page improvements --- digest.css | 17 ++++++ digest.js | 129 ++++++++++++++++++++++++++++++++++++++++----- images/digest_checkbox.png | Bin 0 -> 244 bytes modules/backend-rpc.php | 2 +- 4 files changed, 134 insertions(+), 14 deletions(-) create mode 100755 images/digest_checkbox.png (limited to 'modules') diff --git a/digest.css b/digest.css index 3c770b765..f82bd54cd 100644 --- a/digest.css +++ b/digest.css @@ -137,6 +137,13 @@ a:hover { #headlines { padding : 5px; font-size : 14px; + max-width : 65%; +} + +#headlines ul#headlines-content img.digest-check { + float : right; + cursor : pointer; + } #headlines ul#headlines-content img { @@ -159,6 +166,10 @@ a:hover { clear : left; } +#headlines ul#headlines-content li:hover { + background : #fafafa; +} + #headlines ul#headlines-content a.title { font-weight : bold; font-size : 16px; @@ -166,10 +177,16 @@ a:hover { #headlines ul#headlines-content div.excerpt { color : #404040; + cursor : pointer; +} + +#headlines ul#headlines-content div.content { + color : #404040; } #headlines ul#headlines-content div.body { margin-left : 21px; + /*margin-left : 42px;*/ } #headlines ul#headlines-content div.info { diff --git a/digest.js b/digest.js index d641733f0..01f96a54e 100644 --- a/digest.js +++ b/digest.js @@ -2,12 +2,81 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; +var _update_timeout = false; -function view(article_id) { +function zoom(article_id) { try { - new Effect.Fade('A-' + article_id, {duration : 0.3}); + var elem = $('A-' + article_id); - return true; + if (elem) { + var divs = elem.getElementsByTagName('DIV'); + + for (var i = 0; i < divs.length; i++) { + if (divs[i].className == 'excerpt') + Element.hide(divs[i]); + + if (divs[i].className == 'content') + Element.show(divs[i]); + } + } + + var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.clearTimeout(_update_timeout); + _update_timeout = window.setTimeout('update()', 1000); + } }); + + } catch (e) { + exception_error("zoom", e); + } +} + +function load_more() { + try { + var elem = $('MORE-PROMPT'); + + if (elem) { + elem.id = ''; + Element.hide(elem); + } + + viewfeed(_active_feed_id, _active_feed_offset + 10); + } catch (e) { + exception_error("load_more", e); + } +} + +function update() { + try { + viewfeed(_active_feed_id, _active_feed_offset); + } catch (e) { + exception_error("update", e); + } +} + +function view(article_id, dismiss_only) { + try { + var elem = $('A-' + article_id); + + elem.id = ''; + + //new Effect.Fade(elem, {duration : 0.3}); + + Element.hide(elem); + + var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.clearTimeout(_update_timeout); + _update_timeout = window.setTimeout('update()', 1000); + } }); + + return dismiss_only != true; } catch (e) { exception_error("view", e); } @@ -31,7 +100,7 @@ function viewfeed(feed_id, offset) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - digest_update(transport); + digest_update(transport, feed_id); _active_feed_id = feed_id; _active_feed_offset = offset; } }); @@ -41,6 +110,20 @@ function viewfeed(feed_id, offset) { } } +function find_article(articles, article_id) { + try { + for (var i = 0; i < articles.length; i++) { + if (articles[i].id == article_id) + return articles[i]; + } + + return false; + + } catch (e) { + exception_error("find_article", e); + } +} + function find_feed(feeds, feed_id) { try { for (var i = 0; i < feeds.length; i++) { @@ -120,10 +203,15 @@ function add_headline_entry(article, feed) { var tmp_html = "
  • " + icon_part + + "" + "" + article.title + "" + - "
    " + article.excerpt + "
    " + + "
    " + + "
    " + + article.excerpt + "
    " + + "" + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + "
    • "; @@ -135,7 +223,7 @@ function add_headline_entry(article, feed) { } } -function digest_update(transport) { +function digest_update(transport, feed_id) { try { var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; @@ -157,17 +245,32 @@ function digest_update(transport) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - $('headlines-content').innerHTML = ""; + if (_active_feed_id != feed_id) + $('headlines-content').innerHTML = ""; + + //Element.hide('headlines-content'); + + var pr = $('MORE-PROMPT'); - Element.hide('headlines-content'); + if (pr) { + pr.id = ''; + Element.hide(pr); + } for (var i = 0; i < headlines.length; i++) { - add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + var elem = $('A-' + headlines[i].id); + + if (elem && Element.visible(elem)) { + + + } else { + add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + } } -// $('headlines-content').innerHTML += "
  • " + -// "
    " + -// __("More articles...") + "
    • "; + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; new Effect.Appear('headlines-content'); @@ -184,7 +287,7 @@ function digest_init() { new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { - digest_update(transport); + digest_update(transport, -4); window.setTimeout('viewfeed(-4)', 100); } }); diff --git a/images/digest_checkbox.png b/images/digest_checkbox.png new file mode 100755 index 000000000..c5e4b98ea Binary files /dev/null and b/images/digest_checkbox.png differ diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 80eda7c3f..70b690111 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -989,7 +989,7 @@ print ""; $headlines = api_get_headlines($link, $feed_id, 10, $offset, - '', ($feed_id == -4), true, false, "unread", "updated DESC"); + '', ($feed_id == -4), true, true, "unread", "updated DESC"); //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { -- cgit v1.2.3-54-g00ecf From c1b5cd23e068d269a2736ac4759fbaa09243f4dd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 11:05:03 +0400 Subject: digest: support feed catchup --- digest.css | 5 ++ digest.js | 194 ++++++++++++++++++++++++++++++------------------ modules/backend-rpc.php | 14 ++++ 3 files changed, 139 insertions(+), 74 deletions(-) (limited to 'modules') diff --git a/digest.css b/digest.css index b500a47e7..2c30b0eb8 100644 --- a/digest.css +++ b/digest.css @@ -109,6 +109,11 @@ a:hover { margin-right : 5px; } +#feeds ul#feeds-content div.unread-ctr img.dismiss { + margin-right : 0px; + cursor : pointer; +} + #feeds ul#feeds-content div.unread-ctr { color : gray; float : right; diff --git a/digest.js b/digest.js index fffdf16ea..a3cbb4879 100644 --- a/digest.js +++ b/digest.js @@ -3,6 +3,36 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +var _feedlist_expanded = false; + +function catchup_feed(feed_id, callback) { + try { + + var fn = find_feed(last_feeds, feed_id).title; + + if (confirm(__("Mark all articles in %s as read?").replace("%s", fn))) { + + var is_cat = ""; + + if (feed_id == -4) is_cat = "true"; + + var query = "?op=rpc&subop=catchupFeed&feed_id=" + + feed_id + "&is_cat=" + is_cat; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + + update(); + } }); + } + + } catch (e) { + exception_error("catchup_article", e); + } +} + function catchup_article(article_id, callback) { try { @@ -205,10 +235,14 @@ function add_feed_entry(feed) { icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + - "" + feed.title + - "
    " + feed.unread + "
    " + + "    " + feed.title + "" + + "
    " + + "" + + "" + feed.unread + "" + + "
    " + "
    • "; $("feeds-content").innerHTML += tmp_html; @@ -252,9 +286,48 @@ function add_headline_entry(article, feed) { } } +function expand_feeds() { + try { + _feedlist_expanded = true; + + redraw_feedlist(last_feeds); + + } catch (e) { + exception_error("expand_feeds", e); + } +} + +function redraw_feedlist(feeds) { + try { + + $('feeds-content').innerHTML = ""; + + var limit = 10; + + if (_feedlist_expanded) limit = feeds.length; + + for (var i = 0; i < Math.min(limit, feeds.length); i++) { + add_feed_entry(feeds[i]); + } + + if (feeds.length > limit) { + $('feeds-content').innerHTML += "
  • " + + "" + + "" + + __("%d more...").replace("%d", feeds.length-10) + + "" + "
    • "; + } + + } catch (e) { + exception_error("redraw_feedlist", e); + } +} + function parse_feeds(transport) { try { + if (!transport.responseXML) return; + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; if (feeds) { @@ -275,11 +348,7 @@ function parse_feeds(transport) { last_feeds = feeds; - $('feeds-content').innerHTML = ""; - - for (var i = 0; i < feeds.length; i++) { - add_feed_entry(feeds[i]); - } + redraw_feedlist(feeds); } } catch (e) { @@ -289,6 +358,8 @@ function parse_feeds(transport) { function parse_headlines(transport, replace) { try { + if (!transport.responseXML) return; + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; if (headlines) { @@ -296,7 +367,7 @@ function parse_headlines(transport, replace) { if (replace) $('headlines-content').innerHTML = ''; - var pr = $('MORE-PROMPT'); + var pr = $('H-MORE-PROMPT'); if (pr) pr.parentNode.removeChild(pr); @@ -311,7 +382,7 @@ function parse_headlines(transport, replace) { if (pr) { $('headlines-content').appendChild(pr); } else { - $('headlines-content').innerHTML += "
  • " + + $('headlines-content').innerHTML += "
  • " + "
    " + __("More articles...") + "
    • "; } @@ -324,70 +395,6 @@ function parse_headlines(transport, replace) { } } -/*function digest_update(transport, feed_id, offset) { - try { - var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; - var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; - - if (feeds) { - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); - - last_feeds = feeds; - - $('feeds-content').innerHTML = ""; - - for (var i = 0; i < feeds.length; i++) { - add_feed_entry(feeds[i]); - } - } else { - feeds = last_feeds; - } - - if (headlines) { - headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - - if (_active_feed_id != feed_id || !offset) - $('headlines-content').innerHTML = ""; - - var pr = $('MORE-PROMPT'); - - if (pr) { - pr.id = ''; - Element.hide(pr); - } - - for (var i = 0; i < headlines.length; i++) { - var elem = $('A-' + headlines[i].id); - - if (elem && Element.visible(elem)) { - if (!headlines[i].unread) - remove_headline_entry(headlines[i].id); - - } else { - add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); - } - } - - $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; - - new Effect.Appear('headlines-content'); - } - - if (feed_id != undefined) { - _active_feed_id = feed_id; - } - - if (offset != undefined) _active_feed_offset = offset; - - mark_selected_feed(_active_feed_id); - - } catch (e) { - exception_error("digest_update", e); - } -} */ - function init() { try { @@ -555,4 +562,43 @@ function fatal_error_check(transport) { return true; } +function feed_mi(elem) { + try { + var imgs = elem.getElementsByTagName('IMG'); + var spans = elem.getElementsByTagName('SPAN'); + + for (var i = 0; i < imgs.length; i++) { + if (imgs[i].className == "dismiss") + Element.show(imgs[i]); + } + + for (var i = 0; i < spans.length; i++) { + if (spans[i].className == "unread") + Element.hide(spans[i]); + } + + + } catch (e) { + exception_error("feed_mi", e); + } +} + +function feed_mo(elem) { + try { + var imgs = elem.getElementsByTagName('IMG'); + var spans = elem.getElementsByTagName('SPAN'); + + for (var i = 0; i < imgs.length; i++) { + if (imgs[i].className == "dismiss") + Element.hide(imgs[i]); + } + + for (var i = 0; i < spans.length; i++) { + if (spans[i].className == "unread") + Element.show(spans[i]); + } + } catch (e) { + exception_error("feed_mo", e); + } +} diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 70b690111..976fac15c 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -1029,6 +1029,20 @@ return; } + if ($subop == "catchupFeed") { + + $feed_id = db_escape_string($_REQUEST['feed_id']); + $is_cat = db_escape_string($_REQUEST['is_cat']); + + print ""; + + catchup_feed($link, $feed_id, $is_cat); + + print ""; + + return; + } + print "Unknown method: $subop"; } ?> -- cgit v1.2.3-54-g00ecf From 78ac6caf001402142951ec90e8d0a1dac02e433b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:37:47 +0400 Subject: digest: support tags --- digest.css | 30 +++++++++++++++++++++++++++--- digest.js | 31 +++++++++++++++++++++++++++---- digest.php | 12 ++++++++++-- functions.php | 1 + modules/backend-rpc.php | 5 +++-- 5 files changed, 68 insertions(+), 11 deletions(-) (limited to 'modules') diff --git a/digest.css b/digest.css index f7ddff689..cfee28bcf 100644 --- a/digest.css +++ b/digest.css @@ -18,6 +18,10 @@ a:hover { color : gray; } +#header a:hover, #footer a:hover { + color : #0069D8; +} + #header { font-weight : bold; font-size : 14px; @@ -159,6 +163,18 @@ a:hover { max-width : 65%; } +#headlines h1 a { + color : #684C99; +} + +#headlines h1 a:hover { + color : gray; +} + +#headlines h1 #headlines-title { + color : gray; +} + #headlines ul#headlines-content div.digest-check { float : right; } @@ -214,15 +230,23 @@ a:hover { } #headlines ul#headlines-content div.info { - margin-top : 2px; font-size : 11px; } #headlines ul#headlines-content div.info a { color : gray; - font-weight : bold; } -#headlines ul#headlines-content div.info a:hover { +#headlines ul#headlines-content span.tags { + font-size : 11px; + margin-bottom : 2px; +} + +#headlines ul#headlines-content span.tags a { + color : #684C99; +} + +#headlines ul#headlines-content div.info a:hover, +#headlines ul#headlines-content span.tags a:hover { color : #659a4c; } diff --git a/digest.js b/digest.js index 82abe6676..51c824ee4 100644 --- a/digest.js +++ b/digest.js @@ -186,8 +186,10 @@ function viewfeed(feed_id, offset) { offset = _active_feed_offset + offset; } - var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + - "&offset=" + offset; + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + + param_escape(feed_id) + "&offset=" + offset; + + console.log(query); new Ajax.Request("backend.php", { parameters: query, @@ -293,6 +295,22 @@ function add_headline_entry(article, feed) { var mark_part = ""; var publ_part = ""; + var tags_part = ""; + + if (article.tags.length > 0) { + + tags_part = " " + __("in") + " "; + + for (var i = 0; i < Math.min(5, article.tags.length); i++) { + tags_part += "" + + article.tags[i] + ", "; + } + + tags_part = tags_part.replace(/, $/, ""); + tags_part = "" + tags_part + ""; + } + if (article.marked) mark_part = ""; else @@ -320,7 +338,7 @@ function add_headline_entry(article, feed) { "" + "
    " + - feed.title + " " + " @ " + + feed.title + " " + tags_part + " @ " + new Date(article.updated * 1000) + "
    " + ""; @@ -410,10 +428,15 @@ function parse_headlines(transport, replace) { if (!transport.responseXML) return; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0]; - if (headlines) { + if (headlines && headlines_title) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + var title = headlines_title.firstChild.nodeValue; + + $("headlines-title").innerHTML = title; + if (replace) $('headlines-content').innerHTML = ''; var pr = $('H-MORE-PROMPT'); diff --git a/digest.php b/digest.php index c217d2abf..2b7f91807 100644 --- a/digest.php +++ b/digest.php @@ -91,7 +91,8 @@
    -

    +

    : +

    @@ -107,6 +108,13 @@ v © 2005– - Andrew Dolgov + Andrew Dolgov + +
    + + + + + diff --git a/functions.php b/functions.php index 2174460b4..232ee7c1f 100644 --- a/functions.php +++ b/functions.php @@ -6783,6 +6783,7 @@ "title" => $line["title"], "link" => $line["link"], "feed_id" => $line["feed_id"], + "tags" => get_article_tags($link, $line["id"]), ); if ($show_excerpt) { diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 976fac15c..a0e4e77df 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -984,8 +984,6 @@ if (!$feed_id) $feed_id = -4; if (!$offset) $offset = 0; - - print ""; $headlines = api_get_headlines($link, $feed_id, 10, $offset, @@ -994,6 +992,9 @@ //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { + print ""; + print ""; print ""; -- cgit v1.2.3-54-g00ecf From d8ea9902b6d9a8fce00bd826c9b654397a97bd0f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 19:52:15 +0400 Subject: digest: ajax loading for zoom() --- digest.js | 36 +++++++++++++++++++----------------- modules/backend-rpc.php | 37 +++++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 31 deletions(-) (limited to 'modules') diff --git a/digest.js b/digest.js index 4faee1f6c..4183d70c5 100644 --- a/digest.js +++ b/digest.js @@ -102,24 +102,28 @@ function set_selected_feed(feed_id) { } } -function zoom(article_id) { +function zoom(elem, article_id) { try { - var elem = $('A-' + article_id); + //alert(elem + "/" + article_id); - if (elem) { - var divs = elem.getElementsByTagName('DIV'); - - for (var i = 0; i < divs.length; i++) { - if (divs[i].className == 'excerpt') - Element.hide(divs[i]); + elem.innerHTML = " " + + __("Loading, please wait..."); - if (divs[i].className == 'content') - Element.show(divs[i]); - } - } + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=digest-get-contents&article_id=" + + article_id, + onComplete: function(transport) { + fatal_error_check(transport); + + if (transport.responseXML) { + var article = transport.responseXML.getElementsByTagName('article')[0]; + elem.innerHTML = article.firstChild.nodeValue; + } else { + elem.innerHTML = __("Error: unable to load article."); + } + + } }); - //catchup_article(article_id, - // function() { update(); }); } catch (e) { exception_error("zoom", e); @@ -346,10 +350,8 @@ function add_headline_entry(article, feed, no_effects) { "onclick=\"return view("+article.id+")\" class='title'>" + article.title + "" + "
    " + - "
    " + + "
    " + article.excerpt + "
    " + - "" + "
    " + feed.title + " " + tags_part + " @ " + new Date(article.updated * 1000) + "
    " + diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index a0e4e77df..592c8ab28 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -978,6 +978,28 @@ return; } + if ($subop == "digest-get-contents") { + $article_id = db_escape_string($_REQUEST['article_id']); + + $result = db_query($link, "SELECT content + FROM ttrss_entries, ttrss_user_entries + WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']); + + print ""; + + print "
    "; + + print "    "; + + return; + } + if ($subop == "digest-update") { $feed_id = db_escape_string($_REQUEST['feed_id']); $offset = db_escape_string($_REQUEST['offset']); @@ -987,7 +1009,7 @@ print ""; $headlines = api_get_headlines($link, $feed_id, 10, $offset, - '', ($feed_id == -4), true, true, "unread", "updated DESC"); + '', ($feed_id == -4), true, false, "unread", "updated DESC"); //function api_get_headlines($link, $feed_id, $limit, $offset, // $filter, $is_cat, $show_excerpt, $show_content, $view_mode) { @@ -1011,19 +1033,6 @@ if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f); } - function feeds_sort_by_unread_rev($a, $b) { - $a = $a['unread']; - $b = $b['unread']; - - if ($a == $b) { - return 0; - } - return ($a < $b) ? 1 : -1; - } - - //uasort($feeds, 'feeds_sort_by_unread_rev'); - //$feeds = array_slice($feeds, 0, 10); - print ""; print ""; -- cgit v1.2.3-54-g00ecf From e4c530dcc3e06e0890ea12f9454f343655fdfff3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 22:36:18 +0400 Subject: digest: add rate limit for headline requests when catching up; control OOE responses with seq numbers --- digest.js | 33 ++++++++++++++++++++++++++++++--- modules/backend-rpc.php | 3 +++ 2 files changed, 33 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/digest.js b/digest.js index 5cf8d4ec9..cf816cf95 100644 --- a/digest.js +++ b/digest.js @@ -3,7 +3,9 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +var _view_update_timeout = false; var _feedlist_expanded = false; +var _update_seq = 1; function article_appear(article_id) { try { @@ -181,14 +183,23 @@ function remove_headline_entry(article_id) { } } +function view_update() { + try { + viewfeed(_active_feed_id, _active_feed_offset, false, true); + update(); + } catch (e) { + exception_error("view_update", e); + } +} + function view(article_id, dismiss_only) { try { remove_headline_entry(article_id); catchup_article(article_id, function() { - viewfeed(_active_feed_id, _active_feed_offset, false, true); - update(); + window.clearTimeout(_view_update_timeout); + _view_update_timeout = window.setTimeout("view_update()", 1000); }); return dismiss_only != true; @@ -210,8 +221,11 @@ function viewfeed(feed_id, offset, replace, no_effects) { if (replace == undefined) replace = (offset == 0); + _update_seq = _update_seq + 1; + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + - param_escape(feed_id) + "&offset=" + offset; + param_escape(feed_id) + "&offset=" + offset + + "&seq=" + _update_seq; console.log(query); @@ -222,6 +236,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG"); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -465,6 +480,18 @@ function parse_headlines(transport, replace, no_effects) { try { if (!transport.responseXML) return; + var seq = transport.responseXML.getElementsByTagName('seq')[0]; + + if (seq) { + seq = seq.firstChild.nodeValue; + if (seq != _update_seq) { + console.log("parse_headlines: wrong sequence received."); + return; + } + } else { + return; + } + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0]; diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 592c8ab28..aa05e8e8e 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -1003,11 +1003,14 @@ if ($subop == "digest-update") { $feed_id = db_escape_string($_REQUEST['feed_id']); $offset = db_escape_string($_REQUEST['offset']); + $seq = db_escape_string($_REQUEST['seq']); if (!$feed_id) $feed_id = -4; if (!$offset) $offset = 0; print ""; + print "$seq"; + $headlines = api_get_headlines($link, $feed_id, 10, $offset, '', ($feed_id == -4), true, false, "unread", "updated DESC"); -- cgit v1.2.3-54-g00ecf