diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-20 20:00:12 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-31 14:37:19 +0100 |
| commit | 26975877d76a99f6a3153d3d3b4fc6c9f32687bc (patch) | |
| tree | 591044fe0abb5cd1213ea53cc89ee4b7ef892c93 /src | |
| parent | bc78968764c741019a6b866ad434678cdbecbba4 (diff) | |
| download | wallabag-26975877d76a99f6a3153d3d3b4fc6c9f32687bc.tar.gz wallabag-26975877d76a99f6a3153d3d3b4fc6c9f32687bc.tar.zst wallabag-26975877d76a99f6a3153d3d3b4fc6c9f32687bc.zip | |
Always include warning message
We'll remove it later, on the stable release
Diffstat (limited to 'src')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/base.html.twig | 4 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 9e515a17..1742b4aa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig | |||
| @@ -68,10 +68,8 @@ | |||
| 68 | 68 | ||
| 69 | {% block footer %}{% endblock %} | 69 | {% block footer %}{% endblock %} |
| 70 | 70 | ||
| 71 | {% if warning_message %} | ||
| 72 | <div id="warning_message"> | 71 | <div id="warning_message"> |
| 73 | {{ warning_message | raw }} | 72 | 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> |
| 74 | </div> | 73 | </div> |
| 75 | {% endif %} | ||
| 76 | </body> | 74 | </body> |
| 77 | </html> | 75 | </html> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 8743dc1d..1cae90a4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
| @@ -11,14 +11,14 @@ | |||
| 11 | <div class="row"> | 11 | <div class="row"> |
| 12 | <div class="div_tabs col s12"> | 12 | <div class="div_tabs col s12"> |
| 13 | <ul class="tabs"> | 13 | <ul class="tabs"> |
| 14 | <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li> | 14 | <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li> |
| 15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> | 15 | <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li> |
| 16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> | 16 | <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li> |
| 17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> | 17 | <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li> |
| 18 | <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li> | 18 | <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li> |
| 19 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 19 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
| 20 | <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li> | 20 | <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li> |
| 21 | {% endif %} | 21 | {% endif %} |
| 22 | </ul> | 22 | </ul> |
| 23 | </div> | 23 | </div> |
| 24 | 24 | ||