From 26975877d76a99f6a3153d3d3b4fc6c9f32687bc Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 20 Jan 2016 20:00:12 +0100
Subject: Always include warning message

We'll remove it later, on the stable release
---
 src/Wallabag/CoreBundle/Resources/views/base.html.twig   |  4 +---
 .../views/themes/material/Config/index.html.twig         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources')

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 9e515a17..1742b4aa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -68,10 +68,8 @@
 
         {% block footer %}{% endblock %}
 
-        {% if warning_message %}
         <div id="warning_message">
-            {{ warning_message | raw }}
+            You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
         </div>
-        {% endif %}
     </body>
 </html>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 8743dc1d..1cae90a4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -11,14 +11,14 @@
                 <div class="row">
                     <div class="div_tabs col s12">
                         <ul class="tabs">
-                        <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
-                        {% if is_granted('ROLE_SUPER_ADMIN') %}
-                        <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
-                        {% endif %}
+                            <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
+                            {% if is_granted('ROLE_SUPER_ADMIN') %}
+                            <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
+                            {% endif %}
                         </ul>
                     </div>
 
-- 
cgit v1.2.3