diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
8 files changed, 21 insertions, 14 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 0a65ce9f..bd81c72f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -116,7 +116,7 @@ config: | |||
116 | archived: Remove ALL archived entries | 116 | archived: Remove ALL archived entries |
117 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) | 117 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) |
118 | form_password: | 118 | form_password: |
119 | description: "You can change your password here. Your new password should by at least 8 characters long." | 119 | description: "You can change your password here. Your new password should be at least 8 characters long." |
120 | old_password_label: 'Current password' | 120 | old_password_label: 'Current password' |
121 | new_password_label: 'New password' | 121 | new_password_label: 'New password' |
122 | repeat_new_password_label: 'Repeat new password' | 122 | repeat_new_password_label: 'Repeat new password' |
@@ -265,7 +265,7 @@ about: | |||
265 | who_behind_wallabag: | 265 | who_behind_wallabag: |
266 | developped_by: 'Developed by' | 266 | developped_by: 'Developed by' |
267 | website: 'website' | 267 | website: 'website' |
268 | many_contributors: 'And many others contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">on Github</a>' | 268 | many_contributors: 'And many others contributors ♥ <a href="https://github.com/wallabag/wallabag/graphs/contributors">on GitHub</a>' |
269 | project_website: 'Project website' | 269 | project_website: 'Project website' |
270 | license: 'License' | 270 | license: 'License' |
271 | version: 'Version' | 271 | version: 'Version' |
@@ -323,7 +323,7 @@ howto: | |||
323 | go_import: Go to import | 323 | go_import: Go to import |
324 | go_developers: Go to developers | 324 | go_developers: Go to developers |
325 | go_howto: Go to howto (this page!) | 325 | go_howto: Go to howto (this page!) |
326 | go_logout: Logout | 326 | go_logout: Log out |
327 | list_title: Shortcuts available in listing pages | 327 | list_title: Shortcuts available in listing pages |
328 | search: Display the search form | 328 | search: Display the search form |
329 | article_title: Shortcuts available in entry view | 329 | article_title: Shortcuts available in entry view |
@@ -373,7 +373,7 @@ quickstart: | |||
373 | instapaper: 'Migrate from Instapaper' | 373 | instapaper: 'Migrate from Instapaper' |
374 | developer: | 374 | developer: |
375 | title: 'Developers' | 375 | title: 'Developers' |
376 | description: 'We also thought to the developers: Docker, API, translations, etc.' | 376 | description: 'We also thought of the developers: Docker, API, translations, etc.' |
377 | create_application: 'Create your third-party application' | 377 | create_application: 'Create your third-party application' |
378 | use_docker: 'Use Docker to install wallabag' | 378 | use_docker: 'Use Docker to install wallabag' |
379 | docs: | 379 | docs: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 6130eee2..95bc9560 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -234,7 +234,7 @@ entry: | |||
234 | created_at: 'Data de creacion' | 234 | created_at: 'Data de creacion' |
235 | published_at: 'Data de publicacion' | 235 | published_at: 'Data de publicacion' |
236 | published_by: 'Publicat per' | 236 | published_by: 'Publicat per' |
237 | # provided_by: 'Provided by' | 237 | provided_by: 'Provesit per' |
238 | new: | 238 | new: |
239 | page_title: 'Enregistrar un novèl article' | 239 | page_title: 'Enregistrar un novèl article' |
240 | placeholder: 'http://website.com' | 240 | placeholder: 'http://website.com' |
@@ -246,7 +246,7 @@ entry: | |||
246 | page_title: 'Modificar un article' | 246 | page_title: 'Modificar un article' |
247 | title_label: 'Títol' | 247 | title_label: 'Títol' |
248 | url_label: 'Url' | 248 | url_label: 'Url' |
249 | # origin_url_label: 'Origin url (from where you found that entry)' | 249 | origin_url_label: 'Url d’origina (ont avètz trobat aqueste article)' |
250 | save_label: 'Enregistrar' | 250 | save_label: 'Enregistrar' |
251 | public: | 251 | public: |
252 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" | 252 | shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" |
@@ -400,8 +400,8 @@ tag: | |||
400 | add: 'Ajustar' | 400 | add: 'Ajustar' |
401 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." | 401 | placeholder: "Podètz ajustar mai qu'una etiqueta, separadas per de virgula." |
402 | 402 | ||
403 | # export: | 403 | export: |
404 | # footer_template: '<div style="text-align:center;"><p>Produced by wallabag with %method%</p><p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p></div>' | 404 | footer_template: '<div style="text-align:center;"><p>Produch per wallabag amb %method%</p><p>Mercés de dobrir <a href="https://github.com/wallabag/wallabag/issues">una sollicitacion</a> s’avètz de problèmas amb l’afichatge d’aqueste E-Book sus vòstre periferic.</p></div>' |
405 | 405 | ||
406 | import: | 406 | import: |
407 | page_title: 'Importar' | 407 | page_title: 'Importar' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig index 9b0503d6..b9fcc005 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig | |||
@@ -7,7 +7,7 @@ | |||
7 | <meta property="og:title" content="{{ entry.title|e|raw }}" /> | 7 | <meta property="og:title" content="{{ entry.title|e|raw }}" /> |
8 | <meta property="og:type" content="article" /> | 8 | <meta property="og:type" content="article" /> |
9 | <meta property="og:url" content="{{ app.request.uri }}" /> | 9 | <meta property="og:url" content="{{ app.request.uri }}" /> |
10 | {% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-other_themes.png') %} | 10 | {% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-wallabag.svg') %} |
11 | {% if entry.previewPicture is not null %} | 11 | {% if entry.previewPicture is not null %} |
12 | {% set picturePath = entry.previewPicture %} | 12 | {% set picturePath = entry.previewPicture %} |
13 | {% endif %} | 13 | {% endif %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig index 3385cd53..9ebf1bed 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig | |||
@@ -1 +1 @@ | |||
<a id="bookmarklet" ondragend="this.click();" href="javascript:(function(){var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');})();">bag it!</a> | <a id="bookmarklet" ondragend="this.click();" href="javascript:(function(){var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURIComponent(url),'_blank');})();">bag it!</a> | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig index 8e6bbae0..4fd4debd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig | |||
@@ -1,5 +1,12 @@ | |||
1 | <div class="card"> | 1 | <div class="card"> |
2 | <div class="card-body"> | 2 | <div class="card-body"> |
3 | <div class="card-image waves-effect waves-block waves-light"> | ||
4 | <ul class="card-entry-labels"> | ||
5 | {% for tag in entry.tags | slice(0, 3) %} | ||
6 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | ||
7 | {% endfor %} | ||
8 | </ul> | ||
9 | </div> | ||
3 | {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry} only %} | 10 | {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry} only %} |
4 | </div> | 11 | </div> |
5 | 12 | ||
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 0d05f4d5..7484d53b 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 | |||
@@ -245,7 +245,7 @@ | |||
245 | <li> | 245 | <li> |
246 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> | 246 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> |
247 | {% for author in entry.publishedBy %} | 247 | {% for author in entry.publishedBy %} |
248 | {{ author }}{% if not loop.last %}, {% endif %} | 248 | {{ author|raw }}{% if not loop.last %}, {% endif %} |
249 | {% endfor %} | 249 | {% endfor %} |
250 | </li> | 250 | </li> |
251 | {% endif %} | 251 | {% endif %} |
@@ -276,7 +276,7 @@ | |||
276 | </div> | 276 | </div> |
277 | 277 | ||
278 | {% if entry.previewPicture is not null %} | 278 | {% if entry.previewPicture is not null %} |
279 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div> | 279 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}" /></div> |
280 | {% endif %} | 280 | {% endif %} |
281 | 281 | ||
282 | </aside> | 282 | </aside> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig index b5db40f5..741795aa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig | |||
@@ -11,7 +11,7 @@ | |||
11 | <main class="valign-wrapper"> | 11 | <main class="valign-wrapper"> |
12 | <div class="valign row"> | 12 | <div class="valign row"> |
13 | <div class="card sw"> | 13 | <div class="card sw"> |
14 | <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div> | 14 | <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" alt="wallabag logo" class="typo-logo" /></div> |
15 | <div class="card-content"> | 15 | <div class="card-content"> |
16 | <div class="row"> | 16 | <div class="row"> |
17 | <h5>{{ status_code }}: {{ status_text }}</h5> | 17 | <h5>{{ status_code }}: {{ status_text }}</h5> |
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 6472d182..f0012ad9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -29,7 +29,7 @@ | |||
29 | {% block logo %} | 29 | {% block logo %} |
30 | <li class="logo border-bottom"> | 30 | <li class="logo border-bottom"> |
31 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> | 31 | <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> |
32 | <img src="{{ asset('wallassets/themes/_global/img/logo-square.png') }}" alt="wallabag logo" /> | 32 | <img src="{{ asset('wallassets/themes/_global/img/logo-square.svg') }}" alt="wallabag logo" /> |
33 | </a> | 33 | </a> |
34 | </li> | 34 | </li> |
35 | {% endblock %} | 35 | {% endblock %} |