diff options
author | Thomas Citharel <tcit@tcit.fr> | 2017-07-09 18:45:39 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2017-07-09 18:45:39 +0200 |
commit | 1554eb0adac470151d9668d55ce1450c64f862d9 (patch) | |
tree | a373af783ba1d53329be9790a0f672f55cd961ec /src/Wallabag/CoreBundle/Resources/views/themes/common | |
parent | f04611c711715064cd7a23d4dc51bc703a8dbeef (diff) | |
download | wallabag-1554eb0adac470151d9668d55ce1450c64f862d9.tar.gz wallabag-1554eb0adac470151d9668d55ce1450c64f862d9.tar.zst wallabag-1554eb0adac470151d9668d55ce1450c64f862d9.zip |
Rebase & Rename all rss to feeds
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/common')
4 files changed, 18 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig new file mode 100644 index 00000000..bbe9c89d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig | |||
@@ -0,0 +1,6 @@ | |||
1 | {% if tag is defined %} | ||
2 | <a rel="alternate" type="application/atom+xml" href="{{ path('tag_feed', {'username': app.user.username, 'token': app.user.config.feedToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a> | ||
3 | {% elseif currentRoute in ['unread', 'starred', 'archive', 'all'] %} | ||
4 | <a rel="alternate" type="application/atom+xml" href="{{ path(currentRoute ~ '_rss', {'username': app.user.username, 'token': app.user.config.feedToken}) }}" class="right"><i class="material-icons">rss_feed</i></a> | ||
5 | {% endif %} | ||
6 | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig deleted file mode 100644 index 2bf9b2bd..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_rss_link.html.twig +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | {% if tag is defined %} | ||
2 | <a rel="alternate" type="application/rss+xml" href="{{ path('tag_rss', {'username': app.user.username, 'token': app.user.config.rssToken, 'slug': tag.slug}) }}" class="right"><i class="material-icons md-24">rss_feed</i></a> | ||
3 | {% elseif currentRoute in ['unread', 'starred', 'archive', 'all'] %} | ||
4 | <a rel="alternate" type="application/rss+xml" href="{{ path(currentRoute ~ '_rss', {'username': app.user.username, 'token': app.user.config.rssToken}) }}" class="right"><i class="material-icons">rss_feed</i></a> | ||
5 | {% endif %} | ||
6 | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig index 0a0131cd..f5b84355 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig | |||
@@ -1,12 +1,19 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <feed xmlns="http://www.w3.org/2005/Atom"> | 2 | <feed xmlns="http://www.w3.org/2005/Atom"> |
3 | <title>wallabag — {{type}} feed</title> | 3 | {% if type != 'tag' %} |
4 | <subtitle type="html">RSS feed for {{ type }} entries</subtitle> | 4 | <title>wallabag — {{type}} feed</title> |
5 | <subtitle type="html">Atom feed for {{ type }} entries</subtitle> | ||
6 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id> | ||
7 | <link rel="alternate" type="text/html" href="{{ url(type) }}"/> | ||
8 | {% else %} | ||
9 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}:{{ tag }}</id> | ||
10 | <link rel="alternate" type="text/html" href="{{ url('tag_entries', {'slug': tag}) }}"/> | ||
11 | <title>wallabag — {{type}} {{ tag }} feed</title> | ||
12 | <subtitle type="html">Atom feed for entries tagged with {{ tag }}</subtitle> | ||
13 | {% endif %} | ||
5 | {% if entries | length > 0 %} | 14 | {% if entries | length > 0 %} |
6 | <updated>{{ (entries | first).createdAt | date('c') }}</updated> {# Indicates the last time the feed was modified in a significant way. #} | 15 | <updated>{{ (entries | first).createdAt | date('c') }}</updated> {# Indicates the last time the feed was modified in a significant way. #} |
7 | {% endif %} | 16 | {% endif %} |
8 | <id>wallabag:{{ domainName | removeScheme | removeWww }}:{{ user }}:{{ type }}</id> | ||
9 | <link rel="alternate" type="text/html" href="{{ url(type) }}"/> | ||
10 | <link rel="self" type="application/atom+xml" href="{{ app.request.uri }}"/> | 17 | <link rel="self" type="application/atom+xml" href="{{ app.request.uri }}"/> |
11 | {% if entries.hasPreviousPage %} | 18 | {% if entries.hasPreviousPage %} |
12 | <link rel="previous" href="{{ url }}/{{ entries.previousPage }}"/> | 19 | <link rel="previous" href="{{ url }}/{{ entries.previousPage }}"/> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig index 4580813c..521b3eea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig | |||
@@ -21,7 +21,7 @@ | |||
21 | <div class="card-action"> | 21 | <div class="card-action"> |
22 | <ul> | 22 | <ul> |
23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> | 23 | <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li> |
24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li> | 24 | <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.feed'|trans }}</a></li> |
25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> | 25 | <li><a href="{{ path('config') }}#set5">{{ 'quickstart.more'|trans }}</a></li> |
26 | </ul> | 26 | </ul> |
27 | </div> | 27 | </div> |