From 16631d7ad9b9490b9bb9da3cc512c4c4a7c5d6a9 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 14 Mar 2018 11:28:57 +0100 Subject: [PATCH 1/2] quickfix for collapsing menu - add click events only after ajax call execution (asynchronity can be a bitch...) --- application/views/widgets/navigationMenu.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/application/views/widgets/navigationMenu.php b/application/views/widgets/navigationMenu.php index f231bc67e..1fdb4b6b3 100644 --- a/application/views/widgets/navigationMenu.php +++ b/application/views/widgets/navigationMenu.php @@ -114,7 +114,7 @@ { var strMenu = ''; - $("#side-menu").html('
  • '); + 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('
  • '); $("#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(); }); From 55c5f87832c4cbd992b2ef6f1c9f0f1c4f0b245e Mon Sep 17 00:00:00 2001 From: Paolo Date: Wed, 14 Mar 2018 12:24:01 +0100 Subject: [PATCH 2/2] Changed the server name in config/fhcomplete for addons_aufnahme_url --- application/config/fhcomplete.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/fhcomplete.php b/application/config/fhcomplete.php index b680d6f5d..15c5d8be0 100644 --- a/application/config/fhcomplete.php +++ b/application/config/fhcomplete.php @@ -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';