From aa3a3bdf16c0ca4cbae712df1eae2de85452046a Mon Sep 17 00:00:00 2001 From: Robert Ewald Date: Tue, 25 May 2021 09:29:48 +0200 Subject: [PATCH 1/5] 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 %} + +{% else %}
{% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
@@ -21,6 +50,7 @@ {% endif %}
+{% endif %} {% elseif error %}
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Newsfeed", ERROR: error}) | safe }} From 3e96e8b3f5e306f3e05fc5ff32a847f9e1ff0101 Mon Sep 17 00:00:00 2001 From: Robert Ewald Date: Thu, 3 Jun 2021 11:40:18 +0200 Subject: [PATCH 2/5] newsfeed: showAsList implemented. --- modules/default/newsfeed/newsfeed.css | 9 +++ modules/default/newsfeed/newsfeed.js | 7 ++- modules/default/newsfeed/newsfeed.njk | 90 +++++++++++++-------------- 3 files changed, 59 insertions(+), 47 deletions(-) diff --git a/modules/default/newsfeed/newsfeed.css b/modules/default/newsfeed/newsfeed.css index 6f32b2e5..ea65eca2 100644 --- a/modules/default/newsfeed/newsfeed.css +++ b/modules/default/newsfeed/newsfeed.css @@ -12,3 +12,12 @@ iframe.newsfeed-fullarticle { bottom: inherit; top: -90px; } + +.newsfeed-list { + list-style: none; +} + +.newsfeed-list li { + text-align: justify; + margin-bottom: 0.5em; +} diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 6bd9b3cc..f33fd4cd 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -129,6 +129,10 @@ Module.register("newsfeed", { } const item = this.newsItems[this.activeItem]; + const items = this.newsItems.map(function (item) { + item.publishDate = moment(new Date(item.pubdate)).fromNow(); + return item; + }); return { loaded: true, @@ -137,7 +141,7 @@ Module.register("newsfeed", { publishDate: moment(new Date(item.pubdate)).fromNow(), title: item.title, description: item.description, - items: this.newsItems + items: items }; }, @@ -247,7 +251,6 @@ 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 70071923..39062721 100644 --- a/modules/default/newsfeed/newsfeed.njk +++ b/modules/default/newsfeed/newsfeed.njk @@ -1,56 +1,56 @@ {% if loaded %} -{% if config.showAsList %} -
    -{% for item in items %} -
  • -{% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %} -
    - {% if item.sourceTitle and config.showSourceTitle %} - {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} - {% endif %} - {% if config.showPublishDate %} - {{ item.publishDate }}: - {% endif %} -
    - {% endif %} -
    - {{ item.title }} -
    -
    - {% if config.truncDescription %} - {{ item.description | truncate(config.lengthDescription) }} - {% else %} - {{ item.description }} - {% endif %} -
    -
- -{% endfor %} - + {% if config.showAsList %} + {% else %}
{% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
- {% if sourceTitle and config.showSourceTitle %} - {{ sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} - {% endif %} - {% if config.showPublishDate %} - {{ publishDate }}: + {% if sourceTitle and config.showSourceTitle %} + {{ sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} + {% endif %} + {% if config.showPublishDate %} + {{ publishDate }}: + {% endif %} +
+ {% endif %} +
+ {{ title }} +
+
+ {% if config.truncDescription %} + {{ description | truncate(config.lengthDescription) }} + {% else %} + {{ description }} {% endif %}
- {% endif %} -
- {{ title }}
-
- {% if config.truncDescription %} - {{ description | truncate(config.lengthDescription) }} - {% else %} - {{ description }} - {% endif %} -
-
-{% endif %} + {% endif %} {% elseif error %}
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Newsfeed", ERROR: error}) | safe }} From bace0ad3391121c24bba5e02fa96ce7aef8f9574 Mon Sep 17 00:00:00 2001 From: Robert Ewald Date: Thu, 3 Jun 2021 12:38:54 +0200 Subject: [PATCH 3/5] indentation in template fixed. --- modules/default/newsfeed/newsfeed.njk | 88 +++++++++++++-------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk index cf1b366f..2b037dcc 100644 --- a/modules/default/newsfeed/newsfeed.njk +++ b/modules/default/newsfeed/newsfeed.njk @@ -3,56 +3,56 @@
    {% for item in items %}
  • - {% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %} -
    - {% if item.sourceTitle and config.showSourceTitle %} - {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} - {% endif %} - {% if config.showPublishDate %} - {{ item.publishDate }}: - {% endif %} -
    - {% endif %} -
    - {{ item.title }} -
    - {% if config.showDescription %} -
    - {% if config.truncDescription %} - {{ item.description | truncate(config.lengthDescription) }} - {% else %} - {{ item.description }} - {% endif %} -
    - {% endif %} + {% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %} +
    + {% if item.sourceTitle and config.showSourceTitle %} + {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} + {% endif %} + {% if config.showPublishDate %} + {{ item.publishDate }}: + {% endif %} +
    + {% endif %} +
    + {{ item.title }} +
    + {% if config.showDescription %} +
    + {% if config.truncDescription %} + {{ item.description | truncate(config.lengthDescription) }} + {% else %} + {{ item.description }} + {% endif %} +
    + {% endif %}
    • {% endfor %}
{% else %} -
- {% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %} -
- {% if sourceTitle and config.showSourceTitle %} - {{ sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} - {% endif %} - {% if config.showPublishDate %} - {{ publishDate }}: - {% endif %} +
+ {% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %} +
+ {% if sourceTitle and config.showSourceTitle %} + {{ sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %} + {% endif %} + {% if config.showPublishDate %} + {{ publishDate }}: + {% endif %} +
+ {% endif %} +
+ {{ title }}
- {% endif %} -
- {{ title }} + {% if config.showDescription %} +
+ {% if config.truncDescription %} + {{ description | truncate(config.lengthDescription) }} + {% else %} + {{ description }} + {% endif %} +
+ {% endif %}
- {% if config.showDescription %} -
- {% if config.truncDescription %} - {{ description | truncate(config.lengthDescription) }} - {% else %} - {{ description }} - {% endif %} -
- {% endif %} -
{% endif %} {% elseif error %}
From 5e7aa8e16d7f3d22e569d92d8b3a88a078904de4 Mon Sep 17 00:00:00 2001 From: Robert Ewald Date: Thu, 3 Jun 2021 12:42:39 +0200 Subject: [PATCH 4/5] changelog updated. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6e5df9a..43fa6cd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel, - Added custom-properties for gaps around body and between modules - Added test case for recurring calendar events - Added new Environment Canada provider for default WEATHER module (weather data for Canadian locations only) +- Added list view for newsfeed module. ### Updated From d56a6fb06f5f5e86aa3689f2b9a3cd0ae5ef0609 Mon Sep 17 00:00:00 2001 From: Robert Ewald Date: Thu, 3 Jun 2021 12:45:08 +0200 Subject: [PATCH 5/5] disabled by default. --- modules/default/newsfeed/newsfeed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 38f48dc6..7e21f8a8 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -14,7 +14,7 @@ Module.register("newsfeed", { encoding: "UTF-8" //ISO-8859-1 } ], - showAsList: true, + showAsList: false, showSourceTitle: true, showPublishDate: true, broadcastNewsFeeds: true,