diff --git a/module/caselib/control.php b/module/caselib/control.php
index 50aa4b71a9..5f842dcc3a 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -559,9 +559,9 @@ class caselib extends control
/**
* Show import case.
*
- * @param int $libID
- * @param int $pagerID
- * @param int $maxImport
+ * @param int $libID
+ * @param int $pagerID
+ * @param int $maxImport
* @param string|int $insert 0 is covered old, 1 is insert new.
* @access public
* @return void
diff --git a/module/common/model.php b/module/common/model.php
index ba21acd61e..a164ff4ce2 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -527,26 +527,66 @@ class commonModel extends model
* Print the main nav.
*
* @param string $moduleName
- * @param string $methodName
*
* @static
* @access public
* @return void
*/
- public static function printMainNav($moduleName, $methodName = '')
+ public static function printMainNav($moduleName)
{
- global $app, $lang;
+ $items = common::getMainNavList($moduleName);
+ foreach($items as $item)
+ {
+ if($item == 'divider')
+ {
+ echo "
";
+ }
+ else
+ {
+ $active = $item->active ? ' class="active"' : '';
+ echo "" . html::a($item->url, $item->title) . '';
+ }
+ }
+ }
- $lastMenu = end($lang->mainNav);
+ /**
+ * Get main nav items list
+ *
+ * @param string $moduleName
+ *
+ * @static
+ * @access public
+ * @return array
+ */
+ public static function getMainNavList($moduleName)
+ {
+ global $lang;
+
+ $items = array();
+ $lastNavItem = end($lang->mainNav);
foreach($lang->mainNav as $group => $nav)
{
- $active = '';
list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
- if($moduleName != 'program' && $moduleName == $group) $active = 'active';
- if(zget($lang->navGroup, $moduleName, '') == $group) $active = 'active';
- if(common::hasPriv($currentModule, $currentMethod)) echo "" . html::a(helper::createLink($currentModule, $currentMethod, $vars), $title) . '';
- if(($lastMenu != $nav) && strpos($lang->dividerMenu, ",{$group},") !== false) echo "";
+
+ if(!common::hasPriv($currentModule, $currentMethod)) continue;
+
+ $item = new stdClass();
+ $item->group = $group;
+ $item->active = zget($lang->navGroup, $moduleName, '') == $group || $moduleName != 'program' && $moduleName == $group;
+ $item->title = $title;
+ $item->moduleName = $currentModule;
+ $item->methodName = $currentMethod;
+ $item->vars = $vars;
+ $item->url = helper::createLink($currentModule, $currentMethod, $vars);
+
+ $items[] = $item;
+
+ if(($lastNavItem != $nav) && strpos($lang->dividerMenu, ",{$group},") !== false)
+ {
+ $items[] = 'divider';
+ }
}
+ return $items;
}
/**
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 5274cee7e1..8317877d4e 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -10,20 +10,6 @@ include 'chosen.html.php';
navGroup, $app->rawModule) == 'program');?>
navGroup, $app->rawModule) == 'product');?>
navGroup, $app->rawModule) == 'project');?>
-