diff options
author | Andrew Dolgov <[email protected]> | 2009-12-30 09:57:48 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2009-12-30 09:57:48 +0300 |
commit | 2aa709f7ef51c0922e9729f1b4ab70413b5a4e60 (patch) | |
tree | 57e613056a6d6b67ad7a06770378a90b8c2e7d02 /mobile/classic | |
parent | 22fdebff47759d46afd725ab9c485e6578d1f073 (diff) |
mobile: code cleanup; show archived feed; reinstate feedlist icons
Diffstat (limited to 'mobile/classic')
-rw-r--r-- | mobile/classic/functions.php | 71 | ||||
-rw-r--r-- | mobile/classic/mobile.css | 6 |
2 files changed, 18 insertions, 59 deletions
diff --git a/mobile/classic/functions.php b/mobile/classic/functions.php index 823af122f..e7d14da6f 100644 --- a/mobile/classic/functions.php +++ b/mobile/classic/functions.php @@ -1,5 +1,4 @@ <?php - define('MOBILE_FEEDLIST_ENABLE_ICONS', false); define('TTRSS_SESSION_NAME', 'ttrss_m_sid'); function render_feeds_list($link) { @@ -50,41 +49,10 @@ print "<li class=\"$holder_class\"><ul class=\"feedCatList\">"; } - $num_total = getFeedUnread($link, -4); - - $class = "virt"; - - if ($num_total > 0) $class .= "Unread"; - - printMobileFeedEntry(-4, $class, __("All articles"), $num_total, - "../../images/fresh.png", $link); - - $num_fresh = getFeedUnread($link, -3); - - $class = "virt"; - - if ($num_fresh > 0) $class .= "Unread"; - - printMobileFeedEntry(-3, $class, __("Fresh articles"), $num_fresh, - "../../images/fresh.png", $link); - - $num_starred = getFeedUnread($link, -1); - - $class = "virt"; - - if ($num_starred > 0) $class .= "Unread"; - - printMobileFeedEntry(-1, $class, __("Starred articles"), $num_starred, - "../../images/mark_set.png", $link); - - $class = "virt"; - - $num_published = getFeedUnread($link, -2); - - if ($num_published > 0) $class .= "Unread"; - - printMobileFeedEntry(-2, $class, __("Published articles"), $num_published, - "../../images/pub_set.png", $link); + foreach (array(-4, -3, -1, -2, 0) as $i) { + printMobileFeedEntry($i, "virt", false, false, + false, $link); + } if (get_pref($link, 'ENABLE_FEED_CATS')) { print "</ul>"; @@ -125,12 +93,8 @@ $class = "label"; - if ($count > 0) { - $class .= "Unread"; - } - printMobileFeedEntry(-$line["id"]-11, - $class, $line["caption"], $count, "../images/label.png", $link); + $class, $line["caption"], $count, false, $link); } @@ -225,12 +189,6 @@ $class = "feed"; } - if ($unread > 0) $class .= "Unread"; - - if ($actid == $feed_id) { - $class .= "Selected"; - } - if ($category != $tmp_category && get_pref($link, 'ENABLE_FEED_CATS')) { if ($category) { @@ -280,7 +238,7 @@ } printMobileFeedEntry($feed_id, $class, $feed, $unread, - "../icons/$feed_id.ico", $link, $rtl_content); + false, $link, $rtl_content); ++$lnum; } @@ -305,10 +263,6 @@ $class = "tag"; - if ($unread > 0) { - $class .= "Unread"; - } - printMobileFeedEntry($tag, $class, $tag, $unread, "../images/tag.png", $link); @@ -321,6 +275,13 @@ function printMobileFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link, $rtl_content = false) { + if (!$feed_title) $feed_title = getFeedTitle($link, $feed_id, false); + if (!$unread) $unread = getFeedUnread($link, $feed_id); + + if ($unread > 0) $class .= "Unread"; + + if (!$icon_file) $icon_file = "../../" . getFeedIcon($feed_id); + if (file_exists($icon_file) && filesize($icon_file) > 0) { $feed_icon = "<img src=\"$icon_file\">"; } else { @@ -336,9 +297,9 @@ $feed = "<a href=\"?go=vf&id=$feed_id\">$feed_title</a>"; print "<li class=\"$class\">"; -# if (get_pref($link, 'ENABLE_FEED_ICONS')) { -# print "$feed_icon"; -# } + if (get_pref($link, 'ENABLE_FEED_ICONS')) { + print "$feed_icon"; + } print "<span $rtl_tag>$feed</span> "; diff --git a/mobile/classic/mobile.css b/mobile/classic/mobile.css index 6ba79052f..786639efd 100644 --- a/mobile/classic/mobile.css +++ b/mobile/classic/mobile.css @@ -27,14 +27,12 @@ h3 { #heading { font-size : small; -/* border-width : 0px 0px 1px 0px; + border-width : 0px 0px 1px 0px; border-style : solid; - border-color : #88b0ff; - background : #ecf4ff; */ + border-color : #f0f0f0; color : #88b0ff; font-weight : bold; - margin-bottom : 10px; } #content { |