diff --git a/news.njk b/news.njk index af26274..2e5c938 100644 --- a/news.njk +++ b/news.njk @@ -134,13 +134,22 @@ withSidebar: true {% endif %}
- {% if item.feedTitle %} - + {# Use sourceTitle for aggregators, fall back to feedTitle for direct feeds #} + {% set displayTitle = item.sourceTitle or item.feedTitle %} + {% set displayUrl = item.sourceUrl or (item.feedInfo and item.feedInfo.siteUrl) %} + {% if displayTitle %} + {% if item.feedInfo and item.feedInfo.imageUrl %} {% endif %} - {{ item.feedTitle }} - + {{ displayTitle | truncate(25) }} + {% endif %} {% if item.author %} @@ -200,7 +209,8 @@ withSidebar: true
- {% if item.feedTitle %}{{ item.feedTitle }}{% endif %} + {# Use sourceTitle for aggregators, fall back to feedTitle for direct feeds #} + {% if item.sourceTitle %}{{ item.sourceTitle | truncate(20) }}{% elif item.feedTitle %}{{ item.feedTitle | truncate(20) }}{% endif %} {% if item.pubDate %} @@ -232,17 +242,20 @@ withSidebar: true
{# Meta bar #}
- {% if item.feedInfo %} + {# Source link - use sourceTitle/Url for aggregators, feedInfo for direct feeds #} + {% set displayTitle = item.sourceTitle or item.feedTitle %} + {% set displayUrl = item.sourceUrl or (item.feedInfo and item.feedInfo.siteUrl) %} + {% if displayTitle %} - {% if item.feedInfo.imageUrl %} + {% if item.feedInfo and item.feedInfo.imageUrl %} {% endif %} - {{ item.feedTitle }} + {{ displayTitle }} {% endif %}