Merge pull request #1369 from wallabag/v2-bottombar

fix #1332: bottom bar to display message

diff --git a/app/config/config.yml b/app/config/config.yml
index 1f5f744104617c669411600d16a2cb43ea0d8ae5..5b26b06fecf0d20f2132a4d220ada94556592db5 100644 (file)
--- 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 97933ec33a82729ce93281ecfddbf4d99cbadb29..b3947207a1a558ab06e4d2f299eca3deeb7eb923 100644 (file)
--- 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 <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

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index c381a08c6d91fd3c9c05ab9a872756e99ba6fae2..e27aceae492e658ade3ff47f2ed08802f3410836 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -113,5 +113,10 @@
                 <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
             </footer>
         {% endblock %}
+        {% if warning_message %}
+        <div id="warning_message">
+            {{ warning_message | raw }}
+        </div>
+        {% endif %}
     </body>
 </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 81ea598c443f922954bc672ef4365befaefad3dc..52a2be809bab7a2d8054a8bcb32c17e38eecf42f 100755 (executable)
--- 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;
 }