From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Mon, 10 Aug 2015 12:15:11 +0000 (+0200)
Subject: Merge pull request #1295 from wallabag/v2-howto
X-Git-Tag: 2.0.0-alpha.0~51
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f48a0189290ae6dbdb0412a3abd95acd257e55cd;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1295 from wallabag/v2-howto

add howto page
---

f48a0189290ae6dbdb0412a3abd95acd257e55cd
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
index 7070a399,476420dd..8c942165
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@@@ -72,10 -72,11 +72,11 @@@
                          {% 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 {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% 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>
                      <div class="nav-wrapper nav-panels">