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

- Make navigation bar collapse work by code instead of CSS classes.

Browse Source 
- Collapse navigation bar on Escape key.

Signed-off-by: Eric Riggs <ericriggs42@gmail.com>
This commit is contained in:
Eric Riggs
2018-03-08 20:01:32 -04:00
committed by Roberto Rosario
parent ac7cef2fd9
commit c267933fb8
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/appearance/static/appearance/js/base.js
View File

@@ -9,6 +9,7 @@ var partialNavigation = new PartialNavigation({
jQuery(document).ready(function() {
app.setupFullHeightResizing();
app.setupNavbarCollapse();
partialNavigation.initialize();
});

14
mayan/apps/appearance/static/appearance/js/mayan_app.js
View File

@@ -194,6 +194,20 @@ App.prototype.setupAutoSubmit = function () {
});
}
App.prototype.setupNavbarCollapse = function () {
$(document).keyup(function(e) {
if (e.keyCode === 27) {
$('.navbar-collapse').collapse('hide');
}
});
$('body').on('click', 'a', function (event) {
if (!$(this).hasAnyClass(['dropdown-toggle'])) {
$('.navbar-collapse').collapse('hide');
}
});
}
App.prototype.setupNewWindowAnchor = function () {
$('a.new_window').click(function (event) {
event.preventDefault();

3
mayan/apps/appearance/templates/navigation/generic_link_instance.html
View File

@@ -4,7 +4,7 @@
<li class="text-center link-text-span" >{{ link.text }}</li>
{% else %}
{% if link.disabled %}
<a class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %} disabled" disabled='disabled' style="cursor: default;" href="#" data-toggle="collapse" data-target=".navbar-collapse">{% if link.icon %}<i class="hidden-xs hidden-sm hidden-md {{ link.icon }}"></i>{% endif %}{% if link.icon_class %}{{ link.icon_class.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}</a>{% if horizontal %}{% if not forloop.last %}&nbsp;{% endif %}{% endif %}
<a class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %} disabled" disabled='disabled' style="cursor: default;" href="#">{% if link.icon %}<i class="hidden-xs hidden-sm hidden-md {{ link.icon }}"></i>{% endif %}{% if link.icon_class %}{{ link.icon_class.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}</a>{% if horizontal %}{% if not forloop.last %}&nbsp;{% endif %}{% endif %}
{% else %}
<a
class="{{ link.html_extra_classes }} {% if link_classes %}{{ link_classes }} {% else %}btn {% if 'dangerous' in link.tags %}btn-danger{% else %}btn-primary{% endif %} btn-xs{% endif %} {% if link.active %}{{ link_class_active }}{% endif %} {% if 'new_window' in link.tags %}new_window{% endif %}"
@@ -13,7 +13,6 @@
{% endfor %}
href="{{ link.url }}"
data-toggle="collapse" data-target=".navbar-collapse"
>{% if link.icon %}<i class="hidden-xs hidden-sm hidden-md {{ link.icon }}"></i>{% endif %}{% if link.icon_class %}{{ link.icon_class.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}</a>{% if horizontal %}{% if not forloop.last %}&nbsp;{% endif %}{% endif %}
{% endif %}
{% endif %}