cdm: bring back updated/new pic

diff --git a/cdm.css b/cdm.css
index 8681832b5dead4c216ac1a3a3b31ec472a90039f..ed35d76268ae562a7f832e6800b9f497674fbaa0 100644 (file)
--- a/cdm.css
+++ b/cdm.css
@@ -15,10 +15,18 @@ div.cdmHeader input {
        margin-right : 5px;
 }
 
+div.updPic {
+       width : 25px;
+       display : inline-block;
+       text-align : center;
+}
+
+div.updPic img {
+       vertical-align : middle;
+}
+
 div.cdmHeader img, div.cdmFooter img {
        margin : 0px 2px 0px 2px;
-       width : 16px;
-       height : 16px;
 }
 
 div.cdmContent {

diff --git a/functions.php b/functions.php
index b952a5bae1f3f48f368c917b4d23834ce938bfdb..9df02f839494132ecbfcaacf7db3f1623480146d 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5342,7 +5342,9 @@
                                                        onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
                                        }
                                        print "</div>";
-       
+
+                                       print "<div class=\"updPic\">$update_pic</div>";
+                               
                                        print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this, 
                                                        'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\"/>";
 
@@ -5416,10 +5418,14 @@
                                                }
                                        }
 
-                                       $article_content = sanitize_rss($link, $line["content_preview"], 
-                                               false, false, $feed_site_url);
+#                                      if ($expand_cdm) {
+                                               $article_content = sanitize_rss($link, $line["content_preview"], 
+                                                       false, false, $feed_site_url);
 
-                                       if (!$article_content) $article_content = "&nbsp;";
+                                               if (!$article_content) $article_content = "&nbsp;";
+#                                      } else {
+#                                              $article_content = '';
+#                                      }
 
                                        print "<div id=\"POSTNOTE-$id\">";
                                        if ($line['note']) {
@@ -5427,7 +5433,7 @@
                                        }
                                        print "</div>";
 
-                                       print $article_content;
+                                       print "<span id=\"CWRAP-$id\">$article_content</span>";
 
                                        $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
                                                ttrss_feeds WHERE id = ".

diff --git a/viewfeed.js b/viewfeed.js
index 07fe859fa622fc1ccd35b86f73d39b6e650a959a..a5654eb45bf4a3f91207e437a23786f35bb44da5 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -1976,6 +1976,14 @@ function cdmExpandArticle(id) {
 
                var elem = $("CICD-" + active_post_id);
 
+               var upd_img_pic = $("FUPDPIC-" + id);
+
+               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                               upd_img_pic.src.match("fresh_sign.png"))) {
+
+                       upd_img_pic.src = "images/blank_icon.gif";
+               }
+
                if (id == active_post_id && Element.visible(elem))
                        return true;
 
@@ -2339,6 +2347,14 @@ function cdmClicked(event, id) {
                        if (elem)
                                elem.className = elem.className.replace("Unread", "");
 
+                       var upd_img_pic = $("FUPDPIC-" + id);
+
+                       if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                                       upd_img_pic.src.match("fresh_sign.png"))) {
+
+                               upd_img_pic.src = "images/blank_icon.gif";
+                       }
+
                        var query = "?op=rpc&subop=catchupSelected" +
                                "&cmode=0&ids=" + param_escape(id);