aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/config/config.yml1
-rw-r--r--app/config/parameters.yml.dist4
-rw-r--r--app/config/tests/parameters.yml.dist.mysql4
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql4
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig16
7 files changed, 9 insertions, 28 deletions
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:
67 export_xml: %export_xml% 67 export_xml: %export_xml%
68 version: %app.version% 68 version: %app.version%
69 twofactor_auth: %twofactor_auth% 69 twofactor_auth: %twofactor_auth%
70 warning_message: %warning_message%
71 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 70 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
72 form_themes: 71 form_themes:
73 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 72 - "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:
42 twofactor_auth: true 42 twofactor_auth: true
43 twofactor_sender: no-reply@wallabag.org 43 twofactor_sender: no-reply@wallabag.org
44 44
45 # message to display at the bottom of the page
46 warning_message: >
47 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>
48
49 download_pictures: false # if true, pictures will be stored into data/assets for each article 45 download_pictures: false # if true, pictures will be stored into data/assets for each article
50 46
51 # Entry view 47 # 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:
32 twofactor_auth: true 32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 33 twofactor_sender: no-reply@wallabag.org
34 34
35 # message to display at the bottom of the page
36 warning_message: >
37 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>
38
39 download_pictures: false # if true, pictures will be stored into data/assets for each article 35 download_pictures: false # if true, pictures will be stored into data/assets for each article
40 36
41 # Entry view 37 # 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:
32 twofactor_auth: true 32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 33 twofactor_sender: no-reply@wallabag.org
34 34
35 # message to display at the bottom of the page
36 warning_message: >
37 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>
38
39 download_pictures: false # if true, pictures will be stored into data/assets for each article 35 download_pictures: false # if true, pictures will be stored into data/assets for each article
40 36
41 # Entry view 37 # 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:
32 twofactor_auth: true 32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 33 twofactor_sender: no-reply@wallabag.org
34 34
35 # message to display at the bottom of the page
36 warning_message: >
37 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>
38
39 download_pictures: false # if true, pictures will be stored into data/assets for each article 35 download_pictures: false # if true, pictures will be stored into data/assets for each article
40 36
41 # Entry view 37 # 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 @@
68 68
69 {% block footer %}{% endblock %} 69 {% block footer %}{% endblock %}
70 70
71 {% if warning_message %}
72 <div id="warning_message"> 71 <div id="warning_message">
73 {{ warning_message | raw }} 72 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>
74 </div> 73 </div>
75 {% endif %}
76 </body> 74 </body>
77</html> 75</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 @@
11 <div class="row"> 11 <div class="row">
12 <div class="div_tabs col s12"> 12 <div class="div_tabs col s12">
13 <ul class="tabs"> 13 <ul class="tabs">
14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li> 14 <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
15 <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> 15 <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
16 <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> 16 <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
17 <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> 17 <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
18 <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li> 18 <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
19 {% if is_granted('ROLE_SUPER_ADMIN') %} 19 {% if is_granted('ROLE_SUPER_ADMIN') %}
20 <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li> 20 <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
21 {% endif %} 21 {% endif %}
22 </ul> 22 </ul>
23 </div> 23 </div>
24 24