tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2009-08-01 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_menu.php: add lines of code that I forget in the
	previus commits. Now the menu show correctly the extensions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1897 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-09-01 11:55:24 +00:00
parent 9a91e5ac79
commit 883e64d23b
2 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2009-08-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_menu.php: add lines of code that I forget in the
previus commits. Now the menu show correctly the extensions.
2009-08-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: add external Module group "Not assigned"

57
pandora_console/include/functions_menu.php
View File

@ -35,6 +35,16 @@ function print_menu (&$menu) {
echo '<ul'.(isset ($menu['class']) ? ' class="'.$menu['class'].'"' : '').'>';
foreach ($menu as $mainsec => $main) {
$extensionInMenuParameter = (string) get_parameter ('extension_in_menu','');
$showSubsection = true;
if ($extensionInMenuParameter != '') {
if ($extensionInMenuParameter == $mainsec)
$showSubsection = true;
else
$showSubsection = false;
}
if ($mainsec == 'class')
continue;
@ -53,10 +63,12 @@ function print_menu (&$menu) {
if (!isset ($main["refr"]))
$main["refr"] = 0;
if ($sec == $mainsec) {
if (($sec == $mainsec) && ($showSubsection)) {
$classes[] = 'selected';
} else {
$classes[] = 'not_selected';
if ($extensionInMenuParameter == $mainsec)
$classes[] = 'selected';
}
$output = '';
@ -71,17 +83,21 @@ function print_menu (&$menu) {
foreach ($main["sub"] as $subsec2 => $sub) {
//Set class
if ($sec2 == $subsec2 && isset ($sub[$subsec2]["options"])
if (($sec2 == $subsec2 && isset ($sub[$subsec2]["options"]))
&& (get_parameter_get ($sub[$subsec2]["options"]["name"]) == $sub[$subsec2]["options"]["value"])) {
//If the subclass is selected and there are options and that options value is true
$class = 'submenu_selected';
$selected = true;
$visible = true;
} elseif ($sec2 == $subsec2 && !isset ($sub[$subsec2]["options"])) {
//If the subclass is selected and there are no options
$class = 'submenu_selected';
$selected = true;
$visible = true;
$hasExtensions = (array_key_exists('hasExtensions',$main)) ? $main['hasExtensions'] : false;
if (($extensionInMenuParameter != '') && ($hasExtensions))
$visible = true;
else
$visible = false;
} else {
//Else it's not selected
$class = 'submenu_not_selected';
@ -101,8 +117,35 @@ function print_menu (&$menu) {
} else {
$link_add = "";
}
$submenu_output .= '<li'.($class ? ' class="'.$class.'"' : '').'>';
$submenu_output .= '<a href="index.php?sec='.$mainsec.'&amp;sec2='.$subsec2.($main["refr"] ? '&amp;refr='.$main["refr"] : '').$link_add.'">'.$sub["text"].'</a>';
//Ini Add icon extension
$secExtension = null;
if (array_key_exists('extension',$sub)) $secExtensionBool = $sub["extension"];
else $secExtensionBool = false;
if ($secExtensionBool) {
$imageIcon = 'images/extensions.png';
if (strlen($sub["icon"]) > 0)
$imageIcon ='extensions/'.$sub["icon"];
$submenu_output .= '<div style="background: url('.$imageIcon.') no-repeat; width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
}
$secExtension = null;
if (array_key_exists('sec',$sub)) $secExtension = $sub["sec"];
if (strlen($secExtension) > 0) {
$secUrl = $secExtension;
$extensionInMenu = 'extension_in_menu='.$mainsec.'&';
}
else {
$secUrl = $mainsec;
$extensionInMenu = '';
}
$submenu_output .= '<a href="index.php?'.$extensionInMenu.'sec='.$secUrl.'&amp;sec2='.$subsec2.($main["refr"] ? '&amp;refr='.$main["refr"] : '').$link_add.'">'.$sub["text"].'</a>';
$submenu_output .= '</li>';
}
}
@ -115,6 +158,10 @@ function print_menu (&$menu) {
if ($visible || in_array ("selected", $classes)) {
$visible = true;
}
if (!$showSubsection) {
$visible = false;
}
$output .= '<ul class="submenu'.($visible ? '' : ' invisible').'">';
$output .= $submenu_output;
$output .= '</ul>';