Merge pull request #179 from nottwo/$link-cleanup

Remove obsolete $link parameter for password reset

diff --git a/classes/feeds.php b/classes/feeds.php
index 1a17981515789667db241b4daafc8c7117bbac39..f499fe9a67826d39a0449ff120f9c74b477ae339 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -288,8 +288,6 @@ class Feeds extends Handler_Protected {
                        $expand_cdm = get_pref('CDM_EXPANDED');
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
-                               $class = ($lnum % 2) ? "even" : "odd";
-
                                $id = $line["id"];
                                $feed_id = $line["feed_id"];
                                $label_cache = $line["label_cache"];
@@ -316,6 +314,8 @@ class Feeds extends Handler_Protected {
                                        array_push($topmost_article_ids, $id);
                                }
 
+                               $class = "";
+
                                if (sql_bool_to_bool($line["unread"])) {
                                        $class .= " Unread";
                                        ++$num_unread;

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e3172511151e85fd25f83d57d970da54f6d86a3f..ab280a98e9a8eb67fd8c0d5e4d1659b5c0337a50 100644 (file)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1594,7 +1594,6 @@ class Pref_Feeds extends Handler_Protected {
 
                while ($line = $this->dbh->fetch_assoc($result)) {
 
-                       $class = ($lnum % 2) ? "even" : "odd";
                        $feed_id = $line["id"];
                        $this_row_id = "id=\"FUPDD-$feed_id\"";
 
@@ -1664,7 +1663,6 @@ class Pref_Feeds extends Handler_Protected {
 
                while ($line = $this->dbh->fetch_assoc($result)) {
 
-                       $class = ($lnum % 2) ? "even" : "odd";
                        $feed_id = $line["id"];
                        $this_row_id = "id=\"FERDD-$feed_id\"";
 

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 45715488ad12d0042c02ea539e3fca8f05730f6e..ba83a99008d0109d719e6d6058fb3cb01d18f1e0 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1041,8 +1041,6 @@ class Pref_Prefs extends Handler_Protected {
 
                while ($line = $this->dbh->fetch_assoc($result)) {
 
-                       $class = ($lnum % 2) ? "even" : "odd";
-
                        $profile_id = $line["id"];
                        $this_row_id = "id=\"FCATR-$profile_id\"";
 

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 3e8b2299dd2329c895a12c53e01a1630ddf3e028..60059dc8df30353710eba3628244e42b42b202b1 100644 (file)
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -69,8 +69,6 @@ class Pref_Users extends Handler_Protected {
 
                        print "<ul class=\"userFeedList\">";
 
-                       $row_class = "odd";
-
                        while ($line = $this->dbh->fetch_assoc($result)) {
 
                                $icon_file = ICONS_URL."/".$line["id"].".ico";
@@ -81,9 +79,7 @@ class Pref_Users extends Handler_Protected {
                                        $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
                                }
 
-                               print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
-
-                               $row_class = $row_class == "even" ? "odd" : "even";
+                               print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
                        }
 
@@ -408,8 +404,6 @@ class Pref_Users extends Handler_Protected {
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
 
-                               $class = ($lnum % 2) ? "even" : "odd";
-
                                $uid = $line["id"];
 
                                print "<tr id=\"UMRR-$uid\">";

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 75dd64f115d83f0e88be26cd24959479725f296a..da3628349bb0ccc8945c6d2dcd83f6df7665bd1a 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -134,8 +134,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                                        if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-                                       fixHeadlinesOrder(getLoadedArticleIds());
-
                                        if (getInitParam("cdm_auto_catchup") == 1) {
                                                c.domNode.appendChild(hsp);
                                        }
@@ -1498,26 +1496,6 @@ function cdmExpandArticle(id, noexpand) {
        return false;
 }
 
-function fixHeadlinesOrder(ids) {
-       try {
-               for (var i = 0; i < ids.length; i++) {
-                       var e = $("RROW-" + ids[i]);
-
-                       if (e) {
-                               if (i % 2 == 0) {
-                                       e.removeClassName("even");
-                                       e.addClassName("odd");
-                               } else {
-                                       e.removeClassName("odd");
-                                       e.addClassName("even");
-                               }
-                       }
-               }
-       } catch (e) {
-               exception_error("fixHeadlinesOrder", e);
-       }
-}
-
 function getArticleUnderPointer() {
        return post_under_pointer;
 }
@@ -1598,7 +1576,6 @@ function dismissSelectedArticles() {
                if (sel.length > 0)
                        selectionToggleUnread(false);
 
-               fixHeadlinesOrder(tmp);
 
        } catch (e) {
                exception_error("dismissSelectedArticles", e);
@@ -1623,8 +1600,6 @@ function dismissReadArticles() {
                        }
                }
 
-               fixHeadlinesOrder(tmp);
-
        } catch (e) {
                exception_error("dismissSelectedArticles", e);
        }

diff --git a/plugins/digest/digest.js b/plugins/digest/digest.js
index e3cb1e299ed3b9d3b6359d7488befc48341a5485..842b1006bbef3100c525378622437a1bd306117f 100644 (file)
--- a/plugins/digest/digest.js
+++ b/plugins/digest/digest.js
@@ -46,9 +46,8 @@ function catchup_feed(feed_id, callback) {
        }
 }
 
-function get_visible_article_ids() {
+function parse_article_elements_for_ids(elems) {
        try {
-               var elems = $("headlines-content").getElementsByTagName("LI");
                var ids = [];
 
                for (var i = 0; i < elems.length; i++) {
@@ -59,6 +58,28 @@ function get_visible_article_ids() {
 
                return ids;
 
+       } catch (e) {
+               exception_error("parse_article_elements_for_ids", e);
+       }
+}
+
+function get_selected_article_ids() {
+       try {
+               var elems = $$('#headlines-content li.selected');
+
+               return parse_article_elements_for_ids(elems);
+
+       } catch (e) {
+               exception_error("get_visible_article_ids", e);
+       }
+}
+
+function get_visible_article_ids() {
+       try {
+               var elems = $("headlines-content").getElementsByTagName("LI");
+
+               return parse_article_elements_for_ids(elems);
+
        } catch (e) {
                exception_error("get_visible_article_ids", e);
        }
@@ -67,9 +88,15 @@ function get_visible_article_ids() {
 function catchup_visible_articles(callback) {
        try {
 
-               var ids = get_visible_article_ids();
+               var ids = get_selected_article_ids();
+               if ( 0 == ids.length ) {
+                       ids = get_visible_article_ids();
+                       ntext = [ "Mark %d displayed article as read?", "Mark %d displayed articles as read?" ];
+               } else {
+                       ntext = [ "Mark %d selected article as read?", "Mark %d selected articles as read?" ];
+               }
 
-               if (confirm(ngettext("Mark %d displayed article as read?", "Mark %d displayed articles as read?", ids.length).replace("%d", ids.length))) {
+               if (confirm(ngettext(ntext[0], ntext[1], ids.length).replace("%d", ids.length))) {
 
                        var query = "op=rpc&method=catchupSelected" +
                                "&cmode=0&ids=" + param_escape(ids);

diff --git a/tt-rss.css b/tt-rss.css
index 454e2ffd165bda274dc8f9ea34a899342da13b73..6b4a10d7dc0c40c31c2dfc4765def2851beaa8b4 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -187,17 +187,12 @@ a:hover {
        font-weight : bold;
 }
 
-.hl.even.Grayed {
-       background : #f0f0f0;
+.hl.Grayed {
        color : #909090;
-       border-width : 0px 0px 1px 0px;
-       border-style : solid;
-       border-color : #c0c0c0;
-       border-collapse : collapse;
 }
 
-.hl.odd.Grayed {
-       color : #909090;
+#headlines-frame div.hl:nth-child(even) {
+       background : #f0f0f0;
 }
 
 .hl {
@@ -210,15 +205,6 @@ a:hover {
        background : #ecf4ff ! important;
 }
 
-.hl.even {
-       background : #f0f0f0;
-       border-collapse : collapse;
-}
-
-.hl.odd {
-       background : white;
-}
-
 div.filterTestHolder {
        height : 300px;
        overflow : auto;