From: Jeremy Benoist Date: Wed, 20 Jan 2016 19:00:12 +0000 (+0100) Subject: Always include warning message X-Git-Tag: 2.0.0-beta.1~58^2~11 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=26975877d76a99f6a3153d3d3b4fc6c9f32687bc;p=github%2Fwallabag%2Fwallabag.git 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 943365e8..58e1dd66 100644 --- 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% - 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" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f9555676..52d26cb4 100644 --- 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 - # 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 our issues list and open a new if necessary - 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 e0e92760..073f6c27 100644 --- 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 - # 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 our issues list and open a new if necessary - 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 e6e7636c..24a1818a 100644 --- 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 - # 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 our issues list and open a new if necessary - 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 c47392a3..c739f89b 100644 --- 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 - # 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 our issues list and open a new if necessary - 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 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 %}
- {{ warning_message | raw }} + You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to our issues list and open a new if necessary
- {% endif %} 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 @@