Always include warning message

We'll remove it later, on the stable release

diff --git a/app/config/config.yml b/app/config/config.yml
index 943365e87b893ecbd793ad315ce7a3fd0d5282bc..58e1dd6663374f47692f28834c9960b54e75b7d1 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -67,7 +67,6 @@ twig:
         export_xml: %export_xml%
         version: %app.version%
         twofactor_auth: %twofactor_auth%
         export_xml: %export_xml%
         version: %app.version%
         twofactor_auth: %twofactor_auth%

-        warning_message: %warning_message%

         paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     form_themes:
         - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
         paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     form_themes:
         - "LexikFormFilterBundle:Form:form_div_layout.html.twig"

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index f9555676e4ca2492dcd596c2fe3d2ad0602b7b7f..52d26cb4d4cb123de82862899849108f682120f2 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -42,10 +42,6 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 

-    # message to display at the bottom of the page
-    warning_message: >
-        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>
-

     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view
     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view

diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index e0e92760b7f3ee4802cb41c10ffe550d1bbe1864..073f6c27ece0f89af414f4a48a64c1e22a5fea03 100644 (file)
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -32,10 +32,6 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 

-    # message to display at the bottom of the page
-    warning_message: >
-        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>
-

     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view
     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view

diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index e6e7636c139dba50993f0ba9bf07f0ecd6477c2b..24a1818a85c0a5a384bb608b8864779cedd0f05b 100644 (file)
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -32,10 +32,6 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 

-    # message to display at the bottom of the page
-    warning_message: >
-        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>
-

     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view
     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view

diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index c47392a38537afde568a43bedf73d82a0b83dd78..c739f89b08a213ac15c8e8ed4b46d85731e66a30 100644 (file)
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -32,10 +32,6 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 

-    # message to display at the bottom of the page
-    warning_message: >
-        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>
-

     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view
     download_pictures: false # if true, pictures will be stored into data/assets for each article
 
     # Entry view

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 9e515a178057bb51669d09a80289ee57d74e8032..1742b4aa664e4f78bfc6b7479aa303a7fa272a37 100644 (file)
--- 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 %}
 
 
         {% block footer %}{% endblock %}
 

-        {% if warning_message %}

         <div id="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>
         </div>

-        {% endif %}

     </body>
 </html>
     </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 8743dc1dd0b207f15508376b0a734f60e0afb8d9..1cae90a41d2c94f56a0f2e6270ea13c7177e8b75 100644 (file)
--- 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">
                 <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>
 
                         </ul>
                     </div>