aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2017-11-07 13:59:47 +0100
committerGitHub <noreply@github.com>2017-11-07 13:59:47 +0100
commitf39cfa469094fb9efd5e8007b44c2d62b617f358 (patch)
tree66d0add0ebd3111bc51f5348adc54c46e164aebd /src
parent8abb6c13219c7125f57667c9272db0a5c5d2bcb7 (diff)
parent2f510787e7a37be1068390b0956257843a2a9ab6 (diff)
downloadwallabag-f39cfa469094fb9efd5e8007b44c2d62b617f358.tar.gz
wallabag-f39cfa469094fb9efd5e8007b44c2d62b617f358.tar.zst
wallabag-f39cfa469094fb9efd5e8007b44c2d62b617f358.zip
Merge pull request #3404 from wallabag/issue-2424
material: replace card activator with article link on card preview
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig8
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig4
3 files changed, 13 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
index 58757158..a4958b58 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
@@ -6,7 +6,9 @@
6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> 6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
7 {% endfor %} 7 {% endfor %}
8 </ul> 8 </ul>
9 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> 9 <a href="{{ path('view', { 'id': entry.id }) }}">
10 <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span>
11 </a>
10 </div> 12 </div>
11 13
12 <div class="card-content"> 14 <div class="card-content">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
index b64e1436..5f412967 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@@ -1,5 +1,11 @@
1<div class="card-stacked"> 1<div class="card-stacked">
2 <div class="preview">{% if entry.previewPicture is not null %}<img src="{{ entry.previewPicture }}" />{% endif %}</div> 2 <div class="preview">
3 {% if entry.previewPicture is not null %}
4 <a href="{{ path('view', { 'id': entry.id }) }}">
5 <img src="{{ entry.previewPicture }}" />
6 </a>
7 {% endif %}
8 </div>
3 <div class="card-content"> 9 <div class="card-content">
4 <span class="card-title dot-ellipsis dot-resize-update"> 10 <span class="card-title dot-ellipsis dot-resize-update">
5 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | striptags | e('html_attr') }}"> 11 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | striptags | e('html_attr') }}">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
index fb5301c8..c77e716b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
@@ -6,7 +6,9 @@
6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> 6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
7 {% endfor %} 7 {% endfor %}
8 </ul> 8 </ul>
9 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div> 9 <a href="{{ path('view', { 'id': entry.id }) }}">
10 <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span>
11 </a>
10 </div> 12 </div>
11 13
12 <div class="card-content"> 14 <div class="card-content">