combined mode (and more) css class name updates

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 09bfdea7257fcdd4df4262424b9af0fceb82e020..7da3f6f4d36b45d4a67c10d6ed07379992376faf 100755 (executable)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -345,7 +345,7 @@ class Feeds extends Handler_Protected {
 
                                $score_pic = "images/" . get_score_pic($score);
 
-                               $score_pic = "<img class='hlScorePic' score='$score' onclick='changeScore($id, this)' src=\"$score_pic\"
+                               $score_pic = "<img class='score-pic' score='$score' onclick='changeScore($id, this)' src=\"$score_pic\"
                 title=\"$score\">";
 
                                if ($score > 500) {
@@ -390,7 +390,7 @@ class Feeds extends Handler_Protected {
 
                                                        $vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
-                                                       $reply['content'] .= "<div data-feed-id='$feed_id' class='cdmFeedTitle'>".
+                                                       $reply['content'] .= "<div data-feed-id='$feed_id' class='feed-titl'>".
                                                                "<div style='float : right'>$feed_icon_img</div>".
                                                                "<a class='title' href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
                                                                $line["feed_title"]."</a>
@@ -414,7 +414,7 @@ class Feeds extends Handler_Protected {
                                        $reply['content'] .= "</div>";
 
                                        $reply['content'] .= "<div onclick='return hlClicked(event, $id)'
-                    class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
+                    class=\"title\"><span class='hlContent $hlc_suffix'>";
                                        $reply['content'] .= "<a class=\"title $hlc_suffix\"
                     href=\"" . htmlspecialchars($line["link"]) . "\"
                     onclick=\"\">" .
@@ -434,7 +434,7 @@ class Feeds extends Handler_Protected {
                                                if (@$line["feed_title"]) {
                                                        $rgba = @$rgba_cache[$feed_id];
 
-                                                       $reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
+                                                       $reply['content'] .= "<span class=\"feed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
                                                                truncate_string($line["feed_title"],30)."</a></span>";
                                                }
                                        }
@@ -486,7 +486,7 @@ class Feeds extends Handler_Protected {
                                                        $feed_icon_src = Feeds::getFeedIcon($feed_id);
                                                        $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"$feed_icon_src\">";
 
-                                                       $reply['content'] .= "<div data-feed-id='$feed_id' class='cdmFeedTitle'>".
+                                                       $reply['content'] .= "<div data-feed-id='$feed_id' class='feed-title'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
                                                                "<a href=\"#\" class='title' onclick=\"viewfeed({feed:$feed_id})\">".
                                                                $line["feed_title"]."</a> $vf_catchup_link</div>";
@@ -499,7 +499,7 @@ class Feeds extends Handler_Protected {
                     $tmp_content = "<div class=\"cdm expanded $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=\"cdmHeader\">";
+                                       $tmp_content .= "<div class=\"header\">";
                                        $tmp_content .= "<div style=\"vertical-align : middle\">";
 
                                        $tmp_content .= "<input dojoType=\"dijit.form.CheckBox\"
@@ -540,7 +540,7 @@ class Feeds extends Handler_Protected {
                                                if (@$line["feed_title"]) {
                                                        $rgba = @$rgba_cache[$feed_id];
 
-                                                       $tmp_content .= "<div class=\"hlFeed\">
+                                                       $tmp_content .= "<div class=\"feed\">
                             <a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
                             onclick=\"viewfeed({feed:$feed_id})\">".
                                                                truncate_string($line["feed_title"],30)."</a>
@@ -550,7 +550,7 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= "<span class='updated' title='$date_entered_fmt'>$updated_fmt</span>";
 
-                                       $tmp_content .= "<div class='scoreWrap' style=\"vertical-align : middle\">";
+                                       $tmp_content .= "<div style=\"vertical-align : middle\">";
                                        $tmp_content .= "$score_pic";
 
                                        if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
@@ -558,11 +558,11 @@ class Feeds extends Handler_Protected {
                         title=\"".htmlspecialchars($line["feed_title"])."\"
                         onclick=\"viewfeed({feed:$feed_id})\">$feed_icon_img</span>";
                                        }
-                                       $tmp_content .= "</div>"; //scoreWrap
+                                       $tmp_content .= "</div>"; //score wrapper2
 
-                                       $tmp_content .= "</div>"; //cdmHeader
+                                       $tmp_content .= "</div>"; //header
 
-                                       $tmp_content .= "<div class=\"cdmContent\" onclick=\"return cdmClicked(event, $id, true);\">";
+                                       $tmp_content .= "<div class=\"content\" onclick=\"return cdmClicked(event, $id, true);\">";
 
                                        $tmp_content .= "<div id=\"POSTNOTE-$id\">";
                                        if ($line['note']) {
@@ -573,7 +573,7 @@ class Feeds extends Handler_Protected {
                                        if (!$line['lang']) $line['lang'] = 'en';
 
                                        // this is filled from RROW data-content
-                                       $tmp_content .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">";
+                                       $tmp_content .= "<div class=\"content-inner\" lang=\"".$line['lang']."\">";
 
                                        if ($line["orig_feed_id"]) {
 
@@ -601,8 +601,8 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                                       $tmp_content .= "</div>"; //cdmContentInner
-                                       $tmp_content .= "<div class=\"cdmIntermediate\">";
+                                       $tmp_content .= "</div>"; //content-inner
+                                       $tmp_content .= "<div class=\"intermediate\">";
 
                                        $always_display_enclosures = $line["always_display_enclosures"];
                                        $tmp_content .= Article::format_article_enclosures($id, $always_display_enclosures,
@@ -610,7 +610,7 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= "</div>"; // cdmIntermediate
 
-                                       $tmp_content .= "<div class=\"cdmFooter\" onclick=\"event.stopPropagation()\">";
+                                       $tmp_content .= "<div class=\"footer\" onclick=\"event.stopPropagation()\">";
 
                                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
                                                $tmp_content .= $p->hook_article_left_button($line);
@@ -655,7 +655,7 @@ class Feeds extends Handler_Protected {
 
                                        $tmp_content .= "</div>"; // buttons
 
-                                       $tmp_content .= "</div>"; // cdmFooter
+                                       $tmp_content .= "</div>"; // cdm footer
                                        $tmp_content .= "</div>"; // cdmContent
                                        $tmp_content .= "</div>"; // RROW.cdm