+
";
-
+
+ print "";
+
if ($feed_site_url) {
if (!$bottom) {
$target = "target=\"_new\"";
@@ -3446,6 +3833,8 @@
print " [$user_page_offset] ";
}
+ print "";
+
if (!$bottom) {
print "
";
}
- print " ($cat_unread) $ellipsis";
if ($can_browse) {
@@ -3545,8 +3934,16 @@
if ($num_starred > 0) $class .= "Unread";
+ $is_ie = (strpos($_SESSION["client.userAgent"], "MSIE") !== false);
+
+ if ($is_ie) {
+ $mark_img_ext = "gif";
+ } else {
+ $mark_img_ext = "png";
+ }
+
printFeedEntry(-1, $class, __("Starred articles"), $num_starred,
- "images/mark_set.gif", $link);
+ "images/mark_set.$mark_img_ext", $link);
$class = "virt";
@@ -3634,10 +4031,13 @@
}
}
+ $age_qpart = getMaxAgeSubquery();
+
$result = db_query($link, "SELECT ttrss_feeds.*,
SUBSTRING(last_updated,1,19) AS last_updated_noms,
(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND unread = true
+ AND $age_qpart
AND ttrss_user_entries.ref_id = ttrss_entries.id
AND owner_uid = '$owner_uid') as unread,
cat_id,last_error,
@@ -3745,7 +4145,7 @@
if ($collapsed == "t" || $collapsed == "1") {
$holder_class = "feedCatHolder";
$holder_style = "display:none;";
- $ellipsis = "...";
+ $ellipsis = "â¦";
} else {
$holder_class = "feedCatHolder";
$holder_style = "";
@@ -3761,7 +4161,7 @@
print " ";
+
+# }
print "";
}
+ $age_qpart = getMaxAgeSubquery();
+
$result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id)
- FROM ttrss_user_entries WHERE int_id = post_int_id
+ FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
+ AND ref_id = id AND $age_qpart
AND unread = true)) AS count FROM ttrss_tags
WHERE owner_uid = ".$_SESSION['uid']." GROUP BY tag_name
ORDER BY count DESC LIMIT 50");
@@ -3896,17 +4299,17 @@
function format_warning($msg, $id = "") {
return "
$marked_pic ";
print "$published_pic ";
- if ($line["feed_title"]) {
- print "$content_link ";
- print "
- ".
- truncate_string($line["feed_title"],30)." ";
- } else {
- print "";
-
- print "" .
- $line["title"];
-
- if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
- if ($content_preview) {
- print " - $content_preview";
- }
+# if ($line["feed_title"]) {
+# print " $content_link ";
+# print "
+# ".
+# truncate_string($line["feed_title"],30)." ";
+# } else {
+
+ print "";
+
+ print "" .
+ $line["title"];
+
+ if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
+ if ($content_preview) {
+ print " - $content_preview";
}
-
- print "";
- print " ";
}
+
+ print "";
+
+# ".
+# $line["feed_title"]."
+
+ if ($line["feed_title"]) {
+ print "
+ (".
+ $line["feed_title"].")
+ ";
+ }
+
+
+ print " ";
@@ -4345,7 +4818,15 @@
} else {
$add_class = "";
}
-
+
+ $expand_cdm = get_pref($link, 'CDM_EXPANDED');
+
+ if ($expand_cdm) {
+ $cdm_cstyle = "";
+ } else {
+ $cdm_cstyle = "style=\"display : none\"";
+ }
+
print "
";
+ print "
";
+// print "