From 3c9548257ccb92a13c658372fc09dccff117bb36 Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Wed, 20 Dec 2017 21:02:37 +0100
Subject: Content card template shared

---
 .../themes/material/Entry/Card/_content.html.twig   | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
new file mode 100644
index 00000000..4836a4ea
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@@ -0,0 +1,21 @@
+<div class="card-content">
+    {% if withPreview is defined %}
+        <i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
+    {% endif %}
+    <span class="card-title dot-ellipsis dot-resize-update">
+        <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}">
+            {{ entry.title | striptags | truncate(80, true, '…') | raw }}
+        </a>
+    </span>
+
+    <div class="{{ subClass|default('original grey-text') }}">
+        <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
+        {% if withTags  %}
+            {% for tag in entry.tags | slice(0, 3) %}
+                <span class="chip hide-on-med-and-down">
+                    <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
+                </span>
+            {% endfor %}
+        {% endif %}
+    </div>
+</div>
-- 
cgit v1.2.3


From ac8489f5f7fc44104c501e917d6f9889c50092a4 Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Wed, 20 Dec 2017 21:02:56 +0100
Subject: Default card title

---
 .../Resources/views/themes/material/Entry/Card/_content.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
index 4836a4ea..f02dfba4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@@ -4,7 +4,7 @@
     {% endif %}
     <span class="card-title dot-ellipsis dot-resize-update">
         <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}">
-            {{ entry.title | striptags | truncate(80, true, '…') | raw }}
+            {{ entry.title | striptags | truncate(80, true, '…') | raw | default('config.form_rules.faq.variable_description.title'|trans) }}
         </a>
     </span>
 
-- 
cgit v1.2.3


From a8541089be426b78c4bf48743e53e17af3ef432a Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Wed, 20 Dec 2017 21:04:28 +0100
Subject: Useless span removed from the card's title

---
 .../Resources/views/themes/material/Entry/Card/_content.html.twig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
index f02dfba4..06dc0b6d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@@ -2,11 +2,9 @@
     {% if withPreview is defined %}
         <i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
     {% endif %}
-    <span class="card-title dot-ellipsis dot-resize-update">
-        <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}">
-            {{ entry.title | striptags | truncate(80, true, '…') | raw | default('config.form_rules.faq.variable_description.title'|trans) }}
-        </a>
-    </span>
+    <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}" class="card-title dot-ellipsis dot-resize-update">
+        {{ entry.title | striptags | truncate(80, true, '…') | raw | default('config.form_rules.faq.variable_description.title'|trans) }}
+    </a>
 
     <div class="{{ subClass|default('original grey-text') }}">
         <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
-- 
cgit v1.2.3


From 49fb9e7cabef39c30579eee0301f1019a3251dcd Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Thu, 21 Dec 2017 17:10:46 +0100
Subject: Card tags template shared

---
 .../Resources/views/themes/material/Entry/Card/_content.html.twig | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
index 06dc0b6d..fc5bfc48 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@@ -8,12 +8,8 @@
 
     <div class="{{ subClass|default('original grey-text') }}">
         <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
-        {% if withTags  %}
-            {% for tag in entry.tags | slice(0, 3) %}
-                <span class="chip hide-on-med-and-down">
-                    <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a>
-                </span>
-            {% endfor %}
+        {% if withTags is defined %}
+            {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags | slice(0, 3), 'listClass': ' hide-on-med-and-down'} only %}
         {% endif %}
     </div>
 </div>
-- 
cgit v1.2.3


From 5e0c44a2ac2306eaca7dfb3c708fccdd9e773761 Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Fri, 22 Dec 2017 16:18:14 +0100
Subject: Using new 'entry.default_title' as translation key

---
 .../Resources/views/themes/material/Entry/Card/_content.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
index fc5bfc48..ab7295d5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@@ -3,7 +3,7 @@
         <i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
     {% endif %}
     <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| striptags | e('html_attr') }}" class="card-title dot-ellipsis dot-resize-update">
-        {{ entry.title | striptags | truncate(80, true, '…') | raw | default('config.form_rules.faq.variable_description.title'|trans) }}
+        {{ entry.title | striptags | truncate(80, true, '…') | raw | default('entry.default_title'|trans) }}
     </a>
 
     <div class="{{ subClass|default('original grey-text') }}">
-- 
cgit v1.2.3