diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /src/Wallabag/CoreBundle/Resources/views/themes/common | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/common')
4 files changed, 190 insertions, 32 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig index 92cabdd9..654c1d2d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig | |||
@@ -6,8 +6,10 @@ | |||
6 | {{ 'entry.page_titles.archived'|trans }} | 6 | {{ 'entry.page_titles.archived'|trans }} |
7 | {% elseif currentRoute == 'all' %} | 7 | {% elseif currentRoute == 'all' %} |
8 | {{ 'entry.page_titles.filtered'|trans }} | 8 | {{ 'entry.page_titles.filtered'|trans }} |
9 | {% elseif currentRoute == 'search' %} | ||
10 | {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }} | ||
9 | {% elseif currentRoute == 'tag_entries' %} | 11 | {% elseif currentRoute == 'tag_entries' %} |
10 | {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }} | 12 | {{ 'entry.page_titles.filtered_tags'|trans }} {{ filter }} |
11 | {% elseif currentRoute == 'untagged' %} | 13 | {% elseif currentRoute == 'untagged' %} |
12 | {{ 'entry.page_titles.untagged'|trans }} | 14 | {{ 'entry.page_titles.untagged'|trans }} |
13 | {% else %} | 15 | {% else %} |
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 7103f22b..12e8c79f 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 | |||
@@ -2,7 +2,15 @@ | |||
2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> | 2 | <rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/"> |
3 | <channel> | 3 | <channel> |
4 | <title>wallabag — {{type}} feed</title> | 4 | <title>wallabag — {{type}} feed</title> |
5 | <link>{{ url('unread') }}</link> | 5 | <link>{{ url(type) }}</link> |
6 | <link rel="self" href="{{ app.request.uri }}"/> | ||
7 | {% if entries.hasPreviousPage -%} | ||
8 | <link rel="previous" href="{{ url }}?page={{ entries.previousPage }}"/> | ||
9 | {% endif -%} | ||
10 | {% if entries.hasNextPage -%} | ||
11 | <link rel="next" href="{{ url }}?page={{ entries.nextPage }}"/> | ||
12 | {% endif -%} | ||
13 | <link rel="last" href="{{ url }}?page={{ entries.nbPages }}"/> | ||
6 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> | 14 | <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate> |
7 | <generator>wallabag</generator> | 15 | <generator>wallabag</generator> |
8 | <description>wallabag {{type}} elements</description> | 16 | <description>wallabag {{type}} elements</description> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig index 67a10190..231f9bdf 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig | |||
@@ -7,38 +7,186 @@ | |||
7 | <div class="row"> | 7 | <div class="row"> |
8 | <div class="col s12"> | 8 | <div class="col s12"> |
9 | <div class="card-panel settings"> | 9 | <div class="card-panel settings"> |
10 | <p>{{ 'howto.page_description'|trans }}</p> | ||
11 | 10 | ||
12 | <div class="row"> | 11 | <div class="row"> |
13 | 12 | <div class="div_tabs col s12"> | |
14 | <div class="col s12"> | 13 | <ul class="tabs"> |
15 | <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a> | 14 | <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'howto.tab_menu.add_link'|trans }}</a></li> |
16 | </div> | 15 | <li class="tab col s12 m6 l3"><a href="#set2">{{ 'howto.tab_menu.shortcuts'|trans }}</a></li> |
17 | |||
18 | <div class="col s12"> | ||
19 | <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5> | ||
20 | <ul> | ||
21 | <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | ||
22 | <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | ||
23 | </ul> | 16 | </ul> |
24 | </div> | 17 | </div> |
25 | 18 | ||
26 | <div class="col s12"> | 19 | <div id="set1" class="col s12"> |
27 | <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5> | 20 | <p>{{ 'howto.page_description'|trans }}</p> |
28 | <ul> | 21 | |
29 | <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> | 22 | <div class="row"> |
30 | <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> | ||
31 | <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> | ||
32 | </ul> | ||
33 | </div> | ||
34 | 23 | ||
35 | <div class="col s12"> | 24 | <div class="col s12"> |
36 | <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5> | 25 | <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a> |
37 | {{ 'howto.bookmarklet.description'|trans }} | 26 | </div> |
38 | {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %} | 27 | |
28 | <div class="col s12"> | ||
29 | <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5> | ||
30 | <ul> | ||
31 | <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | ||
32 | <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | ||
33 | <li><a href="{{ addonsUrl.opera }}" target="_blank">{{ 'howto.browser_addons.opera'|trans }}</a></li> | ||
34 | </ul> | ||
35 | </div> | ||
36 | |||
37 | <div class="col s12"> | ||
38 | <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5> | ||
39 | <ul> | ||
40 | <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li> | ||
41 | <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li> | ||
42 | <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li> | ||
43 | </ul> | ||
44 | </div> | ||
45 | |||
46 | <div class="col s12"> | ||
47 | <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5> | ||
48 | {{ 'howto.bookmarklet.description'|trans }} | ||
49 | {% include '@WallabagCore/themes/common/Static/_bookmarklet.html.twig' %} | ||
50 | </div> | ||
51 | |||
52 | </div> | ||
39 | </div> | 53 | </div> |
40 | 54 | ||
41 | </div> | 55 | <div id="set2" class="col s12"> |
56 | <p>{{ 'howto.shortcuts.page_description'|trans }}</p> | ||
57 | |||
58 | <h5>{{ 'howto.shortcuts.all_pages_title'|trans }}</h5> | ||
59 | |||
60 | <table class="bordered"> | ||
61 | <thead> | ||
62 | <tr> | ||
63 | <th>{{ 'howto.shortcuts.shortcut'|trans }}</th> | ||
64 | <th>{{ 'howto.shortcuts.action'|trans }}</th> | ||
65 | </tr> | ||
66 | </thead> | ||
67 | |||
68 | <tbody> | ||
69 | <tr> | ||
70 | <td><code>g u</code></td> | ||
71 | <td>{{ 'howto.shortcuts.go_unread'|trans }}</td> | ||
72 | </tr> | ||
73 | <tr> | ||
74 | <td><code>g s</code></td> | ||
75 | <td>{{ 'howto.shortcuts.go_starred'|trans }}</td> | ||
76 | </tr> | ||
77 | <tr> | ||
78 | <td><code>g r</code></td> | ||
79 | <td>{{ 'howto.shortcuts.go_archive'|trans }}</td> | ||
80 | </tr> | ||
81 | <tr> | ||
82 | <td><code>g a</code></td> | ||
83 | <td>{{ 'howto.shortcuts.go_all'|trans }}</td> | ||
84 | </tr> | ||
85 | <tr> | ||
86 | <td><code>g t</code></td> | ||
87 | <td>{{ 'howto.shortcuts.go_tags'|trans }}</td> | ||
88 | </tr> | ||
89 | <tr> | ||
90 | <td><code>g c</code></td> | ||
91 | <td>{{ 'howto.shortcuts.go_config'|trans }}</td> | ||
92 | </tr> | ||
93 | <tr> | ||
94 | <td><code>g i</code></td> | ||
95 | <td>{{ 'howto.shortcuts.go_import'|trans }}</td> | ||
96 | </tr> | ||
97 | <tr> | ||
98 | <td><code>g d</code></td> | ||
99 | <td>{{ 'howto.shortcuts.go_developers'|trans }}</td> | ||
100 | </tr> | ||
101 | <tr> | ||
102 | <td><code>?</code></td> | ||
103 | <td>{{ 'howto.shortcuts.go_howto'|trans }}</td> | ||
104 | </tr> | ||
105 | <tr> | ||
106 | <td><code>g l</code></td> | ||
107 | <td>{{ 'howto.shortcuts.go_logout'|trans }}</td> | ||
108 | </tr> | ||
109 | </tbody> | ||
110 | </table> | ||
111 | |||
112 | <h5>{{ 'howto.shortcuts.list_title'|trans }}</h5> | ||
113 | |||
114 | <table class="bordered"> | ||
115 | <thead> | ||
116 | <tr> | ||
117 | <th>{{ 'howto.shortcuts.shortcut'|trans }}</th> | ||
118 | <th>{{ 'howto.shortcuts.action'|trans }}</th> | ||
119 | </tr> | ||
120 | </thead> | ||
121 | |||
122 | <tbody> | ||
123 | <tr> | ||
124 | <td><code>s</code></td> | ||
125 | <td>{{ 'howto.shortcuts.search'|trans }}</td> | ||
126 | </tr> | ||
127 | </tbody> | ||
128 | </table> | ||
129 | |||
130 | <h5>{{ 'howto.shortcuts.article_title'|trans }}</h5> | ||
131 | |||
132 | <table class="bordered"> | ||
133 | <thead> | ||
134 | <tr> | ||
135 | <th>{{ 'howto.shortcuts.shortcut'|trans }}</th> | ||
136 | <th>{{ 'howto.shortcuts.action'|trans }}</th> | ||
137 | </tr> | ||
138 | </thead> | ||
139 | |||
140 | <tbody> | ||
141 | <tr> | ||
142 | <td><code>o</code></td> | ||
143 | <td>{{ 'howto.shortcuts.open_original'|trans }}</td> | ||
144 | </tr> | ||
145 | <tr> | ||
146 | <td><code>f</code></td> | ||
147 | <td>{{ 'howto.shortcuts.toggle_favorite'|trans }}</td> | ||
148 | </tr> | ||
149 | <tr> | ||
150 | <td><code>a</code></td> | ||
151 | <td>{{ 'howto.shortcuts.toggle_archive'|trans }}</td> | ||
152 | </tr> | ||
153 | <tr> | ||
154 | <td><code>del</code></td> | ||
155 | <td>{{ 'howto.shortcuts.delete'|trans }}</td> | ||
156 | </tr> | ||
157 | </tbody> | ||
158 | </table> | ||
159 | |||
160 | <h5>{{ 'howto.shortcuts.material_title'|trans }}</h5> | ||
161 | |||
162 | <table class="bordered"> | ||
163 | <thead> | ||
164 | <tr> | ||
165 | <th>{{ 'howto.shortcuts.shortcut'|trans }}</th> | ||
166 | <th>{{ 'howto.shortcuts.action'|trans }}</th> | ||
167 | </tr> | ||
168 | </thead> | ||
169 | |||
170 | <tbody> | ||
171 | <tr> | ||
172 | <td><code>g n</code></td> | ||
173 | <td>{{ 'howto.shortcuts.add_link'|trans }}</td> | ||
174 | </tr> | ||
175 | <tr> | ||
176 | <td><code>esc</code></td> | ||
177 | <td>{{ 'howto.shortcuts.hide_form'|trans }}</td> | ||
178 | </tr> | ||
179 | <tr> | ||
180 | <td><code>← →</code></td> | ||
181 | <td>{{ 'howto.shortcuts.arrows_navigation'|trans }}</td> | ||
182 | </tr> | ||
183 | <tr> | ||
184 | <td><code>enter</code></td> | ||
185 | <td>{{ 'howto.shortcuts.open_article'|trans }}</td> | ||
186 | </tr> | ||
187 | </tbody> | ||
188 | </table> | ||
189 | </div> | ||
42 | 190 | ||
43 | </div> | 191 | </div> |
44 | </div> | 192 | </div> |
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 c8a303a6..b7a48551 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 | |||
@@ -15,7 +15,7 @@ | |||
15 | <li class="col l4 m6 s12"> | 15 | <li class="col l4 m6 s12"> |
16 | <div class="card teal darken-1"> | 16 | <div class="card teal darken-1"> |
17 | <div class="card-content white-text"> | 17 | <div class="card-content white-text"> |
18 | <span class="card-title">{{ 'quickstart.configure.title'|trans }}</span> | 18 | <span class="card-title white-text">{{ 'quickstart.configure.title'|trans }}</span> |
19 | <p>{{ 'quickstart.configure.description'|trans }}</p> | 19 | <p>{{ 'quickstart.configure.description'|trans }}</p> |
20 | </div> | 20 | </div> |
21 | <div class="card-action"> | 21 | <div class="card-action"> |
@@ -31,7 +31,7 @@ | |||
31 | <li class="col l4 m6 s12"> | 31 | <li class="col l4 m6 s12"> |
32 | <div class="card green darken-1"> | 32 | <div class="card green darken-1"> |
33 | <div class="card-content white-text"> | 33 | <div class="card-content white-text"> |
34 | <span class="card-title">{{ 'quickstart.first_steps.title'|trans }}</span> | 34 | <span class="card-title white-text">{{ 'quickstart.first_steps.title'|trans }}</span> |
35 | <p>{{ 'quickstart.first_steps.description'|trans }}</p> | 35 | <p>{{ 'quickstart.first_steps.description'|trans }}</p> |
36 | </div> | 36 | </div> |
37 | <div class="card-action"> | 37 | <div class="card-action"> |
@@ -46,7 +46,7 @@ | |||
46 | <li class="col l4 m6 s12"> | 46 | <li class="col l4 m6 s12"> |
47 | <div class="card light-green darken-1"> | 47 | <div class="card light-green darken-1"> |
48 | <div class="card-content white-text"> | 48 | <div class="card-content white-text"> |
49 | <span class="card-title">{{ 'quickstart.migrate.title'|trans }}</span> | 49 | <span class="card-title white-text">{{ 'quickstart.migrate.title'|trans }}</span> |
50 | <p>{{ 'quickstart.migrate.description'|trans }}</p> | 50 | <p>{{ 'quickstart.migrate.description'|trans }}</p> |
51 | </div> | 51 | </div> |
52 | <div class="card-action"> | 52 | <div class="card-action"> |
@@ -63,7 +63,7 @@ | |||
63 | <li class="col l4 m6 s12"> | 63 | <li class="col l4 m6 s12"> |
64 | <div class="card blue darken-1"> | 64 | <div class="card blue darken-1"> |
65 | <div class="card-content white-text"> | 65 | <div class="card-content white-text"> |
66 | <span class="card-title">{{ 'quickstart.developer.title'|trans }}</span> | 66 | <span class="card-title white-text">{{ 'quickstart.developer.title'|trans }}</span> |
67 | <p>{{ 'quickstart.developer.description'|trans }}</p> | 67 | <p>{{ 'quickstart.developer.description'|trans }}</p> |
68 | </div> | 68 | </div> |
69 | <div class="card-action"> | 69 | <div class="card-action"> |
@@ -79,7 +79,7 @@ | |||
79 | <li class="col l4 m6 s12"> | 79 | <li class="col l4 m6 s12"> |
80 | <div class="card light-blue darken-1"> | 80 | <div class="card light-blue darken-1"> |
81 | <div class="card-content white-text"> | 81 | <div class="card-content white-text"> |
82 | <span class="card-title">{{ 'quickstart.docs.title'|trans }}</span> | 82 | <span class="card-title white-text">{{ 'quickstart.docs.title'|trans }}</span> |
83 | <p>{{ 'quickstart.docs.description'|trans }}</p> | 83 | <p>{{ 'quickstart.docs.description'|trans }}</p> |
84 | </div> | 84 | </div> |
85 | <div class="card-action"> | 85 | <div class="card-action"> |
@@ -95,7 +95,7 @@ | |||
95 | <li class="col l4 m6 s12"> | 95 | <li class="col l4 m6 s12"> |
96 | <div class="card cyan darken-1"> | 96 | <div class="card cyan darken-1"> |
97 | <div class="card-content white-text"> | 97 | <div class="card-content white-text"> |
98 | <span class="card-title">{{ 'quickstart.support.title'|trans }}</span> | 98 | <span class="card-title white-text">{{ 'quickstart.support.title'|trans }}</span> |
99 | <p>{{ 'quickstart.support.description'|trans }}</p> | 99 | <p>{{ 'quickstart.support.description'|trans }}</p> |
100 | </div> | 100 | </div> |
101 | <div class="card-action"> | 101 | <div class="card-action"> |