support disabling of e-mail digests entirely

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 7da3f6f4d36b45d4a67c10d6ed07379992376faf..0a7b7a241b94247632e16f93621bf5e3cf863b9b 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -402,7 +402,7 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= "<div class='hl hlMenuAttach $class' data-orig-feed-id='$feed_id' data-article-id='$id' id='RROW-$id' $mouseover_attrs>";
 
-                                       $reply['content'] .= "<div class='hlLeft'>";
+                                       $reply['content'] .= "<div class='left'>";
 
                                        $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
                         type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
@@ -414,14 +414,14 @@ class Feeds extends Handler_Protected {
                                        $reply['content'] .= "</div>";
 
                                        $reply['content'] .= "<div onclick='return hlClicked(event, $id)'
-                    class=\"title\"><span class='hlContent $hlc_suffix'>";
+                    class=\"title\"><span class='hl-content $hlc_suffix'>";
                                        $reply['content'] .= "<a class=\"title $hlc_suffix\"
                     href=\"" . htmlspecialchars($line["link"]) . "\"
                     onclick=\"\">" .
                                                truncate_string($line["title"], 200);
 
                                        if (get_pref('SHOW_CONTENT_PREVIEW')) {
-                                               $reply['content'] .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
+                                               $reply['content'] .= "<span class=\"preview\">" . $line["content_preview"] . "</span>";
                                        }
 
                                        $reply['content'] .= "</a></span>";
@@ -440,12 +440,12 @@ class Feeds extends Handler_Protected {
                                        }
 
 
-                                       $reply['content'] .= "<span class=\"hlUpdated\">";
+                                       $reply['content'] .= "<span class=\"updated\">";
 
                                        $reply['content'] .= "<div title='$date_entered_fmt'>$updated_fmt</div>
                     </span>";
 
-                                       $reply['content'] .= "<div class=\"hlRight\">";
+                                       $reply['content'] .= "<div class=\"right\">";
 
                                        $reply['content'] .= $score_pic;
 
@@ -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) {
@@ -634,13 +639,13 @@ class Feeds extends Handler_Protected {
                                                } else {
                                                        $comments_url = htmlspecialchars($line["link"]);
                                                }
-                                               $entry_comments = "<a class=\"postComments\"
+                                               $entry_comments = "<a class=\"comments\"
                         target='_blank' rel='noopener noreferrer' href=\"$comments_url\">$num_comments ".
                                                        _ngettext("comment", "comments", $num_comments)."</a>";
 
                                        } else {
                                                if ($line["comments"] && $line["link"] != $line["comments"]) {
-                                                       $entry_comments = "<a class=\"postComments\" target='_blank' rel='noopener noreferrer' href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
+                                                       $entry_comments = "<a class=\"comments\" target='_blank' rel='noopener noreferrer' href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
                                                }
                                        }