bring back (debloated) version of unexpanded combined mode

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 53c6bab2bd0a1676140ec70efb3d75c5a9d1c08b..0a7b7a241b94247632e16f93621bf5e3cf863b9b 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -496,7 +496,8 @@ class Feeds extends Handler_Protected {
 
                     $content_encoded = htmlspecialchars($line["content"]);
 
-                    $tmp_content = "<div class=\"cdm expanded $hlc_suffix $class\"
+                                       $expanded_class = get_pref("CDM_EXPANDED") ? "expanded" : "expandable";
+                    $tmp_content = "<div class=\"cdm $expanded_class $hlc_suffix $class\"
                         id=\"RROW-$id\" data-content=\"$content_encoded\" data-article-id='$id' data-orig-feed-id='$feed_id' $mouseover_attrs>";
 
                                        $tmp_content .= "<div class=\"header\">";
@@ -534,6 +535,10 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= $labels_str;
 
+                                       $tmp_content .= "<span class='collapse'>
+                        <img src=\"images/collapse.png\" onclick=\"return cdmCollapseActive(event)\"
+                        title=\"".__("Collapse article")."\"/></span>";
+
                                        $tmp_content .= "</span>";
 
                                        if (!$vfeed_group_enabled) {