diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes')
6 files changed, 13 insertions, 6 deletions
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 %} |