valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use css nth-child instead of old even/odd class hacks for normal mode

This commit is contained in:
Andrew Dolgov 2013-05-04 12:01:53 +04:00
parent 72c29b65d4
commit 8d090a910b
6 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@ -288,8 +288,6 @@ class Feeds extends Handler_Protected {
$expand_cdm = get_pref('CDM_EXPANDED'); $expand_cdm = get_pref('CDM_EXPANDED');
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
$id = $line["id"]; $id = $line["id"];
$feed_id = $line["feed_id"]; $feed_id = $line["feed_id"];
$label_cache = $line["label_cache"]; $label_cache = $line["label_cache"];
@ -316,6 +314,8 @@ class Feeds extends Handler_Protected {
array_push($topmost_article_ids, $id); array_push($topmost_article_ids, $id);
} }
$class = "";
if (sql_bool_to_bool($line["unread"])) { if (sql_bool_to_bool($line["unread"])) {
$class .= " Unread"; $class .= " Unread";
++$num_unread; ++$num_unread;

2
classes/pref/feeds.php
View File

@ -1594,7 +1594,6 @@ class Pref_Feeds extends Handler_Protected {
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
$feed_id = $line["id"]; $feed_id = $line["id"];
$this_row_id = "id=\"FUPDD-$feed_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)) { while ($line = $this->dbh->fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
$feed_id = $line["id"]; $feed_id = $line["id"];
$this_row_id = "id=\"FERDD-$feed_id\""; $this_row_id = "id=\"FERDD-$feed_id\"";

2
classes/pref/prefs.php
View File

@ -1041,8 +1041,6 @@ class Pref_Prefs extends Handler_Protected {
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
$profile_id = $line["id"]; $profile_id = $line["id"];
$this_row_id = "id=\"FCATR-$profile_id\""; $this_row_id = "id=\"FCATR-$profile_id\"";

8
classes/pref/users.php
View File

@ -69,8 +69,6 @@ class Pref_Users extends Handler_Protected {
print "<ul class=\"userFeedList\">"; print "<ul class=\"userFeedList\">";
$row_class = "odd";
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$icon_file = ICONS_URL."/".$line["id"].".ico"; $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\">"; $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>"; print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
$row_class = $row_class == "even" ? "odd" : "even";
} }
@ -408,8 +404,6 @@ class Pref_Users extends Handler_Protected {
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $this->dbh->fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
$uid = $line["id"]; $uid = $line["id"];
print "<tr id=\"UMRR-$uid\">"; print "<tr id=\"UMRR-$uid\">";

25
js/viewfeed.js
View File

@ -134,8 +134,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
fixHeadlinesOrder(getLoadedArticleIds());
if (getInitParam("cdm_auto_catchup") == 1) { if (getInitParam("cdm_auto_catchup") == 1) {
c.domNode.appendChild(hsp); c.domNode.appendChild(hsp);
} }
@ -1496,26 +1494,6 @@ function cdmExpandArticle(id, noexpand) {
return false; 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() { function getArticleUnderPointer() {
return post_under_pointer; return post_under_pointer;
} }
@ -1596,7 +1574,6 @@ function dismissSelectedArticles() {
if (sel.length > 0) if (sel.length > 0)
selectionToggleUnread(false); selectionToggleUnread(false);
fixHeadlinesOrder(tmp);
} catch (e) { } catch (e) {
exception_error("dismissSelectedArticles", e); exception_error("dismissSelectedArticles", e);
@ -1621,8 +1598,6 @@ function dismissReadArticles() {
} }
} }
fixHeadlinesOrder(tmp);
} catch (e) { } catch (e) {
exception_error("dismissSelectedArticles", e); exception_error("dismissSelectedArticles", e);
} }

20
tt-rss.css
View File

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