From 2d0b5d832f349d3b3d0da8cf5ab04a75975be9ec Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 26 Nov 2010 15:34:41 +0000 Subject: [PATCH] Added style to hide the menu part, if there are none to display git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20391 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/main.php | 2 ++ gosa-core/html/themes/default/style.css | 9 +++++++++ gosa-core/ihtml/themes/default/framework.tpl | 2 +- gosa-core/include/class_pluglist.inc | 7 ++++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index ded3e1156..1af718b5b 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -236,6 +236,7 @@ if ($config->boolValueIsTrue("core","handleExpiredAccounts")){ } } +$smarty->assign("noMenuMode", FALSE); if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){ $plug= validate($_GET['plug']); $plugin_dir= $plist->get_path($plug); @@ -252,6 +253,7 @@ if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){ if(count($plist->getRegisteredMenuEntries()) == 0){ session::global_set('plugin_dir',"infoPage"); $plugin_dir= "$BASE_DIR/plugins/generic/infoPage"; + $smarty->assign("noMenuMode", TRUE); }else{ session::global_set('plugin_dir',"welcome"); $plugin_dir= "$BASE_DIR/plugins/generic/welcome"; diff --git a/gosa-core/html/themes/default/style.css b/gosa-core/html/themes/default/style.css index c337af699..cc9118d46 100644 --- a/gosa-core/html/themes/default/style.css +++ b/gosa-core/html/themes/default/style.css @@ -286,6 +286,15 @@ div.plugin-area { cursor:default; } +div.plugin-area-noMenu { + position:relative; + margin-left:6px; + padding-right:6px; + min-height:600px; + min-width:700px; + cursor:default; +} + /* Plugin decorations */ diff --git a/gosa-core/ihtml/themes/default/framework.tpl b/gosa-core/ihtml/themes/default/framework.tpl index 288f0f2df..7c58dcb0d 100644 --- a/gosa-core/ihtml/themes/default/framework.tpl +++ b/gosa-core/ihtml/themes/default/framework.tpl @@ -35,7 +35,7 @@ {$menu} {$msg_dialogs} -
+
{$pathMenu} {$contents}
diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index d4475497a..857e98a31 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -252,7 +252,7 @@ class pluglist $disabledPlugins = $this->config->configRegistry->getDisabledPlugins(); $cfg= $this->config->data['MENU']; - $menu = "\n \n"; - $this->menu = $menu; + if(count($this->registeredMenuEntries)){ + $this->menu = "\n"; + } // Add javascript method to print out warning messages while leaving an unsaved form. // We do it in here to get the string translated. -- 2.30.2