X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FEntry%2Fentries.html.twig;h=919f94ecad7b898c799f5607ab1a8f9cf41854ba;hb=e39aec3e38144f1a2ddb0027ec724e3dfd6f53f1;hp=d245c8fdf3c5cff776c942a3ca3572b54897009f;hpb=25dc07d3c9d88dcb84444d69fd0b4822315c3fac;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 d245c8fd..919f94ec 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,18 +1,7 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}
-  {% set currentRoute = app.request.attributes.get('_route') %}
-
-  {% if currentRoute == 'starred' %}
-    {{ 'entry.page_titles.starred'|trans }}
-  {% elseif currentRoute == 'archive' %}
-    {{ 'entry.page_titles.archived'|trans }}
-  {% elseif currentRoute == 'all' %}
-    {{ 'entry.page_titles.filtered'|trans }}
-  {% else %}
-    {{ 'entry.page_titles.unread'|trans }}
-  {% endif %}
-
+  {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
@@ -28,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>
@@ -40,7 +29,7 @@
                                 <i class="card-title 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|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></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="estimatedTime grey-text">
                                 <span class="tool reading-time">
@@ -57,7 +46,7 @@
                                 <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 %}
@@ -78,25 +67,22 @@
                             <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>
+                                {% for tag in entry.tags %}
+                                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                                 {% endfor %}
                             </ul>
-                            {% if entry.tags | length > 2 %}
-                                {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }}
-                            {% endif %}
                         </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>
 
                         <ul class="tools right">
                             <li>
                                 <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
-                                <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}favorite_border{% else %}favorite{% endif %}</i></a>
+                                <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
                                 <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
                             </li>
                         </ul>
@@ -125,6 +111,7 @@
     </div>
 
     <!-- Filters -->
+    {% if form is not null %}
     <div id="filters" class="side-nav fixed right-aligned">
         <form action="{{ path('all') }}">
 
@@ -208,5 +195,6 @@
 
         </form>
     </div>
-    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
+    {% endif %}
+
 {% endblock %}