From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Sun, 9 Aug 2015 20:47:28 +0000 (+0200)
Subject: Merge pull request #1292 from wallabag/v2-tags-route
X-Git-Tag: 2.0.0-alpha.0~52
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=47cadf36c8f7c20ba1edf26e184637d33a52cf35;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1292 from wallabag/v2-tags-route

Add tags list display
---

47cadf36c8f7c20ba1edf26e184637d33a52cf35
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
index a56f58f3,5f8363ca..7070a399
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@@@ -63,7 -63,7 +63,7 @@@
                      <ul id="slide-out" class="side-nav fixed">
                          {% block logo %}
                              <li class="logo border-bottom">
 -                                <a class="waves-effect" href="{{ path('unread') }}">
 +                                <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
                                      <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
                                  </a>
                              </li>
@@@ -72,9 -72,9 +72,9 @@@
                          {% set currentRoute = app.request.attributes.get('_route') %}
  
                          <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
 -                        <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
 +                        <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
                          <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
-                         <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
+                         <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
                          <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
                          <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
                      </ul>