diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-19 16:00:15 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-08-19 16:00:15 +0200 |
commit | fdab81e910f65babd1945e67c74b8bb541bcbfb3 (patch) | |
tree | f419316c73aaa40202b5e27b08a675ead9a4a394 | |
parent | e62d27ff9b3f07f09a77e075653c6a650860f5ec (diff) | |
download | wallabag-fdab81e910f65babd1945e67c74b8bb541bcbfb3.tar.gz wallabag-fdab81e910f65babd1945e67c74b8bb541bcbfb3.tar.zst wallabag-fdab81e910f65babd1945e67c74b8bb541bcbfb3.zip |
warning bar: add parameter to dis/enable it
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 4 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 6 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | 4 |
4 files changed, 12 insertions, 3 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 1f5f7441..5b26b06f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -45,6 +45,7 @@ twig: | |||
45 | export_mobi: %export_mobi% | 45 | export_mobi: %export_mobi% |
46 | export_pdf: %export_pdf% | 46 | export_pdf: %export_pdf% |
47 | version: %app.version% | 47 | version: %app.version% |
48 | warning_message: %warning_message% | ||
48 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 49 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
49 | flattr_url: "https://flattr.com/thing/1265480" | 50 | flattr_url: "https://flattr.com/thing/1265480" |
50 | form: | 51 | form: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 97933ec3..b3947207 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -22,6 +22,10 @@ parameters: | |||
22 | # wallabag misc | 22 | # wallabag misc |
23 | app.version: 2.0.0-alpha | 23 | app.version: 2.0.0-alpha |
24 | 24 | ||
25 | # message to display at the bottom of the page | ||
26 | warning_message: > | ||
27 | 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> | ||
28 | |||
25 | download_pictures: false # if true, pictures will be stored into data/assets for each article | 29 | download_pictures: false # if true, pictures will be stored into data/assets for each article |
26 | 30 | ||
27 | # Entry view | 31 | # Entry view |
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index a6cba6ce..e27aceae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
@@ -113,6 +113,10 @@ | |||
113 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> | 113 | <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p> |
114 | </footer> | 114 | </footer> |
115 | {% endblock %} | 115 | {% endblock %} |
116 | <div id="alphabar">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> | 116 | {% if warning_message %} |
117 | <div id="warning_message"> | ||
118 | {{ warning_message | raw }} | ||
119 | </div> | ||
120 | {% endif %} | ||
117 | </body> | 121 | </body> |
118 | </html> | 122 | </html> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css index c812ed6f..52a2be80 100755 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css | |||
@@ -26,7 +26,7 @@ body { | |||
26 | background: #f0f0f0; | 26 | background: #f0f0f0; |
27 | } | 27 | } |
28 | 28 | ||
29 | #alphabar { | 29 | #warning_message { |
30 | position: fixed; | 30 | position: fixed; |
31 | background-color: #ff6347; | 31 | background-color: #ff6347; |
32 | z-index: 1000; | 32 | z-index: 1000; |
@@ -36,7 +36,7 @@ body { | |||
36 | color: #000; | 36 | color: #000; |
37 | } | 37 | } |
38 | 38 | ||
39 | #alphabar a { | 39 | #warning_message a { |
40 | color: #555; | 40 | color: #555; |
41 | } | 41 | } |
42 | 42 | ||