diff options
author | Arthur <arthur@hoa.ro> | 2016-12-20 11:44:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-20 11:44:19 +0100 |
commit | e0177549c760b143efdd17b1579e0c0199dce939 (patch) | |
tree | ebe39650f12a80c09f8fae1b87a9d5c4c4141466 /tpl | |
parent | 80677a23e2e10d78bc527e9754286787b453ce61 (diff) | |
parent | db90dfcbbc406b50381f17a72f24095fee91bb09 (diff) | |
download | Shaarli-e0177549c760b143efdd17b1579e0c0199dce939.tar.gz Shaarli-e0177549c760b143efdd17b1579e0c0199dce939.tar.zst Shaarli-e0177549c760b143efdd17b1579e0c0199dce939.zip |
Merge pull request #620 from ArthurHoaro/pubsubhub
Move Pubsubhub to a default plugin
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/feed.atom.html | 11 | ||||
-rw-r--r-- | tpl/feed.rss.html | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index aead0459..ad7dd935 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html | |||
@@ -6,11 +6,9 @@ | |||
6 | <updated>{$last_update}</updated> | 6 | <updated>{$last_update}</updated> |
7 | {/if} | 7 | {/if} |
8 | <link rel="self" href="{$self_link}#" /> | 8 | <link rel="self" href="{$self_link}#" /> |
9 | {if="!empty($pubsubhub_url)"} | 9 | {loop="$feed_plugins_header"} |
10 | <!-- PubSubHubbub Discovery --> | 10 | {$value} |
11 | <link rel="hub" href="{$pubsubhub_url}#" /> | 11 | {/loop} |
12 | <!-- End Of PubSubHubbub Discovery --> | ||
13 | {/if} | ||
14 | <author> | 12 | <author> |
15 | <name>{$index_url}</name> | 13 | <name>{$index_url}</name> |
16 | <uri>{$index_url}</uri> | 14 | <uri>{$index_url}</uri> |
@@ -34,6 +32,9 @@ | |||
34 | {loop="$value.taglist"} | 32 | {loop="$value.taglist"} |
35 | <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" /> | 33 | <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" /> |
36 | {/loop} | 34 | {/loop} |
35 | {loop="$value.feed_plugins"} | ||
36 | {$value} | ||
37 | {/loop} | ||
37 | </entry> | 38 | </entry> |
38 | {/loop} | 39 | {/loop} |
39 | </feed> | 40 | </feed> |
diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index e18dbf9b..73791f63 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html | |||
@@ -8,10 +8,9 @@ | |||
8 | <copyright>{$index_url}</copyright> | 8 | <copyright>{$index_url}</copyright> |
9 | <generator>Shaarli</generator> | 9 | <generator>Shaarli</generator> |
10 | <atom:link rel="self" href="{$self_link}" /> | 10 | <atom:link rel="self" href="{$self_link}" /> |
11 | {if="!empty($pubsubhub_url)"} | 11 | {loop="$feed_plugins_header"} |
12 | <!-- PubSubHubbub Discovery --> | 12 | {$value} |
13 | <atom:link rel="hub" href="{$pubsubhub_url}" /> | 13 | {/loop} |
14 | {/if} | ||
15 | {loop="$links"} | 14 | {loop="$links"} |
16 | <item> | 15 | <item> |
17 | <title>{$value.title}</title> | 16 | <title>{$value.title}</title> |
@@ -29,6 +28,9 @@ | |||
29 | {loop="$value.taglist"} | 28 | {loop="$value.taglist"} |
30 | <category domain="{$index_url}?searchtags=">{$value}</category> | 29 | <category domain="{$index_url}?searchtags=">{$value}</category> |
31 | {/loop} | 30 | {/loop} |
31 | {loop="$value.feed_plugins"} | ||
32 | {$value} | ||
33 | {/loop} | ||
32 | </item> | 34 | </item> |
33 | {/loop} | 35 | {/loop} |
34 | </channel> | 36 | </channel> |