diff --git a/app/config/config.yml b/app/config/config.yml index 1f5f74410..5b26b06fe 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -45,6 +45,7 @@ twig: export_mobi: %export_mobi% export_pdf: %export_pdf% version: %app.version% + warning_message: %warning_message% paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" flattr_url: "https://flattr.com/thing/1265480" form: diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 97933ec33..b3947207a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -22,6 +22,10 @@ parameters: # wallabag misc app.version: 2.0.0-alpha + # 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 c381a08c6..e27aceae4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -113,5 +113,10 @@

{% trans %}powered by{% endtrans %} wallabag

{% endblock %} + {% if warning_message %} +
+ {{ warning_message | raw }} +
+ {% endif %} 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 81ea598c4..52a2be809 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,6 +26,20 @@ body { background: #f0f0f0; } +#warning_message { + position: fixed; + background-color: #ff6347; + z-index: 1000; + bottom: 0; + left: 0; + width: 100%; + color: #000; +} + +#warning_message a { + color: #555; +} + .border-bottom { border-bottom: 1px solid #DDD; }