From aa3a3bdf16c0ca4cbae712df1eae2de85452046a Mon Sep 17 00:00:00 2001
From: Robert Ewald <r3wald@gmail.com>
Date: Tue, 25 May 2021 09:29:48 +0200
Subject: [PATCH] server data for newsfeed list.

---
 modules/default/newsfeed/newsfeed.js  |  6 ++++--
 modules/default/newsfeed/newsfeed.njk | 30 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 441984f4..6bd9b3cc 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -14,6 +14,7 @@ Module.register("newsfeed", {
 				encoding: "UTF-8" //ISO-8859-1
 			}
 		],
+		showAsList: true,
 		showSourceTitle: true,
 		showPublishDate: true,
 		broadcastNewsFeeds: true,
@@ -135,7 +136,8 @@ Module.register("newsfeed", {
 			sourceTitle: item.sourceTitle,
 			publishDate: moment(new Date(item.pubdate)).fromNow(),
 			title: item.title,
-			description: item.description
+			description: item.description,
+			items: this.newsItems
 		};
 	},
 
@@ -192,7 +194,6 @@ Module.register("newsfeed", {
 				return true;
 			}, this);
 		}
-
 		newsItems.forEach((item) => {
 			//Remove selected tags from the beginning of rss feed items (title or description)
 			if (this.config.removeStartTags === "title" || this.config.removeStartTags === "both") {
@@ -246,6 +247,7 @@ Module.register("newsfeed", {
 			this.sendNotification("NEWS_FEED_UPDATE", { items: updatedItems });
 		}
 
+		Log.warn(newsItems);
 		this.newsItems = newsItems;
 	},
 
diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk
index dc9ccad6..70071923 100644
--- a/modules/default/newsfeed/newsfeed.njk
+++ b/modules/default/newsfeed/newsfeed.njk
@@ -1,4 +1,33 @@
 {% if loaded %}
+{% if config.showAsList %}
+<ul class="newsfeed-list">
+{% for item in items %}
+    <li>
+{% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %}
+            <div class="newsfeed-source light small dimmed">
+                {% if item.sourceTitle and config.showSourceTitle %}
+                    {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %}
+                {% endif %}
+                {% if config.showPublishDate %}
+                    {{ item.publishDate }}:
+                {% endif %}
+            </div>
+        {% endif %}
+        <div class="newsfeed-title bright medium light{{ ' no-wrap' if not config.wrapTitle }}">
+            {{ item.title }}
+        </div>
+        <div class="newsfeed-desc small light{{ ' no-wrap' if not config.wrapDescription }}">
+            {% if config.truncDescription %}
+                {{ item.description | truncate(config.lengthDescription) }}
+            {% else %}
+                {{ item.description }}
+            {% endif %}
+        </div>
+    </div>
+        </li>
+{% endfor %}
+</ul>
+{% else %}
     <div>
         {% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
             <div class="newsfeed-source light small dimmed">
@@ -21,6 +50,7 @@
             {% endif %}
         </div>
     </div>
+{% endif %}
 {% elseif error %}
     <div class="small dimmed">
         {{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Newsfeed", ERROR: error}) | safe }}