matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't show system alerts under floating elements

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-08-27 19:21:06 -04:00
parent 69c925ffd3
commit 649ef8151c
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@@ -31,6 +31,8 @@
bar changes. Closes GitLab issue #643. Thanks to
Light Templar (@LightTemplar) for the report.
* Unify all line endings to be Linux style.
* Make sure system alerts don't appear under
floating elements.
3.2.6 (2019-07-10)
==================

2
docs/releases/3.2.7.rst
View File

@@ -39,6 +39,8 @@ Changes
bar changes. Closes GitLab issue #643. Thanks to
Light Templar (@LightTemplar) for the report.
- Unify all line endings to be Linux style.
- Make sure system alerts don't appear under
floating elements.
Removals
--------

44
mayan/apps/appearance/templates/appearance/base.html
View File

@@ -23,32 +23,32 @@
{% block content_plain %}{% endblock %}
{% else %}
<div class="">
<div class="row zero-margin">
<div class="col-xs-12">
{% common_check_sqlite as check_sqlite %}
{% if common_check_sqlite %}
<div class="alert alert-dismissible alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p><strong>{% trans 'Warning' %}</strong> {{ check_sqlite }}</p>
</div>
{% endif %}
{% block messages %}
{% endblock %}
{% smart_settings_check_changed as settings_changed %}
{% if settings_changed %}
<div class="alert alert-dismissible alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p><strong>{% trans 'Warning' %}</strong> {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}</p>
</div>
{% endif %}
</div>
</div>
{% navigation_resolve_menus names='facet,list facet' sort_results=True as facet_menus_link_results %}
<div class="row zero-margin">
<div class="col-xs-12 {% if facet_menus_link_results %}has-sidebar{% endif %}" id="viewport">
<div class="row zero-margin">
<div class="col-xs-12">
{% common_check_sqlite as check_sqlite %}
{% if common_check_sqlite or 1 %}
<div class="alert alert-dismissible alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p><strong>{% trans 'Warning' %}</strong> {{ check_sqlite }}</p>
</div>
{% endif %}
{% block messages %}
{% endblock %}
{% smart_settings_check_changed as settings_changed %}
{% if settings_changed %}
<div class="alert alert-dismissible alert-warning">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p><strong>{% trans 'Warning' %}</strong> {% trans 'Settings updated, restart your installation for changes to take proper effect.' %}</p>
</div>
{% endif %}
</div>
</div>
{% include 'appearance/calculate_form_title.html' %}
{# action menu #}