Reader/Feed.bjs

Reader/Feed.js
Reader/templates/Feed.html

diff --git a/Reader/Feed.bjs b/Reader/Feed.bjs
index f54228c..f998959 100644 (file)
--- a/Reader/Feed.bjs
+++ b/Reader/Feed.bjs
@@ -111,7 +111,7 @@
       },
       {
        "String dataIndex" : "article_id_headline",
-       "$ Function renderer" : "function(v,x,r) {\n   \n   return String.format(\n            '<h3>{0}</h3><small>{1}</small><i class=\"rss-list-body\">{2}</i>' + \n                '{3}<i class=\"fa fa-chevron-right\"></i>',\n        r.data.article_id_headline,\n        r.data.article_id_published_dt,\n        r.data.article_id_body_txt,\n        r.data.has_read * 1 ? '<span class=\"badge\">Read</span>' : ''\n    );\n            \n \n }",
+       "$ Function renderer" : "function(v,x,r) {\n   \n   var hr = r.data.has_read * 1 ? '<span class=\"badge\">Read</span>' : '';\n   \n   return String.format(\n            '<h3>{0}</h3><small>{1}</small><i class=\"rss-list-body\">{2}</i>' + \n                hr + '<i class=\"fa fa-chevron-right\"></i>',\n        r.data.article_id_headline,\n        r.data.article_id_published_dt,\n        r.data.article_id_body_txt\n    );\n            \n \n }",
        "xtype" : "ColumnModel",
        "$ xns" : "Roo.grid",
        "* prop" : "cm[]"

diff --git a/Reader/Feed.js b/Reader/Feed.js
index cd999f5..186e329 100644 (file)
--- a/Reader/Feed.js
+++ b/Reader/Feed.js
@@ -165,13 +165,14 @@ Feed = new Roo.XComponent({
        dataIndex : 'article_id_headline',
        renderer : function(v,x,r) {
           
+          var hr = r.data.has_read * 1 ? '<span class="badge">Read</span>' : '';
+          
           return String.format(
                    '<h3>{0}</h3><small>{1}</small><i class="rss-list-body">{2}</i>' + 
-                       '{3}<i class="fa fa-chevron-right"></i>',
+                       hr + '<i class="fa fa-chevron-right"></i>',
                r.data.article_id_headline,
                r.data.article_id_published_dt,
-               r.data.article_id_body_txt,
-               r.data.has_read * 1 ? '<span class="badge">Read</span>' : ''
+               r.data.article_id_body_txt
            );