From 8cdf9ba973456dbec1fc39870d525cf911ebfcbc Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 12 Oct 2015 19:00:46 +0200 Subject: [PATCH] Updated demo feed info. --- .../config/modules/feed_aggregator/feeds.json | 46 +++++++++---------- examples/demo/site/themes/bootstrap/page.tpl | 4 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/demo/site/config/modules/feed_aggregator/feeds.json b/examples/demo/site/config/modules/feed_aggregator/feeds.json index b1fb13e..b147004 100644 --- a/examples/demo/site/config/modules/feed_aggregator/feeds.json +++ b/examples/demo/site/config/modules/feed_aggregator/feeds.json @@ -1,28 +1,28 @@ { - "ids": ["eiffel", "forum"], + "ids": ["news", "forum"], "feeds": { - "eiffel": { - "title": "Eiffel related posts.", - "expiration": "21600", - "size": 10, - "locations": [ - "https://bertrandmeyer.com/feed/", - "https://room.eiffel.com/blog/feed", - "https://room.eiffel.com/article/feed", - "https://room.eiffel.com/library/feed" - ] - , "categories": ["Eiffel"] - ,"option_description": "enabled" - }, - "forum": { - "title": "Eiffel Forum", - "expiration": "21600", - "size": 10, - "locations": [ - "https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15". - "http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest" + "news": { + "title": "Eiffel related posts", + "expiration": "21600", + "size": 5, + "locations": [ + "https://bertrandmeyer.com/feed/", + "https://room.eiffel.com/blog/feed", + "https://room.eiffel.com/article/feed", + "https://room.eiffel.com/library/feed" ] - ,"option_description": "enabled" - } + , "categories": ["Eiffel"] + ,"option_description": "enabled" + }, + "forum": { + "title": "Eiffel Forum", + "expiration": "21600", + "size": 5, + "locations": [ + "https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15", + "http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest" + ] + ,"option_description": "enabled" + } } } diff --git a/examples/demo/site/themes/bootstrap/page.tpl b/examples/demo/site/themes/bootstrap/page.tpl index a524fba..31474dc 100644 --- a/examples/demo/site/themes/bootstrap/page.tpl +++ b/examples/demo/site/themes/bootstrap/page.tpl @@ -63,8 +63,8 @@ {unless isempty="$page_title"}

{$page_title/}

{/unless} {$page.region_content/} {if condition="$page.is_front"} - {if isset="$page.region_feed_eiffel"} -
{$page.region_feed_eiffel/}
+ {if isset="$page.region_feed_news"} +
{$page.region_feed_news/}
{/if} {if isset="$page.region_feed_forum"}
{$page.region_feed_forum/}