diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
14 files changed, 185 insertions, 106 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index dacdb9ca..f024b633 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -70,10 +70,6 @@ | |||
70 | 70 | ||
71 | {% block footer %}{% endblock %} | 71 | {% block footer %}{% endblock %} |
72 | 72 | ||
73 | <div id="warning_message"> | ||
74 | You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new one if necessary</a>. | ||
75 | </div> | ||
76 | |||
77 | {% if craue_setting('piwik_enabled') %} | 73 | {% if craue_setting('piwik_enabled') %} |
78 | {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} | 74 | {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} |
79 | {% endif %} | 75 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 89e6e076..0798962c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | <h2>{{ 'config.tab_menu.rss'|trans }}</h2> | 50 | <h2>{{ 'config.tab_menu.rss'|trans }}</h2> |
51 | 51 | ||
52 | {{ form_start(form.rss) }} | 52 | {{ form_start(form.rss) }} |
53 | {{ form_errors(form.rss) }} | 53 | {{ form_errors(form.rss) }} |
54 | 54 | ||
55 | <div class="row"> | 55 | <div class="row"> |
@@ -169,7 +169,7 @@ | |||
169 | {{ form_rest(form.pwd) }} | 169 | {{ form_rest(form.pwd) }} |
170 | </form> | 170 | </form> |
171 | 171 | ||
172 | <h2>{{ 'config.tab_menu.rules'|trans }}}</h2> | 172 | <h2>{{ 'config.tab_menu.rules'|trans }}</h2> |
173 | 173 | ||
174 | <ul> | 174 | <ul> |
175 | {% for tagging_rule in app.user.config.taggingRules %} | 175 | {% for tagging_rule in app.user.config.taggingRules %} |
@@ -183,7 +183,7 @@ | |||
183 | {% endfor %} | 183 | {% endfor %} |
184 | </ul> | 184 | </ul> |
185 | 185 | ||
186 | {{ form_start(form.new_tagging_rule) }} | 186 | {{ form_start(form.new_tagging_rule) }} |
187 | {{ form_errors(form.new_tagging_rule) }} | 187 | {{ form_errors(form.new_tagging_rule) }} |
188 | 188 | ||
189 | <fieldset class="w500p inline"> | 189 | <fieldset class="w500p inline"> |
@@ -205,6 +205,91 @@ | |||
205 | {{ form_rest(form.new_tagging_rule) }} | 205 | {{ form_rest(form.new_tagging_rule) }} |
206 | </form> | 206 | </form> |
207 | 207 | ||
208 | <div class="row"> | ||
209 | <div class="input-field col s12"> | ||
210 | <h3>{{ 'config.form_rules.faq.title'|trans }}</h3> | ||
211 | |||
212 | <h4>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h4> | ||
213 | <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p> | ||
214 | |||
215 | <h4>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h4> | ||
216 | <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
217 | |||
218 | <h4>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h4> | ||
219 | <p class="help"> | ||
220 | {{ 'config.form_rules.faq.variables_available_description'|trans }} | ||
221 | </p> | ||
222 | |||
223 | <table class="bordered"> | ||
224 | <thead> | ||
225 | <tr> | ||
226 | <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th> | ||
227 | <th>{{ 'config.form_rules.faq.meaning'|trans }}</th> | ||
228 | <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th> | ||
229 | <th>{{ 'config.form_rules.faq.meaning'|trans }}</th> | ||
230 | </tr> | ||
231 | </thead> | ||
232 | |||
233 | <tbody> | ||
234 | <tr> | ||
235 | <td>title</td> | ||
236 | <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td> | ||
237 | <td><=</td> | ||
238 | <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td> | ||
239 | </tr> | ||
240 | <tr> | ||
241 | <td>url</td> | ||
242 | <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td> | ||
243 | <td><</td> | ||
244 | <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td> | ||
245 | </tr> | ||
246 | <tr> | ||
247 | <td>isArchived</td> | ||
248 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> | ||
249 | <td>=></td> | ||
250 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> | ||
251 | </tr> | ||
252 | <tr> | ||
253 | <td>isStarred</td> | ||
254 | <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td> | ||
255 | <td>></td> | ||
256 | <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td> | ||
257 | </tr> | ||
258 | <tr> | ||
259 | <td>content</td> | ||
260 | <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td> | ||
261 | <td>=</td> | ||
262 | <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td> | ||
263 | </tr> | ||
264 | <tr> | ||
265 | <td>language</td> | ||
266 | <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td> | ||
267 | <td>!=</td> | ||
268 | <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td> | ||
269 | </tr> | ||
270 | <tr> | ||
271 | <td>mimetype</td> | ||
272 | <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td> | ||
273 | <td>OR</td> | ||
274 | <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td> | ||
275 | </tr> | ||
276 | <tr> | ||
277 | <td>readingTime</td> | ||
278 | <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td> | ||
279 | <td>AND</td> | ||
280 | <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td> | ||
281 | </tr> | ||
282 | <tr> | ||
283 | <td>domainName</td> | ||
284 | <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td> | ||
285 | <td>matches</td> | ||
286 | <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
287 | </tr> | ||
288 | </tbody> | ||
289 | </table> | ||
290 | </div> | ||
291 | </div> | ||
292 | |||
208 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 293 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
209 | <h2>{{ 'config.tab_menu.new_user'|trans }}</h2> | 294 | <h2>{{ 'config.tab_menu.new_user'|trans }}</h2> |
210 | 295 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig index e12779b7..7ff64ca6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/index.html.twig | |||
@@ -14,7 +14,8 @@ | |||
14 | 14 | ||
15 | <ul> | 15 | <ul> |
16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | 16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> |
17 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.full_documentation'|trans }}</a></li> | 17 | <li><a href="http://doc.wallabag.org/en/v2-documentation-api/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> |
18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | ||
18 | </ul> | 19 | </ul> |
19 | 20 | ||
20 | <h4>{{ 'developer.clients.title'|trans }}</h4> | 21 | <h4>{{ 'developer.clients.title'|trans }}</h4> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index f718043b..22f456da 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -23,19 +23,17 @@ | |||
23 | {% for entry in entries %} | 23 | {% for entry in entries %} |
24 | <div id="entry-{{ entry.id|e }}" class="entry"> | 24 | <div id="entry-{{ entry.id|e }}" class="entry"> |
25 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> | 25 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> |
26 | {% if entry.readingTime > 0 %} | 26 | |
27 | <div class="estimatedTime"> | 27 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
28 | <div class="estimatedTime"> | ||
28 | <span class="tool reading-time"> | 29 | <span class="tool reading-time"> |
29 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }} | 30 | {% if readingTime > 0 %} |
30 | </span> | 31 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }} |
31 | </div> | ||
32 | {% else %} | 32 | {% else %} |
33 | <div class="estimatedTime"> | 33 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} |
34 | <span class="tool reading-time"> | ||
35 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | ||
36 | </span> | ||
37 | </div> | ||
38 | {% endif %} | 34 | {% endif %} |
35 | </span> | ||
36 | </div> | ||
39 | 37 | ||
40 | <ul class="tools links"> | 38 | <ul class="tools links"> |
41 | <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> | 39 | <li><a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool icon-check icon {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.toogle_as_read'|trans }}</span></a></li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 5c0046d1..5687e48c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | <dl> | 8 | <dl> |
9 | <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt> | 9 | <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt> |
10 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | 10 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> |
11 | <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | 11 | <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> |
12 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | 12 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> |
13 | 13 | ||
@@ -25,9 +25,8 @@ | |||
25 | 25 | ||
26 | <dl> | 26 | <dl> |
27 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> | 27 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> |
28 | <dd><a href="https://doc.wallabag.org/en">english</a></dd> | 28 | <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd> |
29 | <dd><a href="https://doc.wallabag.org/fr">français</a></dd> | 29 | <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd> |
30 | <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd> | ||
31 | 30 | ||
32 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> | 31 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> |
33 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> | 32 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig index 8da1afa0..eab092c7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig | |||
@@ -11,7 +11,7 @@ | |||
11 | </ul> | 11 | </ul> |
12 | <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3> | 12 | <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3> |
13 | <ul> | 13 | <ul> |
14 | <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | 14 | <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> |
15 | <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | 15 | <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> |
16 | </ul> | 16 | </ul> |
17 | <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3> | 17 | <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index bac92ffa..2c15ad95 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig | |||
@@ -39,7 +39,7 @@ | |||
39 | <li><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li> | 39 | <li><a href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a></li> |
40 | <li><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li> | 40 | <li><a href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a></li> |
41 | <li><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li> | 41 | <li><a href="{{ path('new') }}">{{ 'menu.left.save_link'|trans }}</a></li> |
42 | <li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a> | 42 | <!--<li style="position: relative;"><a href="javascript: void(null);" id="search">{{ 'menu.left.search'|trans }}</a> |
43 | <div id="search-form" class="messages info popup-form"> | 43 | <div id="search-form" class="messages info popup-form"> |
44 | <form method="get" action="index.php"> | 44 | <form method="get" action="index.php"> |
45 | <h2>{{ 'menu.left.search'|trans }}</h2> | 45 | <h2>{{ 'menu.left.search'|trans }}</h2> |
@@ -49,7 +49,7 @@ | |||
49 | <input id="submit-search" type="submit" value="{{ 'menu.left.search'|trans }}"> | 49 | <input id="submit-search" type="submit" value="{{ 'menu.left.search'|trans }}"> |
50 | </form> | 50 | </form> |
51 | </div> | 51 | </div> |
52 | </li> | 52 | </li>--> |
53 | <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> | 53 | <li><a href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a></li> |
54 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 54 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
55 | <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> | 55 | <li><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 3343a1d2..5b94f01c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -250,75 +250,75 @@ | |||
250 | <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5> | 250 | <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5> |
251 | <p class="help"> | 251 | <p class="help"> |
252 | {{ 'config.form_rules.faq.variables_available_description'|trans }} | 252 | {{ 'config.form_rules.faq.variables_available_description'|trans }} |
253 | |||
254 | <table class="bordered"> | ||
255 | <thead> | ||
256 | <tr> | ||
257 | <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th> | ||
258 | <th>{{ 'config.form_rules.faq.meaning'|trans }}</th> | ||
259 | <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th> | ||
260 | <th>{{ 'config.form_rules.faq.meaning'|trans }}</th> | ||
261 | </tr> | ||
262 | </thead> | ||
263 | |||
264 | <tbody> | ||
265 | <tr> | ||
266 | <td>title</td> | ||
267 | <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td> | ||
268 | <td><=</td> | ||
269 | <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td> | ||
270 | </tr> | ||
271 | <tr> | ||
272 | <td>url</td> | ||
273 | <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td> | ||
274 | <td><</td> | ||
275 | <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td> | ||
276 | </tr> | ||
277 | <tr> | ||
278 | <td>isArchived</td> | ||
279 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> | ||
280 | <td>=></td> | ||
281 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> | ||
282 | </tr> | ||
283 | <tr> | ||
284 | <td>isStarred</td> | ||
285 | <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td> | ||
286 | <td>></td> | ||
287 | <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td> | ||
288 | </tr> | ||
289 | <tr> | ||
290 | <td>content</td> | ||
291 | <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td> | ||
292 | <td>=</td> | ||
293 | <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td> | ||
294 | </tr> | ||
295 | <tr> | ||
296 | <td>language</td> | ||
297 | <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td> | ||
298 | <td>!=</td> | ||
299 | <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td> | ||
300 | </tr> | ||
301 | <tr> | ||
302 | <td>mimetype</td> | ||
303 | <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td> | ||
304 | <td>OR</td> | ||
305 | <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td> | ||
306 | </tr> | ||
307 | <tr> | ||
308 | <td>readingTime</td> | ||
309 | <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td> | ||
310 | <td>AND</td> | ||
311 | <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td> | ||
312 | </tr> | ||
313 | <tr> | ||
314 | <td>domainName</td> | ||
315 | <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td> | ||
316 | <td>matches</td> | ||
317 | <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
318 | </tr> | ||
319 | </tbody> | ||
320 | </table> | ||
321 | </p> | 253 | </p> |
254 | |||
255 | <table class="bordered"> | ||
256 | <thead> | ||
257 | <tr> | ||
258 | <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th> | ||
259 | <th>{{ 'config.form_rules.faq.meaning'|trans }}</th> | ||
260 | <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th> | ||
261 | <th>{{ 'config.form_rules.faq.meaning'|trans }}</th> | ||
262 | </tr> | ||
263 | </thead> | ||
264 | |||
265 | <tbody> | ||
266 | <tr> | ||
267 | <td>title</td> | ||
268 | <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td> | ||
269 | <td><=</td> | ||
270 | <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td> | ||
271 | </tr> | ||
272 | <tr> | ||
273 | <td>url</td> | ||
274 | <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td> | ||
275 | <td><</td> | ||
276 | <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td> | ||
277 | </tr> | ||
278 | <tr> | ||
279 | <td>isArchived</td> | ||
280 | <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td> | ||
281 | <td>=></td> | ||
282 | <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td> | ||
283 | </tr> | ||
284 | <tr> | ||
285 | <td>isStarred</td> | ||
286 | <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td> | ||
287 | <td>></td> | ||
288 | <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td> | ||
289 | </tr> | ||
290 | <tr> | ||
291 | <td>content</td> | ||
292 | <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td> | ||
293 | <td>=</td> | ||
294 | <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td> | ||
295 | </tr> | ||
296 | <tr> | ||
297 | <td>language</td> | ||
298 | <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td> | ||
299 | <td>!=</td> | ||
300 | <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td> | ||
301 | </tr> | ||
302 | <tr> | ||
303 | <td>mimetype</td> | ||
304 | <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td> | ||
305 | <td>OR</td> | ||
306 | <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td> | ||
307 | </tr> | ||
308 | <tr> | ||
309 | <td>readingTime</td> | ||
310 | <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td> | ||
311 | <td>AND</td> | ||
312 | <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td> | ||
313 | </tr> | ||
314 | <tr> | ||
315 | <td>domainName</td> | ||
316 | <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td> | ||
317 | <td>matches</td> | ||
318 | <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
319 | </tr> | ||
320 | </tbody> | ||
321 | </table> | ||
322 | </div> | 322 | </div> |
323 | </div> | 323 | </div> |
324 | </div> | 324 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig index e12779b7..7ff64ca6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/index.html.twig | |||
@@ -14,7 +14,8 @@ | |||
14 | 14 | ||
15 | <ul> | 15 | <ul> |
16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> | 16 | <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> |
17 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.full_documentation'|trans }}</a></li> | 17 | <li><a href="http://doc.wallabag.org/en/v2-documentation-api/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> |
18 | <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> | ||
18 | </ul> | 19 | </ul> |
19 | 20 | ||
20 | <h4>{{ 'developer.clients.title'|trans }}</h4> | 21 | <h4>{{ 'developer.clients.title'|trans }}</h4> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 433b1cae..8782d639 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -54,7 +54,7 @@ | |||
54 | <span class="tool reading-time"> | 54 | <span class="tool reading-time"> |
55 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 55 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
56 | {% if readingTime > 0 %} | 56 | {% if readingTime > 0 %} |
57 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime}) }} | 57 | {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }} |
58 | {% else %} | 58 | {% else %} |
59 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} | 59 | {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} |
60 | {% endif %} | 60 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 032d2d9b..66435699 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -192,14 +192,14 @@ | |||
192 | {% endfor %} | 192 | {% endfor %} |
193 | </div> | 193 | </div> |
194 | 194 | ||
195 | {% if entry.previewPicture is not null %} | ||
196 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> | ||
197 | {% endif %} | ||
198 | |||
199 | <div class="input-field nav-panel-add-tag" style="display: none"> | 195 | <div class="input-field nav-panel-add-tag" style="display: none"> |
200 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} | 196 | {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} |
201 | </div> | 197 | </div> |
202 | 198 | ||
199 | {% if entry.previewPicture is not null %} | ||
200 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> | ||
201 | {% endif %} | ||
202 | |||
203 | </aside> | 203 | </aside> |
204 | <article> | 204 | <article> |
205 | {{ entry.content | raw }} | 205 | {{ entry.content | raw }} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index a294b74d..4b1fdcce 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | <div id="set1" class="col s12"> | 22 | <div id="set1" class="col s12"> |
23 | <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt> | 23 | <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt> |
24 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | 24 | <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> |
25 | <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | 25 | <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> |
26 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> | 26 | <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd> |
27 | <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt> | 27 | <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt> |
@@ -34,9 +34,8 @@ | |||
34 | <div id="set2" class="col s12"> | 34 | <div id="set2" class="col s12"> |
35 | <dl> | 35 | <dl> |
36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> | 36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> |
37 | <dd><a href="https://doc.wallabag.org/en">english</a></dd> | 37 | <dd><a href="http://doc.wallabag.org/en/v2/">english</a></dd> |
38 | <dd><a href="https://doc.wallabag.org/fr">français</a></dd> | 38 | <dd><a href="http://doc.wallabag.org/fr/v2/">français</a></dd> |
39 | <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd> | ||
40 | 39 | ||
41 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> | 40 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> |
42 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> | 41 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 15b548d8..4354a6b7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig | |||
@@ -18,7 +18,7 @@ | |||
18 | <div class="col s12"> | 18 | <div class="col s12"> |
19 | <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5> | 19 | <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5> |
20 | <ul> | 20 | <ul> |
21 | <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> | 21 | <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li> |
22 | <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> | 22 | <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li> |
23 | </ul> | 23 | </ul> |
24 | </div> | 24 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 48eaca81..75170f91 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -88,11 +88,11 @@ | |||
88 | <i class="mdi-content-add"></i> | 88 | <i class="mdi-content-add"></i> |
89 | </a> | 89 | </a> |
90 | </li> | 90 | </li> |
91 | <li> | 91 | <!--<li> |
92 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> | 92 | <a title="{{ 'menu.top.search'|trans }}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"> |
93 | <i class="mdi-action-search"></i> | 93 | <i class="mdi-action-search"></i> |
94 | </a> | 94 | </a> |
95 | </li> | 95 | </li>--> |
96 | <li id="button_filters"> | 96 | <li id="button_filters"> |
97 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> | 97 | <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> |
98 | <i class="mdi-content-filter-list"></i> | 98 | <i class="mdi-content-filter-list"></i> |