Merge branch 'master' of github.com:FH-Complete/FHC-Core

This commit is contained in:
Andreas Österreicher
2018-03-14 15:27:34 +01:00
2 changed files with 10 additions and 5 deletions
+1 -1
View File
@@ -243,4 +243,4 @@ $config['fhc_acl'] = array
//
$config['addons_aufnahme_url'] = array();
$config['addons_aufnahme_url']['OE_ROOT'] = 'http://debian.dev/addons/aufnahme/OE_ROOT/cis/index.php';
$config['addons_aufnahme_url']['OE_ROOT'] = 'https://SERVER-NAME/addons/aufnahme/OE_ROOT/cis/index.php';
+9 -4
View File
@@ -114,7 +114,7 @@
{
var strMenu = '';
$("#side-menu").html('<li id="collapseicon" class="text-right" style="cursor: pointer; color: #337ab7"><i class="fa fa-angle-double-left fa-fw"></i></li>');
printCollapseIcon();
jQuery.each(data, function(i, e) {
strMenu += printNavItem(e);
@@ -134,12 +134,12 @@
});
}
$(document).ready(function() {
renderSideMenu();
function printCollapseIcon()
{
// Hiding/showing navigation menu - works only with sb admin 2 template!!
$("#side-menu").prepend('<li id="collapseicon" class="text-right" style="cursor: pointer; color: #337ab7"><i class="fa fa-angle-double-left fa-fw"></i></li>');
$("#collapseicon").click(function() {
$("#page-wrapper").css('margin-left', '0px');
$("#side-menu").hide();
@@ -151,6 +151,11 @@
$("#side-menu").show();
$("#collapseinicon").hide();
});
}
$(document).ready(function() {
renderSideMenu();
});