aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views/themes/material
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-03-09 08:59:08 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-03-20 21:12:22 +0100
commit0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc (patch)
tree4cf8b97ed3c06def270e9172c7b17c5c86048585 /src/Wallabag/CoreBundle/Resources/views/themes/material
parentd2b4f01d7435e8a8f99b15a2487916427c04e58d (diff)
downloadwallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.gz
wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.zst
wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.zip
Convert english translation file
- convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig163
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig16
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig65
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig57
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig50
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig36
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig79
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig119
13 files changed, 313 insertions, 288 deletions
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 2b0b0828..698219b9 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
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}config{% endtrans %}{% endblock %} 3{% block title %}{{ 'config.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 6
@@ -11,13 +11,13 @@
11 <div class="row"> 11 <div class="row">
12 <div class="div_tabs col s12"> 12 <div class="div_tabs col s12">
13 <ul class="tabs"> 13 <ul class="tabs">
14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li> 14 <li class="tab col s3"><a class="active" href="#set1">{{ 'config.tab_menu.settings'|trans }}</a></li>
15 <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> 15 <li class="tab col s3"><a href="#set2">{{ 'config.tab_menu.rss'|trans }}</a></li>
16 <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> 16 <li class="tab col s3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li>
17 <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> 17 <li class="tab col s3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li>
18 <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li> 18 <li class="tab col s3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li>
19 {% if is_granted('ROLE_SUPER_ADMIN') %} 19 {% if is_granted('ROLE_SUPER_ADMIN') %}
20 <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li> 20 <li class="tab col s3"><a href="#set6">{{ 'config.tab_menu.new_user'|trans }}</a></li>
21 {% endif %} 21 {% endif %}
22 </ul> 22 </ul>
23 </div> 23 </div>
@@ -28,9 +28,9 @@
28 28
29 <div class="row"> 29 <div class="row">
30 <div class="input-field col s12"> 30 <div class="input-field col s12">
31 {{ form_label(form.config.theme) }}
31 {{ form_errors(form.config.theme) }} 32 {{ form_errors(form.config.theme) }}
32 {{ form_widget(form.config.theme) }} 33 {{ form_widget(form.config.theme) }}
33 <label class="required">{% trans %}Theme{% endtrans %}</label>
34 </div> 34 </div>
35 </div> 35 </div>
36 36
@@ -59,10 +59,8 @@
59 </div> 59 </div>
60 </div> 60 </div>
61 61
62 <div class="hidden">{{ form_rest(form.config) }}</div> 62 {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
63 <button class="btn waves-effect waves-light" type="submit" name="action"> 63 {{ form_rest(form.config) }}
64 {% trans %}Save{% endtrans %}
65 </button>
66 </form> 64 </form>
67 </div> 65 </div>
68 66
@@ -72,33 +70,37 @@
72 70
73 <div class="row"> 71 <div class="row">
74 <div class="input-field col s12"> 72 <div class="input-field col s12">
75 {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.{% endtrans %} 73 {{ 'config.form_rss.description'|trans }}
76 </div> 74 </div>
77 </div> 75 </div>
78 76
79 <div class="row"> 77 <div class="row">
80 <div class="input-field col s12"> 78 <div class="input-field col s12">
81 <label>{% trans %}RSS token{% endtrans %}</label> 79 <label>{{ 'config.form_rss.token_label'|trans }}</label>
82 <div> 80 <div>
83 {% if rss.token %} 81 {% if rss.token %}
84 {{ rss.token }} 82 {{ rss.token }}
85 {% else %} 83 {% else %}
86 <em>{% trans %}No token{% endtrans %}</em> 84 <em>{{ 'config.form_rss.no_token'|trans }}</em>
87 {% endif %} 85 {% endif %}
88 – <a href="{{ path('generate_token') }}">{% if rss.token %}{% trans %}Reset your token{% endtrans %}{% else %}{% trans %}Create your token{% endtrans %}{% endif %}</a> 86 – <a href="{{ path('generate_token') }}">
87 {% if rss.token %}
88 {{ 'config.form_rss.token_reset'|trans }}
89 {% else %}
90 {{ 'config.form_rss.token_create'|trans }}
91 {% endif %}</a>
89 </div> 92 </div>
90 </div> 93 </div>
91 </div> 94 </div>
92 {% if rss.token %} 95 {% if rss.token %}
93 <div class="row"> 96 <div class="row">
94 <div class="input-field col s12"> 97 <div class="input-field col s12">
95 <label>{% trans %}RSS links{% endtrans %}</label> 98 <label>{{ 'config.form_rss.rss_links'|trans }}</label>
96 <ul> 99 <ul>
97 <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}unread{% endtrans %}</a></li> 100 <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.unread'|trans }}</a></li>
98 <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}starred{% endtrans %}</a></li> 101 <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.starred'|trans }}</a></li>
99 <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}archive{% endtrans %}</a></li> 102 <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{{ 'config.form_rss.rss_link.archive'|trans }}</a></li>
100 </ul> 103 </ul>
101
102 </div> 104 </div>
103 </div> 105 </div>
104 {% endif %} 106 {% endif %}
@@ -111,11 +113,8 @@
111 </div> 113 </div>
112 </div> 114 </div>
113 115
114 <div class="hidden">{{ form_rest(form.rss) }}</div> 116 {{ form_widget(form.rss.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
115 <button class="btn waves-effect waves-light" type="submit" name="action"> 117 {{ form_rest(form.rss) }}
116 {% trans %}Save{% endtrans %}
117 </button>
118
119 </form> 118 </form>
120 </div> 119 </div>
121 120
@@ -142,7 +141,7 @@
142 {% if twofactor_auth %} 141 {% if twofactor_auth %}
143 <div class="row"> 142 <div class="row">
144 <div class="input-field col s12"> 143 <div class="input-field col s12">
145 {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %} 144 {{ 'config.form_user.two_factor_description'|trans }}
146 </div> 145 </div>
147 </div> 146 </div>
148 147
@@ -155,11 +154,8 @@
155 </div> 154 </div>
156 {% endif %} 155 {% endif %}
157 156
158 <div class="hidden">{{ form_rest(form.user) }}</div> 157 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
159 <button class="btn waves-effect waves-light" type="submit" name="action"> 158 {{ form_rest(form.user) }}
160 {% trans %}Save{% endtrans %}
161 </button>
162
163 </form> 159 </form>
164 </div> 160 </div>
165 161
@@ -191,11 +187,8 @@
191 </div> 187 </div>
192 </div> 188 </div>
193 189
194 <div class="hidden">{{ form_rest(form.pwd) }}</div> 190 {{ form_widget(form.pwd.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
195 <button class="btn waves-effect waves-light" type="submit" name="action"> 191 {{ form_rest(form.pwd) }}
196 {% trans %}Save{% endtrans %}
197 </button>
198
199 </form> 192 </form>
200 </div> 193 </div>
201 194
@@ -205,8 +198,11 @@
205 <ul> 198 <ul>
206 {% for tagging_rule in app.user.config.taggingRules %} 199 {% for tagging_rule in app.user.config.taggingRules %}
207 <li> 200 <li>
208 if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} » 201 {{ 'config.form_rules.if_label'|trans }}
209 <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{% trans %}Delete{% endtrans %}"> 202 « {{ tagging_rule.rule }} »
203 {{ 'config.form_rules.then_tag_as_label'|trans }}
204 « {{ tagging_rule.tags|join(', ') }} »
205 <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}">
210 <i class="tool grey-text delete mdi-action-delete"></i> 206 <i class="tool grey-text delete mdi-action-delete"></i>
211 </a> 207 </a>
212 </li> 208 </li>
@@ -234,102 +230,88 @@
234 </div> 230 </div>
235 </div> 231 </div>
236 232
237 <div class="hidden">{{ form_rest(form.new_tagging_rule) }}</div> 233 {{ form_widget(form.new_tagging_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
238 <button class="btn waves-effect waves-light" type="submit" name="action"> 234 {{ form_rest(form.new_tagging_rule) }}
239 {% trans %}Save{% endtrans %}
240 </button>
241 </form> 235 </form>
242 236
243 <div class="row"> 237 <div class="row">
244 <div class="input-field col s12"> 238 <div class="input-field col s12">
245 <h4>{% trans %}FAQ{% endtrans %}</h4> 239 <h4>{{ 'config.form_rules.faq.title'|trans }}</h4>
246 240
247 <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5> 241 <h5>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h5>
248 <p class="help"> 242 <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
249 {% trans %}
250 They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
251 {% endtrans %}
252 </p>
253 243
254 <h5>{% trans %}How do I use them?{% endtrans %}</h5> 244 <h5>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h5>
255 <p class="help"> 245 <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
256 {% trans %}
257 Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »
258 {% endtrans %}
259 </p>
260 246
261 <h5>{% trans %}Which variables and operators can I use to write rules?{% endtrans %}</h5> 247 <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
262 <p class="help"> 248 <p class="help">
263 {% trans %}The following variables and operators can be used to create tagging rules:{% endtrans %} 249 {{ 'config.form_rules.faq.variables_available_description'|trans }}
264 250
265 <table> 251 <table class="bordered">
266 <thead> 252 <thead>
267 <tr> 253 <tr>
268 <th>{% trans %}Variable{% endtrans %}</th> 254 <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
269 <th>{% trans %}Meaning{% endtrans %}</th> 255 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
270 <th>{% trans %}Operator{% endtrans %}</th> 256 <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
271 <th>{% trans %}Meaning{% endtrans %}</th> 257 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
272 </tr> 258 </tr>
273 </thead> 259 </thead>
274 260
275 <tbody> 261 <tbody>
276 <tr> 262 <tr>
277 <td>title</td> 263 <td>title</td>
278 <td>{% trans %}Title of the entry{% endtrans %}</td> 264 <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
279 <td>&lt;=</td> 265 <td>&lt;=</td>
280 <td>{% trans %}Less than…{% endtrans %}</td> 266 <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
281 </tr> 267 </tr>
282 <tr> 268 <tr>
283 <td>url</td> 269 <td>url</td>
284 <td>{% trans %}URL of the entry{% endtrans %}</td> 270 <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
285 <td>&lt;</td> 271 <td>&lt;</td>
286 <td>{% trans %}Strictly less than…{% endtrans %}</td> 272 <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
287 </tr> 273 </tr>
288 <tr> 274 <tr>
289 <td>isArchived</td> 275 <td>isArchived</td>
290 <td>{% trans %}Whether the entry is archived or not{% endtrans %}</td> 276 <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
291 <td>=&gt;</td> 277 <td>=&gt;</td>
292 <td>{% trans %}Greater than…{% endtrans %}</td> 278 <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
293 </tr> 279 </tr>
294 <tr> 280 <tr>
295 <td>isStarred</td> 281 <td>isStarred</td>
296 <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td> 282 <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
297 <td>&gt;</td> 283 <td>&gt;</td>
298 <td>{% trans %}Strictly greater than…{% endtrans %}</td> 284 <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
299 </tr> 285 </tr>
300 <tr> 286 <tr>
301 <td>content</td> 287 <td>content</td>
302 <td>{% trans %}The entry's content{% endtrans %}</td> 288 <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
303 <td>=</td> 289 <td>=</td>
304 <td>{% trans %}Equal to…{% endtrans %}</td> 290 <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
305 </tr> 291 </tr>
306 <tr> 292 <tr>
307 <td>language</td> 293 <td>language</td>
308 <td>{% trans %}The entry's language{% endtrans %}</td> 294 <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
309 <td>!=</td> 295 <td>!=</td>
310 <td>{% trans %}Not equal to…{% endtrans %}</td> 296 <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
311 </tr> 297 </tr>
312 <tr> 298 <tr>
313 <td>mimetype</td> 299 <td>mimetype</td>
314 <td>{% trans %}The entry's mime-type{% endtrans %}</td> 300 <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
315 <td>OR</td> 301 <td>OR</td>
316 <td>{% trans %}One rule or another{% endtrans %}</td> 302 <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
317 </tr> 303 </tr>
318 <tr> 304 <tr>
319 <td>readingTime</td> 305 <td>readingTime</td>
320 <td>{% trans %}The estimated entry's reading time, in minutes{% endtrans %}</td> 306 <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
321 <td>AND</td> 307 <td>AND</td>
322 <td>{% trans %}One rule and another{% endtrans %}</td> 308 <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
323 </tr> 309 </tr>
324 <tr> 310 <tr>
325 <td>domainName</td> 311 <td>domainName</td>
326 <td>{% trans %}The domain name of the entry{% endtrans %}</td> 312 <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
327 <td>matches</td> 313 <td>matches</td>
328 <td> 314 <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
329 {% trans %}
330 Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>
331 {% endtrans %}
332 </td>
333 </tr> 315 </tr>
334 </tbody> 316 </tbody>
335 </table> 317 </table>
@@ -375,11 +357,8 @@
375 </div> 357 </div>
376 </div> 358 </div>
377 359
378 <div class="hidden">{{ form_rest(form.new_user) }}</div> 360 {{ form_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
379 <button class="btn waves-effect waves-light" type="submit" name="action"> 361 {{ form_rest(form.new_user) }}
380 {% trans %}Add a user{% endtrans %}
381 </button>
382
383 </form> 362 </form>
384 </div> 363 </div>
385 {% endif %} 364 {% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
index c002c4c3..1c5e2aab 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %} 3{% block title %}{{ 'entry.edit.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 6
@@ -10,7 +10,6 @@
10 10
11 <form name="entry" method="post" action=""> 11 <form name="entry" method="post" action="">
12 <div class="card-content"> 12 <div class="card-content">
13
14 {% if form_errors(form) %} 13 {% if form_errors(form) %}
15 <span class="black-text">{{ form_errors(form) }}</span> 14 <span class="black-text">{{ form_errors(form) }}</span>
16 {% endif %} 15 {% endif %}
@@ -25,16 +24,19 @@
25 </div> 24 </div>
26 25
27 <div class="input-field s12"> 26 <div class="input-field s12">
27 {{ form_label(form.url) }}
28 {{ form_widget(form.url) }}
29 </div>
30
31 <div class="input-field s12">
28 {{ form_widget(form.is_public) }} 32 {{ form_widget(form.is_public) }}
29 {{ form_label(form.is_public) }} 33 {{ form_label(form.is_public) }}
30 </div> 34 </div>
31 <br> 35 <br>
32 <button class="btn waves-effect waves-light" type="submit" name="entry[save]"> 36
33 {% trans %}Save{% endtrans %} 37 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
34 <i class="mdi-content-send right"></i>
35 </button>
36 </div> 38 </div>
37 <div class="hidden">{{ form_rest(form) }}</div> 39 {{ form_rest(form) }}
38 </form> 40 </form>
39 41
40 </div> 42 </div>
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 371992df..433b1cae 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
@@ -4,13 +4,13 @@
4 {% set currentRoute = app.request.attributes.get('_route') %} 4 {% set currentRoute = app.request.attributes.get('_route') %}
5 5
6 {% if currentRoute == 'starred' %} 6 {% if currentRoute == 'starred' %}
7 {% trans %}starred{% endtrans %} 7 {{ 'entry.page_titles.starred'|trans }}
8 {% elseif currentRoute == 'archive' %} 8 {% elseif currentRoute == 'archive' %}
9 {% trans %}archive{% endtrans %} 9 {{ 'entry.page_titles.archived'|trans }}
10 {% elseif currentRoute == 'all' %} 10 {% elseif currentRoute == 'all' %}
11 {% trans %}Filtered{% endtrans %} 11 {{ 'entry.page_titles.filtered'|trans }}
12 {% else %} 12 {% else %}
13 {% trans %}unread{% endtrans %} 13 {{ 'entry.page_titles.unread'|trans }}
14 {% endif %} 14 {% endif %}
15 15
16{% endblock %} 16{% endblock %}
@@ -18,7 +18,9 @@
18{% block content %} 18{% block content %}
19 {% block pager %} 19 {% block pager %}
20 <div class="results clearfix"> 20 <div class="results clearfix">
21 <div class="nb-results left">{% transchoice entries.count %}{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.{% endtranschoice %}</div> 21 <div class="nb-results left">
22 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
23 </div>
22 <ul class="pagination right"> 24 <ul class="pagination right">
23 {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} 25 {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
24 <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> 26 <li class="{{ currentPage == p ? 'active':'waves-effect'}}">
@@ -52,9 +54,9 @@
52 <span class="tool reading-time"> 54 <span class="tool reading-time">
53 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} 55 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
54 {% if readingTime > 0 %} 56 {% if readingTime > 0 %}
55 {% trans with {'%readingTime%': readingTime } %}estimated reading time: %readingTime% min{% endtrans %} 57 {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime}) }}
56 {% else %} 58 {% else %}
57 {% trans with {'%inferior%': '<small class="inferieur">&lt;</small>'} %}estimated reading time: %inferior% 1 min{% endtrans %} 59 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
58 {% endif %} 60 {% endif %}
59 </span> 61 </span>
60 </div> 62 </div>
@@ -72,7 +74,7 @@
72 74
73 <div class="estimatedTime grey-text"> 75 <div class="estimatedTime grey-text">
74 <span class="tool reading-time"> 76 <span class="tool reading-time">
75 {% trans %}estimated reading time{% endtrans %}: 77 {{ 'entry.list.reading_time'|trans }}
76 {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min 78 {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min
77 </span> 79 </span>
78 </div> 80 </div>
@@ -82,13 +84,15 @@
82 {% endif %} 84 {% endif %}
83 85
84 <div class="card-action"> 86 <div class="card-action">
85 <span class="bold"><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a></bold> 87 <span class="bold">
88 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a>
89 </bold>
86 90
87 <ul class="tools links right"> 91 <ul class="tools links right">
88 <li> 92 <li>
89 <a title="{% trans %}Toggle mark as read{% endtrans %}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a> 93 <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a>
90 <a title="{% trans %}Toggle favorite{% endtrans %}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a> 94 <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a>
91 <a title="{% trans %}Delete{% endtrans %}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a> 95 <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a>
92 </li> 96 </li>
93 </ul> 97 </ul>
94 </div> 98 </div>
@@ -103,7 +107,7 @@
103 {% if currentRoute == 'homepage' %} 107 {% if currentRoute == 'homepage' %}
104 {% set currentRoute = 'unread' %} 108 {% set currentRoute = 'unread' %}
105 {% endif %} 109 {% endif %}
106 <h4 class="center">{% trans %}Export{% endtrans %}</h4> 110 <h4 class="center">{{ 'entry.list.export_title'|trans }}</h4>
107 <ul> 111 <ul>
108 {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %} 112 {% if craue_setting('export_epub') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'epub' }) }}">EPUB</a></li>{% endif %}
109 {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %} 113 {% if craue_setting('export_mobi') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'mobi' }) }}">MOBI</a></li>{% endif %}
@@ -119,34 +123,34 @@
119 <div id="filters" class="side-nav fixed right-aligned"> 123 <div id="filters" class="side-nav fixed right-aligned">
120 <form action="{{ path('all') }}"> 124 <form action="{{ path('all') }}">
121 125
122 <h4 class="center">{% trans %}Filters{% endtrans %}</h4> 126 <h4 class="center">{{ 'entry.filters.title'|trans }}</h4>
123 127
124 <div class="row"> 128 <div class="row">
125 <div class="col s12"> 129 <div class="col s12">
126 <label>{% trans %}Status{% endtrans %}</label> 130 <label>{{ 'entry.filters.status_label'|trans }}</label>
127 </div> 131 </div>
128 132
129 <div class="input-field col s6 with-checkbox"> 133 <div class="input-field col s6 with-checkbox">
130 {{ form_widget(form.isArchived) }} 134 {{ form_widget(form.isArchived) }}
131 <label for="entry_filter_isArchived">{% trans %}Archived{% endtrans %}</label> 135 {{ form_label(form.isArchived) }}
132 </div> 136 </div>
133 137
134 <div class="input-field col s6 with-checkbox"> 138 <div class="input-field col s6 with-checkbox">
135 {{ form_widget(form.isStarred) }} 139 {{ form_widget(form.isStarred) }}
136 <label for="entry_filter_isStarred">{% trans %}Starred{% endtrans %}</label> 140 {{ form_label(form.isStarred) }}
137 </div> 141 </div>
138 142
139 <div class="col s12"> 143 <div class="col s12">
140 <label>{% trans %}Preview picture{% endtrans %}</label> 144 <label>{{ 'entry.filters.preview_picture_help'|trans }}</label>
141 </div> 145 </div>
142 146
143 <div class="input-field col s12 with-checkbox"> 147 <div class="input-field col s12 with-checkbox">
144 {{ form_widget(form.previewPicture) }} 148 {{ form_widget(form.previewPicture) }}
145 <label for="entry_filter_previewPicture">{% trans %}Has a preview picture{% endtrans %}</label> 149 {{ form_label(form.previewPicture) }}
146 </div> 150 </div>
147 151
148 <div class="col s12"> 152 <div class="col s12">
149 <label>{% trans %}Language{% endtrans %}</label> 153 {{ form_label(form.language) }}
150 </div> 154 </div>
151 155
152 <div class="input-field col s12"> 156 <div class="input-field col s12">
@@ -154,43 +158,42 @@
154 </div> 158 </div>
155 159
156 <div class="col s12"> 160 <div class="col s12">
157 <label>{% trans %}Reading time in minutes{% endtrans %}</label> 161 {{ form_label(form.readingTime) }}
158 </div> 162 </div>
159 <div class="input-field col s6"> 163 <div class="input-field col s6">
160 {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} 164 {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
161 <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label> 165 <label for="entry_filter_readingTime_left_number">{{ 'entry.filters.reading_time.from'|trans }}</label>
162 </div> 166 </div>
163 <div class="input-field col s6"> 167 <div class="input-field col s6">
164 {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }} 168 {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
165 <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label> 169 <label for="entry_filter_readingTime_right_number">{{ 'entry.filters.reading_time.to'|trans }}</label>
166 </div> 170 </div>
167 171
168 <div class="input-field col s12"> 172 <div class="input-field col s12">
169 {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com' | trans} }) }} 173 {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }}
170 <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label> 174 {{ form_label(form.domainName) }}
171 </div> 175 </div>
172 176
173 <div class="col s12"> 177 <div class="col s12">
174 <label>{% trans %}Creation date{% endtrans %}</label> 178 {{ form_label(form.createdAt) }}
175 </div> 179 </div>
176 180
177 <div class="input-field col s6"> 181 <div class="input-field col s6">
178 {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }} 182 {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
179 <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label> 183 <label for="entry_filter_createdAt_left_date" class="active">{{ 'entry.filters.created_at.from'|trans }}</label>
180 </div> 184 </div>
181 <div class="input-field col s6"> 185 <div class="input-field col s6">
182 {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }} 186 {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }}
183 <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label> 187 <label for="entry_filter_createdAt_right_date" class="active">{{ 'entry.filters.created_at.to'|trans }}</label>
184 </div> 188 </div>
185 189
186 <div class="col s6"> 190 <div class="col s6">
187 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a> 191 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{{ 'entry.filters.action.clear'|trans }}</a>
188 </div> 192 </div>
189 193
190 <div class="col s6"> 194 <div class="col s6">
191 <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filter{% endtrans %}</button> 195 <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button>
192 </div> 196 </div>
193
194 </div> 197 </div>
195 198
196 </form> 199 </form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
index a39a8dc3..98f7194c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
@@ -18,9 +18,9 @@
18 <description> 18 <description>
19 <![CDATA[ 19 <![CDATA[
20 {%- if entry.readingTime > 0 -%} 20 {%- if entry.readingTime > 0 -%}
21 {% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min 21 {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}
22 {%- else -%} 22 {%- else -%}
23 {% trans %}estimated reading time :{% endtrans %} &lt; 1 min 23 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
24 {%- endif %} 24 {%- endif %}
25 25
26 {{ entry.content|raw -}} 26 {{ entry.content|raw -}}
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 6f33da23..4eebf18f 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
@@ -2,6 +2,8 @@
2 2
3{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
4 4
5{% block body_class %}entry{% endblock %}
6
5{% block menu %} 7{% block menu %}
6 <div class="progress"> 8 <div class="progress">
7 <div class="determinate"></div> 9 <div class="determinate"></div>
@@ -17,12 +19,12 @@
17 </ul> 19 </ul>
18 <ul class="right"> 20 <ul class="right">
19 <li> 21 <li>
20 <a class="waves-effect" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> 22 <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
21 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> 23 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
22 </a> 24 </a>
23 </li> 25 </li>
24 <li> 26 <li>
25 <a class="waves-effect" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> 27 <a class="waves-effect" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
26 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> 28 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
27 </a> 29 </a>
28 </li> 30 </li>
@@ -38,7 +40,7 @@
38 <li class="bold border-bottom hide-on-med-and-down"> 40 <li class="bold border-bottom hide-on-med-and-down">
39 <a class="waves-effect collapsible-header" href="{{ path('homepage') }}"> 41 <a class="waves-effect collapsible-header" href="{{ path('homepage') }}">
40 <i class="mdi-action-exit-to-app small"></i> 42 <i class="mdi-action-exit-to-app small"></i>
41 <span>{% trans %}back{% endtrans %}</span> 43 <span>{{ 'entry.view.left_menu.back_to_homepage'|trans }}</span>
42 </a> 44 </a>
43 <div class="collapsible-body"></div> 45 <div class="collapsible-body"></div>
44 </li> 46 </li>
@@ -46,38 +48,38 @@
46 <li class="bold border-bottom hide-on-med-and-down"> 48 <li class="bold border-bottom hide-on-med-and-down">
47 <a class="waves-effect collapsible-header" href="{{ entry.url|e }}"> 49 <a class="waves-effect collapsible-header" href="{{ entry.url|e }}">
48 <i class="mdi-content-link small"></i> 50 <i class="mdi-content-link small"></i>
49 <span>{% trans %}original article{% endtrans %}</span> 51 <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span>
50 </a> 52 </a>
51 <div class="collapsible-body"></div> 53 <div class="collapsible-body"></div>
52 </li> 54 </li>
53 55
54 <li class="bold hide-on-med-and-down"> 56 <li class="bold hide-on-med-and-down">
55 <a class="waves-effect collapsible-header" title="{% trans %}Re-fetch content{% endtrans %}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload"> 57 <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload">
56 <i class="mdi-action-autorenew small"></i> 58 <i class="mdi-action-autorenew small"></i>
57 <span>{% trans %}Re-fetch content{% endtrans %}</span> 59 <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span>
58 </a> 60 </a>
59 <div class="collapsible-body"></div> 61 <div class="collapsible-body"></div>
60 </li> 62 </li>
61 63
62 <li class="bold hide-on-med-and-down"> 64 <li class="bold hide-on-med-and-down">
63 <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> 65 <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_read'|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
64 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> 66 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
65 <span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span> 67 <span>{% if entry.isArchived == 0 %}{{ 'entry.view.left_menu.set_as_read'|trans }}{% else %}{{ 'entry.view.left_menu.set_as_unread'|trans }}{% endif %}</span>
66 </a> 68 </a>
67 <div class="collapsible-body"></div> 69 <div class="collapsible-body"></div>
68 </li> 70 </li>
69 71
70 <li class="bold hide-on-med-and-down"> 72 <li class="bold hide-on-med-and-down">
71 <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> 73 <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_favorite'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
72 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> 74 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
73 <span>{% trans %}Favorite{% endtrans %}</span> 75 <span>{{ 'entry.view.left_menu.set_as_favorite'|trans }}</span>
74 </a> 76 </a>
75 <div class="collapsible-body"></div> 77 <div class="collapsible-body"></div>
76 </li> 78 </li>
77 <li class="bold border-bottom hide-on-med-and-down"> 79 <li class="bold border-bottom hide-on-med-and-down">
78 <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> 80 <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
79 <i class="mdi-action-delete small"></i> 81 <i class="mdi-action-delete small"></i>
80 <span>{% trans %}Delete{% endtrans %}</span> 82 <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
81 </a> 83 </a>
82 <div class="collapsible-body"></div> 84 <div class="collapsible-body"></div>
83 </li> 85 </li>
@@ -85,7 +87,7 @@
85 <li class="bold border-bottom hide-on-med-and-down"> 87 <li class="bold border-bottom hide-on-med-and-down">
86 <a class="waves-effect collapsible-header" id="nav-btn-add-tag"> 88 <a class="waves-effect collapsible-header" id="nav-btn-add-tag">
87 <i class="mdi-action-label-outline small"></i> 89 <i class="mdi-action-label-outline small"></i>
88 <span>{% trans %}Add a tag{% endtrans %}</span> 90 <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span>
89 </a> 91 </a>
90 <div class="collapsible-body"></div> 92 <div class="collapsible-body"></div>
91 </li> 93 </li>
@@ -93,7 +95,7 @@
93 <li class="bold"> 95 <li class="bold">
94 <a class="waves-effect collapsible-header"> 96 <a class="waves-effect collapsible-header">
95 <i class="mdi-social-share small"></i> 97 <i class="mdi-social-share small"></i>
96 <span>{% trans %}Share{% endtrans %}</span> 98 <span>{{ 'entry.view.left_menu.share_content'|trans }}</span>
97 </a> 99 </a>
98 <div class="collapsible-body"> 100 <div class="collapsible-body">
99 <ul> 101 <ul>
@@ -127,8 +129,8 @@
127 {% endif %} 129 {% endif %}
128 {% if craue_setting('share_mail') %} 130 {% if craue_setting('share_mail') %}
129 <li> 131 <li>
130 <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"> 132 <a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{{ 'entry.view.left_menu.share_email_label'|trans }}">
131 <span>{% trans %}Email{% endtrans %}</span> 133 <span>{{ 'entry.view.left_menu.share_email_label'|trans }}</span>
132 </a> 134 </a>
133 </li> 135 </li>
134 {% endif %} 136 {% endif %}
@@ -139,7 +141,7 @@
139 <li class="bold"> 141 <li class="bold">
140 <a class="waves-effect collapsible-header"> 142 <a class="waves-effect collapsible-header">
141 <i class="mdi-file-file-download small"></i> 143 <i class="mdi-file-file-download small"></i>
142 <span>{% trans %}Download{% endtrans %}</span> 144 <span>{{ 'entry.view.left_menu.download'|trans }}</span>
143 </a> 145 </a>
144 <div class="collapsible-body"> 146 <div class="collapsible-body">
145 <ul> 147 <ul>
@@ -155,40 +157,33 @@
155 </li> 157 </li>
156 158
157 <li class="bold hide-on-large-only"> 159 <li class="bold hide-on-large-only">
158 <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}"> 160 <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
159 <i class="mdi-action-delete small"></i> 161 <i class="mdi-action-delete small"></i>
160 <span>{% trans %}Delete{% endtrans %}</span> 162 <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
161 </a> 163 </a>
162 <div class="collapsible-body"></div> 164 <div class="collapsible-body"></div>
163 </li> 165 </li>
164 166
165 <li class="bold"> 167 <li class="bold">
166 <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}"> 168 <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}">
167 <i class="mdi-alert-error small"></i> 169 <i class="mdi-alert-error small"></i>
168 <span>{% trans %}Problems?{% endtrans %}</span> 170 <span>{{ 'entry.view.left_menu.problem.label'|trans }}</span>
169 </a> 171 </a>
170 <div class="collapsible-body"></div> 172 <div class="collapsible-body"></div>
171 </li> 173 </li>
172 174
173 </ul> 175 </ul>
174 176
175<style>
176main {
177 padding: 0;
178}
179</style>
180
181{% endblock %} 177{% endblock %}
182 178
183{% block content %} 179{% block content %}
184 <div id="article"> 180 <div id="article">
185 <header class="mbm"> 181 <header class="mbm">
186 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1> 182 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
187 </header> 183 </header>
188 <aside> 184 <aside>
189 <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> 185 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a>
190 {% set nbAnnotations = entry.annotations | length %} 186 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
191 <span class="tool link mdi-communication-comment"> {% transchoice nbAnnotations %}{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations{% endtranschoice %}</span>
192 <div id="list"> 187 <div id="list">
193 {% for tag in entry.tags %} 188 {% for tag in entry.tags %}
194 <div class="chip"> 189 <div class="chip">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
index 95ed0785..03768a3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} 3{% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} 6 {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index f1e56412..0cf4fb74 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -7,7 +7,7 @@
7 <span class="black-text">{{ form_errors(form.url) }}</span> 7 <span class="black-text">{{ form_errors(form.url) }}</span>
8 {% endif %} 8 {% endif %}
9 9
10 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'http://website'} }) }} 10 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }}
11 11
12 <div class="hidden">{{ form_rest(form) }}</div> 12 {{ form_rest(form) }}
13</form> 13</form>
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 1368bb09..a294b74d 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
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}About{% endtrans %}{% endblock %} 3{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 6
@@ -11,56 +11,56 @@
11 <div class="row"> 11 <div class="row">
12 <div class="div_tabs col s12"> 12 <div class="div_tabs col s12">
13 <ul class="tabs"> 13 <ul class="tabs">
14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Who is behind wallabag{% endtrans %}</a></li> 14 <li class="tab col s3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li>
15 <li class="tab col s3"><a href="#set2">{% trans %}Getting help{% endtrans %}</a></li> 15 <li class="tab col s3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li>
16 <li class="tab col s3"><a href="#set3">{% trans %}Helping wallabag{% endtrans %}</a></li> 16 <li class="tab col s3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li>
17 <li class="tab col s3"><a href="#set4">{% trans %}Contributors{% endtrans %}</a></li> 17 <li class="tab col s3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li>
18 <li class="tab col s3"><a href="#set5">{% trans %}Third-party libraries{% endtrans %}</a></li> 18 <li class="tab col s3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li>
19 </ul> 19 </ul>
20 </div> 20 </div>
21 21
22 <div id="set1" class="col s12"> 22 <div id="set1" class="col s12">
23 <dt>{% trans %}Developed by{% endtrans %}</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">{% trans %}website{% endtrans %}</a></dd> 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>
25 <dd>Thomas Citharel — <a href="https://tcit.fr">{% trans %}website{% endtrans %}</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">{% trans %}website{% endtrans %}</a></dd> 26 <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
27 <dt>{% trans %}And many others contributors ♥{% endtrans %} <a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on GitHub{% endtrans %}</a></dt> 27 <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
28 <dt>{% trans %}Project website{% endtrans %}</dt> 28 <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
29 <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd> 29 <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
30 <dt>{% trans %}License{% endtrans %}: <a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dt> 30 <dt>{{ 'about.who_behind_wallabag.license'|trans }}: <a href="https://en.wikipedia.org/wiki/MIT_License">MIT</a></dt>
31 <dt>{% trans %}Version{% endtrans %}: {{ version }}</dt> 31 <dt>{{ 'about.who_behind_wallabag.version'|trans }}: {{ version }}</dt>
32 </div> 32 </div>
33 33
34 <div id="set2" class="col s12"> 34 <div id="set2" class="col s12">
35 <dl> 35 <dl>
36 <dt>{% trans %}Documentation{% endtrans %}</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="https://doc.wallabag.org/en">english</a></dd>
38 <dd><a href="https://doc.wallabag.org/fr">français</a></dd> 38 <dd><a href="https://doc.wallabag.org/fr">français</a></dd>
39 <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd> 39 <dd><a href="https://doc.wallabag.org/de">deutsch</a></dd>
40 40
41 <dt>{% trans %}Bug reports{% endtrans %}</dt> 41 <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
42 <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on GitHub{% endtrans %}</a></dd> 42 <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
43 </dl> 43 </dl>
44 </div> 44 </div>
45 45
46 <div id="set3" class="col s12"> 46 <div id="set3" class="col s12">
47 <dl> 47 <dl>
48 <dt>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</dt> 48 <dt>{{ 'about.helping.description'|trans }}</dt>
49 <dd>{% trans %}by contributing to the project:{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues/1254">{% trans %}an issue lists all our needs{% endtrans %}</a></dd> 49 <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
50 <dd><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dd> 50 <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
51 </dl> 51 </dl>
52 </div> 52 </div>
53 53
54 <div id="set4" class="col s12"> 54 <div id="set4" class="col s12">
55 <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}Thank you to contributors on wallabag web application{% endtrans %}</a></p> 55 <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
56 </div> 56 </div>
57 57
58 <div id="set5" class="col s12"> 58 <div id="set5" class="col s12">
59 <p>{% trans %}Here are the list of third-party libraries used in wallabag (with their licenses):{% endtrans %}</p> 59 <p>{{ 'about.third_party.description'|trans }}</p>
60 <table> 60 <table class="striped">
61 <tr> 61 <tr>
62 <th>{% trans %}Package{% endtrans %}</th> 62 <th>{{ 'about.third_party.package'|trans }}</th>
63 <th>{% trans %}License{% endtrans %}</th> 63 <th>{{ 'about.third_party.license'|trans }}</th>
64 </tr> 64 </tr>
65 <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr> 65 <tr><td>behat/transliterator</td><td>Artistic 1.0</td></tr>
66 <tr><td>CraueConfigBundle</td><td>MIT</td></tr> 66 <tr><td>CraueConfigBundle</td><td>MIT</td></tr>
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 e2795409..15b548d8 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
@@ -1,44 +1,40 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}howto{% endtrans %}{% endblock %} 3{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 6
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>
10 11
11 <div class="row"> 12 <div class="row">
12 <div class="div_tabs col s12">
13 <ul class="tabs">
14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Form{% endtrans %}</a></li>
15 <li class="tab col s3"><a href="#set2">{% trans %}Browser addons{% endtrans %}</a></li>
16 <li class="tab col s3"><a href="#set3">{% trans %}Mobile apps{% endtrans %}</a></li>
17 <li class="tab col s3"><a href="#set4">{% trans %}Bookmarklet{% endtrans %}</a></li>
18 </ul>
19 </div>
20 13
21 <div id="set1" class="col s12"> 14 <div class="col s12">
22 <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a> 15 <a href="{{ path('new') }}">{{ 'howto.form.description'|trans }}</a>
23 </div> 16 </div>
24 17
25 <div id="set2" class="col s12"> 18 <div class="col s12">
19 <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
26 <ul> 20 <ul>
27 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{% trans %}Standard Firefox Add-On{% endtrans %}</a></li> 21 <li><a href="https://addons.mozilla.org/firefox/addon/wallabag/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
28 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{% trans %}Chrome Extension{% endtrans %}</a></li> 22 <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
29 </ul> 23 </ul>
30 </div> 24 </div>
31 25
32 <div id="set3" class="col s12"> 26 <div class="col s12">
27 <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5>
33 <ul> 28 <ul>
34 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">via F-Droid</a> {% trans %} or {% endtrans %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">via Google Play</a></li> 29 <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
35 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 30 <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
36 <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{% trans %}download the application{% endtrans %}</a></li> 31 <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
37 </ul> 32 </ul>
38 </div> 33 </div>
39 34
40 <div id="set4" class="col s12"> 35 <div class="col s12">
41 {% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} 36 <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
37 {{ 'howto.bookmarklet.description'|trans }}
42 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %} 38 {% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
43 </div> 39 </div>
44 40
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
index 03754d38..706c4a79 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}Quickstart{% endtrans %}{% endblock %} 3{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 6
@@ -9,56 +9,63 @@
9 <div class="card-panel settings"> 9 <div class="card-panel settings">
10 10
11 <div class="row"> 11 <div class="row">
12 <h3>{% trans %}Welcome to wallabag!{% endtrans %}</h3> 12 <h3>{{ 'quickstart.intro.title'|trans }}</h3>
13 <p>{% trans %}We'll accompany you to visit wallabag and show you some features which can interess you.{% endtrans %}</p> 13 <p>{{ 'quickstart.intro.paragraph_1'|trans }}</p>
14 <p>{% trans %}Follow us!{% endtrans %}</p> 14 <p>{{ 'quickstart.intro.paragraph_2'|trans }}</p>
15 <h4>{% trans %}Configure the application{% endtrans %}</h4> 15
16 <h4>{{ 'quickstart.configure.title'|trans }}</h4>
16 <ul> 17 <ul>
17 <li><a href="{{ path('config') }}">{% trans %}Change language and design{% endtrans %}</a></li> 18 <li><a href="{{ path('config') }}">{{ 'quickstart.configure.language'|trans }}</a></li>
18 <li><a href="{{ path('config') }}#set2">{% trans %}Enable RSS feeds{% endtrans %}</a></li> 19 <li><a href="{{ path('config') }}#set2">{{ 'quickstart.configure.rss'|trans }}</a></li>
19 <li><a href="{{ path('config') }}#set5">{% trans %}Write rules to automatically tag your articles{% endtrans %}</a></li> 20 <li><a href="{{ path('config') }}#set5">{{ 'quickstart.configure.tagging_rules'|trans }}</a></li>
20 </ul> 21 </ul>
22
21 {% if is_granted('ROLE_SUPER_ADMIN') %} 23 {% if is_granted('ROLE_SUPER_ADMIN') %}
22 <h4>{% trans %}Administration{% endtrans %}</h4> 24 <h4>{{ 'quickstart.admin.title'|trans }}</h4>
23 <p>{% trans %}As a administrator, you have privileges on wallabag. You can:{% endtrans %}</p> 25 <p>{{ 'quickstart.admin.description'|trans }}</p>
24 <ul> 26 <ul>
25 <li><a href="{{ path('config') }}#set6">{% trans %}Create a new user{% endtrans %}</a></li> 27 <li><a href="{{ path('config') }}#set6">{{ 'quickstart.admin.new_user'|trans }}</a></li>
26 <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{% trans %}Configure analytics{% endtrans %}</a></li> 28 <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{{ 'quickstart.admin.analytics'|trans }}</a></li>
27 <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{% trans %}Enable some parameters about article sharing{% endtrans %}</a></li> 29 <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{{ 'quickstart.admin.sharing'|trans }}</a></li>
28 <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{% trans %}Configure export{% endtrans %}</a></li> 30 <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{{ 'quickstart.admin.export'|trans }}</a></li>
29 <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{% trans %}Configure import{% endtrans %}</a></li> 31 <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{{ 'quickstart.admin.import'|trans }}</a></li>
30 </ul> 32 </ul>
31 {% endif %} 33 {% endif %}
32 <h4>{% trans %}First steps{% endtrans %}</h4> 34
35 <h4>{{ 'quickstart.first_steps.title'|trans }}</h4>
33 <ul> 36 <ul>
34 <li><a href="{{ path('new') }}">{% trans %}Save your first article{% endtrans %}</a></li> 37 <li><a href="{{ path('new') }}">{{ 'quickstart.first_steps.new_article'|trans }}</a></li>
35 <li><a href="{{ path('unread') }}">{% trans %}And classify it!{% endtrans %}</a></li> 38 <li><a href="{{ path('unread') }}">{{ 'quickstart.first_steps.unread_articles'|trans }}</a></li>
36 </ul> 39 </ul>
37 <h4>{% trans %}Migrate from an existing service{% endtrans %}</h4> 40
38 <p>{% trans %}You're using an other service? We'll help you to retrieve your data on wallabag.{% endtrans %}</p> 41 <h4>{{ 'quickstart.migrate.title'|trans }}</h4>
42 <p>{{ 'quickstart.migrate.description'|trans }}</p>
39 <ul> 43 <ul>
40 <li><a href="{{ path('import_pocket') }}">{% trans %}Migrate from Pocket{% endtrans %}</a></li> 44 <li><a href="{{ path('import_pocket') }}">{{ 'quickstart.migrate.pocket'|trans }}</a></li>
41 <li><a href="{{ path('import_wallabag_v1') }}">{% trans %}Migrate from wallabag v1{% endtrans %}</a></li> 45 <li><a href="{{ path('import_wallabag_v1') }}">{{ 'quickstart.migrate.wallabag_v1'|trans }}</a></li>
42 <li><a href="{{ path('import_wallabag_v2') }}">{% trans %}Migrate from wallabag v2{% endtrans %}</a></li> 46 <li><a href="{{ path('import_wallabag_v2') }}">{{ 'quickstart.migrate.wallabag_v2'|trans }}</a></li>
43 </ul> 47 </ul>
44 <h4>{% trans %}Developers{% endtrans %}</h4> 48
49 <h4>{{ 'quickstart.developer.title'|trans }}</h4>
45 <ul> 50 <ul>
46 <li><a href="{{ path('developer') }}">{% trans %}Create your third application{% endtrans %}</a></li> 51 <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
47 </ul> 52 </ul>
48 <h4>{% trans %}Full documentation{% endtrans %}</h4> 53
54 <h4>{{ 'quickstart.docs.title'|trans }}</h4>
49 <ul> 55 <ul>
50 <li><a href="http://doc.wallabag.org/en/v2/user/annotations.html">{% trans %}Annotate your article{% endtrans %}</a></li> 56 <li><a href="http://doc.wallabag.org/en/v2/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
51 <li><a href="http://doc.wallabag.org/en/v2/user/download_articles.html">{% trans %}Convert your articles into ePUB or PDF{% endtrans %}</a></li> 57 <li><a href="http://doc.wallabag.org/en/v2/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
52 <li><a href="http://doc.wallabag.org/en/v2/user/filters.html">{% trans %}See how you can look for an article by using search engine and filters{% endtrans %}</a></li> 58 <li><a href="http://doc.wallabag.org/en/v2/user/filters.html">{{ 'quickstart.docs.search_filters'|trans }}</a></li>
53 <li><a href="http://doc.wallabag.org/en/v2/user/errors_during_fetching.html">{% trans %}What can I do if an article encounters errors during fetching?{% endtrans %}</a></li> 59 <li><a href="http://doc.wallabag.org/en/v2/user/errors_during_fetching.html">{{ 'quickstart.docs.fetching_errors'|trans }}</a></li>
54 <li><a href="http://doc.wallabag.org/">{% trans %}And so many other articles!{% endtrans %}</a></li> 60 <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
55 </ul> 61 </ul>
56 <h4>{% trans %}Support{% endtrans %}</h4> 62
57 <p>{% trans %}If you need some help, we are here for you.{% endtrans %}</p> 63 <h4>{{ 'quickstart.support.title'|trans }}</h4>
64 <p>{{ 'quickstart.support.description'|trans }}</p>
58 <ul> 65 <ul>
59 <li><a href="https://github.com/wallabag/wallabag/issues/">{% trans %}On GitHub{% endtrans %}</a></li> 66 <li><a href="https://github.com/wallabag/wallabag/issues/">{{ 'quickstart.support.github'|trans }}</a></li>
60 <li><a href="mailto:hello@wallabag.org">{% trans %}By email{% endtrans %}</a></li> 67 <li><a href="mailto:hello@wallabag.org">{{ 'quickstart.support.email'|trans }}</a></li>
61 <li><a href="https://gitter.im/wallabag/wallabag">{% trans %}On Gitter{% endtrans %}</a></li> 68 <li><a href="https://gitter.im/wallabag/wallabag">{{ 'quickstart.support.gitter'|trans }}</a></li>
62 </ul> 69 </ul>
63 </div> 70 </div>
64 71
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
index 79310307..6e552560 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig
@@ -9,5 +9,5 @@
9 9
10 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} 10 {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }}
11 11
12 <div class="hidden">{{ form_rest(form) }}</div> 12 {{ form_rest(form) }}
13</form> 13</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 19754d41..6b583689 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -1,10 +1,10 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title "Tags" %} 3{% block title %}{{ 'tag.page_title'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 <div class="results clearfix"> 6 <div class="results clearfix">
7 <div class="nb-results left">{% transchoice tags.count %}{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.{% endtranschoice %}</div> 7 <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags.count) }}</div>
8 </div> 8 </div>
9 <br /> 9 <br />
10 <ul class="row data"> 10 <ul class="row data">
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 f5d03084..48eaca81 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -31,7 +31,7 @@
31 <ul id="slide-out" class="side-nav fixed"> 31 <ul id="slide-out" class="side-nav fixed">
32 {% block logo %} 32 {% block logo %}
33 <li class="logo border-bottom"> 33 <li class="logo border-bottom">
34 <a title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}"> 34 <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
35 <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" /> 35 <img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-square.png') }}" alt="wallabag logo" />
36 </a> 36 </a>
37 </li> 37 </li>
@@ -39,19 +39,41 @@
39 39
40 {% set currentRoute = app.request.attributes.get('_route') %} 40 {% set currentRoute = app.request.attributes.get('_route') %}
41 41
42 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> 42 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}">
43 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li> 43 <a class="waves-effect" href="{{ path('unread') }}">{{ 'menu.left.unread'|trans }}</a>
44 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> 44 </li>
45 <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li> 45 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}">
46 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> 46 <a class="waves-effect" href="{{ path('starred') }}">{{ 'menu.left.starred'|trans }}</a>
47 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> 47 </li>
48 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}">
49 <a class="waves-effect" href="{{ path('archive') }}">{{ 'menu.left.archive'|trans }}</a>
50 </li>
51 <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}">
52 <a class="waves-effect" href="{{ path('all') }}">{{ 'menu.left.all_articles'|trans }}</a>
53 </li>
54 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}">
55 <a class="waves-effect" href="{{ path('tag') }}">{{ 'menu.left.tags'|trans }}</a>
56 </li>
57 <li class="bold {% if currentRoute == 'config' %}active{% endif %}">
58 <a class="waves-effect" href="{{ path('config') }}">{{ 'menu.left.config'|trans }}</a>
59 </li>
48 {% if is_granted('ROLE_SUPER_ADMIN') %} 60 {% if is_granted('ROLE_SUPER_ADMIN') %}
49 <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"><a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{% trans %}internal settings{% endtrans %}</a></li> 61 <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}">
62 <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a>
63 </li>
50 {% endif %} 64 {% endif %}
51 <li class="bold {% if currentRoute == 'import' %}active{% endif %}"><a class="waves-effect" href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li> 65 <li class="bold {% if currentRoute == 'import' %}active{% endif %}">
52 <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> 66 <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a>
53 <li class="bold {% if currentRoute == 'developer' %}active{% endif %}"><a class="waves-effect" href="{{ path('developer') }}">{% trans %}Developer{% endtrans %}</a></li> 67 </li>
54 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> 68 <li class="bold {% if currentRoute == 'developer' %}active{% endif %}">
69 <a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a>
70 </li>
71 <li class="bold {% if currentRoute == 'howto' %}active{% endif %}">
72 <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a>
73 </li>
74 <li class="bold">
75 <a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}">{{ 'menu.left.logout'|trans }}</a>
76 </li>
55 </ul> 77 </ul>
56 <div class="nav-wrapper nav-panels"> 78 <div class="nav-wrapper nav-panels">
57 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a> 79 <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
@@ -61,21 +83,37 @@
61 </div> 83 </div>
62 <div class="input-field nav-panel-buttom"> 84 <div class="input-field nav-panel-buttom">
63 <ul> 85 <ul>
64 <li class="bold"><a title="{% trans %}Add a new entry{% endtrans %}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li> 86 <li class="bold">
65 <li><a title="{% trans %}Search{% endtrans %}" class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a> 87 <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add">
66 <li id="button_filters"><a title="{% trans %}Filter entries{% endtrans %}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"><i class="mdi-content-filter-list"></i></a></li> 88 <i class="mdi-content-add"></i>
67 <li id="button_export"><a title="{% trans %}Export{% endtrans %}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right"><i class="mdi-file-file-download"></i></a></li> 89 </a>
90 </li>
91 <li>
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>
94 </a>
95 </li>
96 <li id="button_filters">
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>
99 </a>
100 </li>
101 <li id="button_export">
102 <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export" class="nav-panel-menu button-collapse-right">
103 <i class="mdi-file-file-download"></i>
104 </a>
105 </li>
68 </ul> 106 </ul>
69 </div> 107 </div>
70 <form method="get" action="index.php"> 108 <form method="get" action="index.php">
71 <div class="input-field nav-panel-search" style="display: none"> 109 <div class="input-field nav-panel-search" style="display: none">
72 <input name="search" id="searchfield" type="search" required placeholder="{% trans %}Enter your search here{% endtrans %}"> 110 <input name="search" id="searchfield" type="search" required placeholder="{{ 'menu.search_form.input_label'|trans }}">
73 <label for="search"><i class="mdi-action-search"></i></label> 111 <label for="search"><i class="mdi-action-search"></i></label>
74 <i class="mdi-navigation-close"></i> 112 <i class="mdi-navigation-close"></i>
75 </div> 113 </div>
76 </form> 114 </form>
77 <div class="input-field nav-panel-add" style="display: none"> 115 <div class="input-field nav-panel-add" style="display: none">
78 {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} 116 {{ render(controller("WallabagCoreBundle:Entry:addEntryForm")) }}
79 <label for="add" class="active"><i class="mdi-content-add"></i></label> 117 <label for="add" class="active"><i class="mdi-content-add"></i></label>
80 <i class="mdi-navigation-close"></i> 118 <i class="mdi-navigation-close"></i>
81 </div> 119 </div>
@@ -88,35 +126,40 @@
88 <div class="container"> 126 <div class="container">
89 <div class="row"> 127 <div class="row">
90 <div class="col l6 s12"> 128 <div class="col l6 s12">
91 <h5 class="white-text">{% trans %}Take wallabag with you{% endtrans %}</h5> 129 <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5>
92 <p class="grey-text text-lighten-4"> 130 <p class="grey-text text-lighten-4">
93 131 <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="Android">
94 <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="android"><span class="icon-android"></span></a> 132 <span class="icon-android"></span>
95 133 </a>
96 <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"><span class="icon-apple"></a> 134 <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS">
97 135 <span class="icon-apple"></span>
98 <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/" title="Firefox"><span class="icon-firefox"></span></a> 136 </a>
99 137 <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/" title="Firefox">
100 <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome"><span class="icon-chrome"></a> 138 <span class="icon-firefox"></span>
101 139 </a>
140 <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome">
141 <span class="icon-chrome"></span>
142 </a>
102 </p> 143 </p>
103 </div> 144 </div>
104 <div class="col l4 offset-l2 s12"> 145 <div class="col l4 offset-l2 s12">
105 <h5 class="white-text">{% trans %}Social{% endtrans %}</h5> 146 <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5>
106 147 <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter">
107 <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter"><span class="icon-twitter"></span></a> 148 <span class="icon-twitter"></span>
108 149 </a>
109 <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+"><span class="icon-google-plus2"></span></a> 150 <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+">
110 151 <span class="icon-google-plus2"></span>
111 <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook"><span class="icon-facebook2"></span></a> 152 </a>
112 153 <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook">
154 <span class="icon-facebook2"></span>
155 </a>
113 </div> 156 </div>
114 </div> 157 </div>
115 </div> 158 </div>
116 <div class="footer-copyright"> 159 <div class="footer-copyright">
117 <div class="container"> 160 <div class="container">
118 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p> 161 <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
119 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a> 162 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
120 </div> 163 </div>
121 </div> 164 </div>
122 </footer> 165 </footer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 05:59:51 +0000