Merge pull request #3404 from wallabag/issue-2424

material: replace card activator with article link on card preview

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 @@
                 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
             {% endfor %}
             </ul>
-            <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
+            <a href="{{ path('view', { 'id': entry.id }) }}">
+                <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span>
+            </a>
         </div>
 
         <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 @@
 <div class="card-stacked">
-    <div class="preview">{% if entry.previewPicture is not null %}<img src="{{ entry.previewPicture }}" />{% endif %}</div>
+    <div class="preview">
+        {% if entry.previewPicture is not null %}
+            <a href="{{ path('view', { 'id': entry.id }) }}">
+                <img src="{{ entry.previewPicture }}" />
+            </a>
+        {% endif %}
+    </div>
     <div class="card-content">
         <span class="card-title dot-ellipsis dot-resize-update">
             <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 @@
                 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
             {% endfor %}
             </ul>
-            <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
+            <a href="{{ path('view', { 'id': entry.id }) }}">
+                <span class="preview" style="background-image: url({{ entry.previewPicture }})"></span>
+            </a>
         </div>
 
         <div class="card-content">