X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=3ad776b99c3f8a8cae8d5423df9c2009b48a0f5e;hb=230413bdd17629eb8e80a8d3569a1e80cbc8c93e;hp=4f27f413fc23a7fef1449d48555299a288b618d4;hpb=ba7b9d48d407f87690a3fdc199b37714d2a52897;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 4f27f413..3ad776b9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -71,8 +71,9 @@
                     <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
                     <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
                     <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
-                    <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
-                    <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
+                    <li><a href="{{ path('all') }}"}>{% trans %}all{% endtrans %}</a></li>
+                    <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li>
+                    <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li>
                     <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
                         <div id="search-form" class="messages info popup-form">
                             <form method="get" action="index.php">
@@ -90,20 +91,22 @@
                 </ul>
             {% endblock %}
 
-            {% block precontent %}{% endblock %}
+            <main>
+                {% block precontent %}{% endblock %}
 
-            {% block messages %}
-                {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <div class="messages success">
-                        <a href="#" class="closeMessage">×</a>
-                        <p>{{ flashMessage }}</p>
-                    </div>
-                {% endfor %}
-            {% endblock %}
+                {% block messages %}
+                    {% for flashMessage in app.session.flashbag.get('notice') %}
+                        <div class="messages success">
+                            <a href="#" class="closeMessage">×</a>
+                            <p>{{ flashMessage }}</p>
+                        </div>
+                    {% endfor %}
+                {% endblock %}
 
-            <div id="content" class="w600p center">
-                {% block content %}{% endblock %}
-            </div>
+                <div id="content" class="w600p">
+                    {% block content %}{% endblock %}
+                </div>
+            </main>
         </div>
 
         {% block footer %}
@@ -111,5 +114,10 @@
                 <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
             </footer>
         {% endblock %}
+        {% if warning_message %}
+        <div id="warning_message">
+            {{ warning_message | raw }}
+        </div>
+        {% endif %}
     </body>
 </html>