+
";
-
+
+ print "";
+
if ($feed_site_url) {
if (!$bottom) {
$target = "target=\"_new\"";
@@ -3446,6 +3877,8 @@
print " [$user_page_offset] ";
}
+ print "";
+
if (!$bottom) {
print "
";
}
- print " ($cat_unread) $ellipsis";
if ($can_browse) {
@@ -3642,10 +4075,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,
@@ -3753,7 +4189,7 @@
if ($collapsed == "t" || $collapsed == "1") {
$holder_class = "feedCatHolder";
$holder_style = "display:none;";
- $ellipsis = "...";
+ $ellipsis = "â¦";
} else {
$holder_class = "feedCatHolder";
$holder_style = "";
@@ -3769,7 +4205,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");
@@ -4049,16 +4488,22 @@
$num_tags = 0;
+ if ($_SESSION["theme"] == "3pane") {
+ $tag_limit = 3;
+ } else {
+ $tag_limit = 6;
+ }
+
foreach ($tags as $tag) {
$num_tags++;
$tag_escaped = str_replace("'", "\\'", $tag);
$tag_str = "$tag, ";
- if ($num_tags == 6) {
- $tags_str .= "...";
+ if ($num_tags == $tag_limit) {
+ $tags_str .= "…";
- } else if ($num_tags < 6) {
+ } else if ($num_tags < $tag_limit) {
$tags_str .= $tag_str;
}
$f_tags_str .= $tag_str;
@@ -4067,7 +4512,7 @@
$tags_str = preg_replace("/, $/", "", $tags_str);
$f_tags_str = preg_replace("/, $/", "", $f_tags_str);
- $all_tags_div = "...
$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 " ";
@@ -4361,7 +4862,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 "