From: hickert Date: Fri, 26 Feb 2010 14:18:14 +0000 (+0000) Subject: Updated framework to mark currently selected plugin X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b76edd04eb30733b0bbec16b618479c39206c5fb;p=gosa.git Updated framework to mark currently selected plugin git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15754 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index 7ff1ba336..f66b548e7 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -299,8 +299,7 @@ $smarty->assign ("go_help", get_template_path('images/help.png')); if($reload_navigation){ $plist->menu=""; } -$plist->gen_menu(); -$smarty->assign ("menu", $plist->menu); +$smarty->assign ("menu", $plist->gen_menu()); $smarty->assign ("plug", "$plug"); $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true"); diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl index 468a7fca8..e098fb785 100644 --- a/gosa-core/ihtml/themes/modern/framework.tpl +++ b/gosa-core/ihtml/themes/modern/framework.tpl @@ -32,8 +32,8 @@
    -
  • - +
  • +
  • Welcome to GOsa
  • Help
  • diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index 09c6808bb..ec0e74086 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -201,7 +201,7 @@ class pluglist { $this->allowed_plugins[$index] = $index; $class= ""; if($id == count($plug)) $class=" class='menu-last' \n "; - $menu .= "\n
  • ".$plHeadline."
  • "; + $menu .= "\n
  • ".$plHeadline."
  • "; } $menu.= "\n
"; $menu.= "\n
\n"; @@ -223,9 +223,18 @@ class pluglist { "; } + + // Use javascript to mark the currently selected plugin. + if(isset($_GET['plug'])){ + $menu = $this->menu." + + "; + } // Return the generated/cached gosa menu. - return ($this->menu); + return ($menu); }