Merge remote-tracking branch 'origin/master' into 2.1

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / views / themes / baggy / Entry / entries.html.twig

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index a07285bdc213b8ada227a1354b263a6a3ba6f927..1554cce4789b33c9cebaee7f3394e5573feadd5f 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -1,36 +1,12 @@
 {% 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 }}
-    {% elseif currentRoute == 'tag_entries' %}
-        {{ 'entry.page_titles.filtered_tags'|trans }}
-    {% else %}
-        {{ 'entry.page_titles.unread'|trans }}
-    {% endif %}
+    {% include "@WallabagCore/themes/_title.html.twig" %}
 {% endblock %}
 
 {% block content %}
     {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 
-    {% block pager %}
-        <div class="results">
-            <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
-            <div class="pagination">
-                {% if form is not null %}<a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>{% endif %}
-                {% if entries.getNbPages > 1 %}
-                    {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
-                {% endif %}
-            </div>
-        </div>
-    {% endblock %}
-
     {% for entry in entries %}
         <div id="entry-{{ entry.id|e }}" class="entry">
             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2>
@@ -173,6 +149,4 @@
         </form>
     </aside>
     {% endif %}
-
-    {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}