cdm tweaks, misc fixes

diff --git a/backend.php b/backend.php
index d61d18f20e93a4f0875e3c856a93b5da85aaebe3..326911e356f54a10a3989856bdd6a18dbfa6506d 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -451,9 +451,11 @@
        
                                if ($line["marked"] == "t" || $line["marked"] == "1") {
                                        $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_set.png\" 
+                                               class=\"markedPic\"
                                                alt=\"Reset mark\" onclick='javascript:toggleMark($id)'>";
                                } else {
                                        $marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_unset.png\" 
+                                               class=\"markedPic\"
                                                alt=\"Set mark\" onclick='javascript:toggleMark($id)'>";
                                }
 
@@ -534,10 +536,7 @@
 
                                        print "<div class=\"cdmHeader\">";
 
-                                       print "<div style=\"float : right\">$updated_fmt
-                                               <!-- <a class=\"cdmToggleLink\"
-                                                       href=\"javascript:toggleUnread($id)\">Toggle unread</a> -->
-                                       </div>";
+                                       print "<div class=\"articleUpdated\">$updated_fmt</div>";
                                        
                                        print "<a class=\"title\" 
                                                onclick=\"javascript:toggleUnread($id, 0)\"
@@ -553,10 +552,10 @@
 
                                        print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div><br clear=\"all\">";
 
-                                       print "<div style=\"float : right\">$marked_pic</div>
-                                               <div class=\"cdmFooter\">";
+                                       print "<div class=\"cdmFooter\">";
+
+                                       print "$marked_pic";
 
-                                       
                                        print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this, 
                                                        'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\">";
 
@@ -570,8 +569,10 @@
                                        }
 
                                        $tags_str = preg_replace("/, $/", "", $tags_str);
+
+                                       if ($tags_str == "") $tags_str = "no tags";
        
-                                       print " &nbsp; $tags_str <a title=\"Edit tags for this article\" 
+                                       print " $tags_str <a title=\"Edit tags for this article\" 
                                                        href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
 
                                        print "</div>";

diff --git a/feedlist.js b/feedlist.js
index 286d972eceba538595ddda99db64fcb700a6e00b..3a475ece4ef227b7f9b6664849554e3330dbd4c3 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -37,7 +37,11 @@ function viewFeedGoPage(i) {
 function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
        try {
 
-               if (!offset) page_offset = 0;
+               //if (!offset) page_offset = 0;
+
+               if (offset != undefined) {
+                       page_offset = offset;
+               }
 
                enableHotkeys();
 
@@ -106,8 +110,8 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        query = query + "&cat=1";
                }
 
-               if (offset) {
-                       query = query + "&skip=" + offset;
+               if (page_offset != 0) {
+                       query = query + "&skip=" + page_offset;
                }
 
                if (navigator.userAgent.match("Opera")) {

diff --git a/functions.php b/functions.php
index 8b98d1427a362cc3f6d3045c3f8702fe498d0094..5f3978ff90083c000ee45449a648148bac1daca6 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -949,7 +949,7 @@
                }
 
                $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" 
-                       href=\"javascript:viewfeed('$feed_id', '', false);\">$feed_title</a>";
+                       href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>";
 
                print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
                if (get_pref($link, 'ENABLE_FEED_ICONS')) {

diff --git a/tt-rss.css b/tt-rss.css
index 85f0a8d6d80e1db9148245531398f8b2ff58f29e..ac44a1b4bcf256ce12042c859585e69087e5547a 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -806,6 +806,16 @@ div.cdmFooter {
        padding-top : 5px;
 }
 
+div.cdmFooter img.markedPic {
+       width : 16px;
+       height : 16px;
+       float : right;
+}
+
+div.cdmHeader div.articleUpdated {
+       float : right;
+}
+
 div.cdmFooter input, div.cdmHeader input, div.cdmFooter img {
        margin : 0px;
 }
@@ -1416,3 +1426,4 @@ ul.headlineDropdownMenu ul li:hover {
        background-color : #f0f0f0;
 }
 
+

diff --git a/viewfeed.js b/viewfeed.js
index 8e3fe422ed46f8f15b2ab8dea75a80b0db7816ea..8492a2341415292101e361358f085bc0df0274b0 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -553,8 +553,6 @@ function cdmWatchdog() {
 
                var ctr = document.getElementById("headlinesInnerContainer");
 
-               if (!ctr.hasChildNodes()) return;
-
                var ids = new Array();
 
                var e = ctr.firstChild;
@@ -583,6 +581,15 @@ function cdmWatchdog() {
 
                                }
 
+                               // method 2: article bottom is visible and is in upper 1/2 of the viewport
+
+/*                             if (e.offsetTop + e.offsetHeight >= ctr.scrollTop &&
+                                               e.offsetTop + e.offsetHeight <= ctr.scrollTop + ctr.offsetHeight/2) {
+
+                                       ids.push(e.id.replace("RROW-", "")); 
+
+                               } */
+
                        }
 
                        e = e.nextSibling;
@@ -604,11 +611,11 @@ function cdmWatchdog() {
 
                        xmlhttp_rpc.open("GET", query, true);
                        xmlhttp_rpc.onreadystatechange=all_counters_callback;
-                       xmlhttp_rpc.send(null);
+                       xmlhttp_rpc.send(null); 
 
                }
 
-               _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 5000);
+               _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 4000);
 
        } catch (e) {
                exception_error(e, "cdmWatchdog");