Translations and baggy view for tags

1 files changed, 31 insertions, 3 deletions

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 92eecb9b..a07285bd 100644
--- 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,10 +1,36 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{{ 'entry.page_titles.unread'|trans }}{% endblock %}
+{% 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 %}
+{% 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>
@@ -44,7 +70,6 @@
         </div>
     {% endfor %}
 
-
     <!-- Export -->
     <aside id="download-form">
     {% set currentRoute = app.request.attributes.get('_route') %}
@@ -63,8 +88,10 @@
             {% if craue_setting('export_xml') %}<li class="bold"><a class="waves-effect" href="{{ path('export_entries', { 'category': currentRoute, 'format': 'xml' }) }}">XML</a></li>{% endif %}
         </ul>
     </aside>
+
     <!-- Filter -->
-    <aside id="filter-form">
+    {% if form is not null %}
+    <aside id="filter-form" class="">
         <form method="get" action="{{ path('all') }}">
             <h2>{{ 'entry.filters.title'|trans }}</h2>
             <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
@@ -145,6 +172,7 @@
             </div>
         </form>
     </aside>
+    {% endif %}
 
     {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %}
 {% endblock %}