From 464a8c61bbb3062eea1f42b4e59adb57e45ef277 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 02 Jun 2015 09:11:52 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/themes/default/assets/javascripts/responsive.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/responsive.js b/interface/web/themes/default/assets/javascripts/responsive.js
index dd64ff9..49d8814 100644
--- a/interface/web/themes/default/assets/javascripts/responsive.js
+++ b/interface/web/themes/default/assets/javascripts/responsive.js
@@ -1,4 +1,4 @@
-function loadPushyMenu() {
+ISPConfig.loadPushyMenu = function() {
// Off-Canvas Menü
var $mainNavigation = $('#main-navigation');
var $subNavigation = $('#sidebar');
@@ -9,9 +9,11 @@
// Hauptnavigation
$('<ul />').appendTo($responsiveNavigation);
+ var $addto = false;
$($mainNavigation).find('a').each(function () {
var $item = $(this);
var $activeClass = $item.hasClass('active') ? ' class="active"' : '';
+ var isactive = $activeClass != '' ? true : false;
var capp = $item.attr('data-capp');
if(capp) $activeClass += ' data-capp="' + capp + '"';
@@ -19,11 +21,14 @@
capp = $item.attr('data-load-content');
if(capp) $activeClass += ' data-load-content="' + capp + '"';
- $responsiveNavigation.find('ul').append($('<li><a href="' + $item.attr('href') + '"' + $activeClass + '><i class="icon ' + $item.data('icon-class') + '"></i>' + $item.text() + '</a></li>'));
+ var $newel = $('<li><a href="' + $item.attr('href') + '"' + $activeClass + '><i class="icon ' + $item.data('icon-class') + '"></i>' + $item.text() + '</a></li>');
+ if(isactive != '') $addto = $newel;
+ $responsiveNavigation.find('ul').append($newel);
});
// Subnavigation
- $('<ul class="subnavi" />').appendTo($responsiveNavigation);
+ if(!$addto) $addto = $responsiveNavigation;
+ $('<ul class="subnavi" />').appendTo($addto);
$($subNavigation).find('a').each(function () {
var $item = $(this);
@@ -35,6 +40,9 @@
capp = $item.attr('data-load-content');
if(capp) addattr += ' data-load-content="' + capp + '"';
+ capp = $item.hasClass('subnav-header');
+ if(capp) addattr += ' class="subnav-header"';
+
$responsiveNavigation.find('ul.subnavi').append($('<li><a href="' + $item.attr('href') + '"' + addattr + '>' + $item.text() + '</a></li>'));
});
};
--
Gitblit v1.9.1