mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-25 16:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Always include warning message

Browse source 
We'll remove it later, on the stable release
This commit is contained in:
Jeremy Benoist 2016-01-20 20:00:12 +01:00
parent bc78968764
commit 26975877d7
7 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/config/config.yml
View file

@ -67,7 +67,6 @@ twig:
export_xml: %export_xml% export_xml: %export_xml%
version: %app.version% version: %app.version%
twofactor_auth: %twofactor_auth% twofactor_auth: %twofactor_auth%
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"
form_themes: form_themes:
- "LexikFormFilterBundle:Form:form_div_layout.html.twig" - "LexikFormFilterBundle:Form:form_div_layout.html.twig"

4
app/config/parameters.yml.dist
View file

@ -42,10 +42,6 @@ parameters:
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# 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

4
app/config/tests/parameters.yml.dist.mysql
View file

@ -32,10 +32,6 @@ parameters:
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# 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

4
app/config/tests/parameters.yml.dist.pgsql
View file

@ -32,10 +32,6 @@ parameters:
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# 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

4
app/config/tests/parameters.yml.dist.sqlite
View file

@ -32,10 +32,6 @@ parameters:
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# 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

4
src/Wallabag/CoreBundle/Resources/views/base.html.twig
View file

@ -68,10 +68,8 @@
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
{% if warning_message %}
<div id="warning_message"> <div id="warning_message">
{{ warning_message | raw }} 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> </div>
{% endif %}
</body> </body>
</html> </html>

16
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View file

@ -11,14 +11,14 @@
<div class="row"> <div class="row">
<div class="div_tabs col s12"> <div class="div_tabs col s12">
<ul class="tabs"> <ul class="tabs">
<li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li> <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
<li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li> <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
{% if is_granted('ROLE_SUPER_ADMIN') %} {% if is_granted('ROLE_SUPER_ADMIN') %}
<li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li> <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>