X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FEntry%2Fentries.html.twig;h=2a027086cb78651589618f4e4227b25388505620;hb=3221b2e413eeddf952310a702fff0f887384018f;hp=55b3ee5cd68104d61fd43862648bc65f001dd69f;hpb=15f1352ef8761d3e083fc17c8354c30ca3542050;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 55b3ee5c..2a027086 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
@@ -5,11 +5,19 @@
 {% endblock %}
 
 {% block content %}
-    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+    <div class="results clearfix">
+        <div class="nb-results left">
+            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
+        </div>
+        {% if entries.getNbPages > 1 %}
+            {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+        {% endif %}
+    </div>
+
     <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">
@@ -26,24 +34,19 @@
 
                         <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 dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ 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 | striptags }}">{{ entry.title| striptags | truncate(80, true, '…') | raw }}</a></span>
+
+                            <div class="original grey-text">
+                                <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text">
+                                    <span>{{ entry.domainName|removeWww|truncate(30, false, '…') }}</span>
+                                </a>
                             </div>
 
                             {% if entry.previewPicture is null %}
-                                <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
+                                <p>{{ entry.content|striptags|slice(0, 250)|raw }}&hellip;</p>
                                 <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags | slice(0, 2) %}
                                     <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
@@ -55,16 +58,10 @@
 
                     {% if not entry.previewPicture is null %}
                         <div class="card-reveal">
-                            <i class="card-title 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>
+                            <i class="card-title activator grey-text text-darken-4 material-icons right">clear</i>
+                            <span class="card-title" title="{{ entry.title | raw | striptags }}"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title | raw | striptags | truncate(90, true, '…') }}</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>
+                            <p>{{ entry.content|striptags|slice(0, 250)|raw }}&hellip;</p>
 
                             <ul class="card-entry-labels-hidden">
                                 {% for tag in entry.tags %}
@@ -75,9 +72,10 @@
                     {% 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>
@@ -92,6 +90,10 @@
         {% endfor %}
     </ul>
 
+    {% if entries.getNbPages > 1 %}
+        {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+    {% endif %}
+
     <!-- Export -->
     <div id="export" class="side-nav fixed right-aligned">
     {% set currentRoute = app.request.attributes.get('_route') %}