mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 11:01:04 +00:00
Merge pull request #1369 from wallabag/v2-bottombar
fix #1332: bottom bar to display message
This commit is contained in:
commit
34437f408c
4 changed files with 24 additions and 0 deletions
|
@ -45,6 +45,7 @@ twig:
|
||||||
export_mobi: %export_mobi%
|
export_mobi: %export_mobi%
|
||||||
export_pdf: %export_pdf%
|
export_pdf: %export_pdf%
|
||||||
version: %app.version%
|
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"
|
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"
|
flattr_url: "https://flattr.com/thing/1265480"
|
||||||
form:
|
form:
|
||||||
|
|
|
@ -22,6 +22,10 @@ parameters:
|
||||||
# wallabag misc
|
# wallabag misc
|
||||||
app.version: 2.0.0-alpha
|
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
|
download_pictures: false # if true, pictures will be stored into data/assets for each article
|
||||||
|
|
||||||
# Entry view
|
# Entry view
|
||||||
|
|
|
@ -113,5 +113,10 @@
|
||||||
<p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
|
<p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
|
||||||
</footer>
|
</footer>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
{% if warning_message %}
|
||||||
|
<div id="warning_message">
|
||||||
|
{{ warning_message | raw }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -26,6 +26,20 @@ body {
|
||||||
background: #f0f0f0;
|
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 {
|
||||||
border-bottom: 1px solid #DDD;
|
border-bottom: 1px solid #DDD;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue