X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FEntry%2Fentries.html.twig;h=d0786936e16ec21a74b9564fad053f81c03258b1;hb=34aa06a9b9c9bc6cdfb61607b2def8e1fc861b76;hp=a061bdc3d4ff6474624f6961c5abcff4f0b48cbe;hpb=74d68fbf25e313ef5cc8af17812387a8ae813df2;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index a061bdc3..d0786936 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -1,7 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-  {% include "@WallabagCore/themes/_title.html.twig" %}
+  {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
@@ -9,7 +9,7 @@
     <br />
     <ul class="row data">
         {% for entry in entries %}
-            <li id="entry-{{ entry.id|e }}" class="col l4 m6 s12">
+            <li id="entry-{{ entry.id|e }}" class="col l3 m6 s12">
                 <div class="card">
 
                     <div class="card-body">
@@ -17,7 +17,7 @@
                             <div class="card-image waves-effect waves-block waves-light">
                                 <ul class="card-entry-labels">
                                 {% for tag in entry.tags | slice(0, 3) %}
-                                    <li>{{ tag.label }}</li>
+                                    <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>
@@ -26,27 +26,22 @@
 
                         <div class="card-content">
                             {% if not entry.previewPicture is null %}
-                                <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
+                                <i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
                             {% endif %}
 
-                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span>
-
-                            <div class="estimatedTime grey-text">
-                                <span class="tool reading-time">
-                                    {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
-                                    {% if readingTime > 0 %}
-                                        {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}
-                                    {% else %}
-                                        {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
-                                    {% endif %}
-                                </span>
+                            <span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span>
+
+                            <div class="original grey-text">
+                                <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text">
+                                    <span>{{ entry.domainName|removeWww|truncate(18) }}</span>
+                                </a>
                             </div>
 
                             {% if entry.previewPicture is null %}
                                 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
                                 <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags | slice(0, 2) %}
-                                    <li>{{ tag.label }}</li>
+                                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                                 {% endfor %}
                             </ul>
                             {% endif %}
@@ -55,29 +50,24 @@
 
                     {% if not entry.previewPicture is null %}
                         <div class="card-reveal">
-                            <i class="card-title grey-text text-darken-4 material-icons right">clear</i>
+                            <i class="card-title activator grey-text text-darken-4 material-icons right">clear</i>
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
 
-                            <div class="estimatedTime grey-text">
-                                <span class="tool reading-time">
-                                    {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}{% else %}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{% endif %}
-                                </span>
-                            </div>
-
                             <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
 
-                            <ul class="card-entry-tags">
+                            <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags %}
-                                    <li>{{ tag.label }}</li>
+                                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                                 {% endfor %}
                             </ul>
                         </div>
                     {% endif %}
 
                     <div class="card-action">
-                        <span class="bold">
-                            <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a>
-                        </bold>
+                        <span class="reading-time grey-text">
+                            <i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i>
+                            {{ entry.readingTime / app.user.config.readingSpeed }} min
+                        </span>
 
                         <ul class="tools right">
                             <li>