diff --git a/extension/lite/common/ext/lang/de/lite.php b/extension/lite/common/ext/lang/de/lite.php index 0a74146ca0..911da4653c 100644 --- a/extension/lite/common/ext/lang/de/lite.php +++ b/extension/lite/common/ext/lang/de/lite.php @@ -189,16 +189,18 @@ $lang->admin->menu->company['subMenu']->browseUser = array('link' => "{$lang->u $lang->admin->menu->company['subMenu']->dept = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept'); $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group'); -$lang->admin->menu->dev['subMenu'] = new stdclass(); -$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); -$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); -$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); -$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); +$lang->admin->menu->dev['subMenu'] = new stdclass(); +$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); +$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); +$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem"); +$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); +$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); $lang->admin->menu->dev['menuOrder'][5] = 'api'; $lang->admin->menu->dev['menuOrder'][10] = 'db'; -$lang->admin->menu->dev['menuOrder'][15] = 'editor'; -$lang->admin->menu->dev['menuOrder'][20] = 'entry'; +$lang->admin->menu->dev['menuOrder'][15] = 'langItem'; +$lang->admin->menu->dev['menuOrder'][20] = 'editor'; +$lang->admin->menu->dev['menuOrder'][25] = 'entry'; $lang->admin->menu->system['subMenu'] = new stdclass(); $lang->admin->menu->system['subMenu']->data = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action'); diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index 0a74146ca0..911da4653c 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -189,16 +189,18 @@ $lang->admin->menu->company['subMenu']->browseUser = array('link' => "{$lang->u $lang->admin->menu->company['subMenu']->dept = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept'); $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group'); -$lang->admin->menu->dev['subMenu'] = new stdclass(); -$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); -$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); -$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); -$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); +$lang->admin->menu->dev['subMenu'] = new stdclass(); +$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); +$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); +$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem"); +$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); +$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); $lang->admin->menu->dev['menuOrder'][5] = 'api'; $lang->admin->menu->dev['menuOrder'][10] = 'db'; -$lang->admin->menu->dev['menuOrder'][15] = 'editor'; -$lang->admin->menu->dev['menuOrder'][20] = 'entry'; +$lang->admin->menu->dev['menuOrder'][15] = 'langItem'; +$lang->admin->menu->dev['menuOrder'][20] = 'editor'; +$lang->admin->menu->dev['menuOrder'][25] = 'entry'; $lang->admin->menu->system['subMenu'] = new stdclass(); $lang->admin->menu->system['subMenu']->data = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action'); diff --git a/extension/lite/common/ext/lang/fr/lite.php b/extension/lite/common/ext/lang/fr/lite.php index 0a74146ca0..911da4653c 100644 --- a/extension/lite/common/ext/lang/fr/lite.php +++ b/extension/lite/common/ext/lang/fr/lite.php @@ -189,16 +189,18 @@ $lang->admin->menu->company['subMenu']->browseUser = array('link' => "{$lang->u $lang->admin->menu->company['subMenu']->dept = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept'); $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group'); -$lang->admin->menu->dev['subMenu'] = new stdclass(); -$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); -$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); -$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); -$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); +$lang->admin->menu->dev['subMenu'] = new stdclass(); +$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); +$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); +$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem"); +$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); +$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); $lang->admin->menu->dev['menuOrder'][5] = 'api'; $lang->admin->menu->dev['menuOrder'][10] = 'db'; -$lang->admin->menu->dev['menuOrder'][15] = 'editor'; -$lang->admin->menu->dev['menuOrder'][20] = 'entry'; +$lang->admin->menu->dev['menuOrder'][15] = 'langItem'; +$lang->admin->menu->dev['menuOrder'][20] = 'editor'; +$lang->admin->menu->dev['menuOrder'][25] = 'entry'; $lang->admin->menu->system['subMenu'] = new stdclass(); $lang->admin->menu->system['subMenu']->data = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action'); diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index bf296cab43..a8a683a383 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -190,16 +190,18 @@ $lang->admin->menu->company['subMenu']->browseUser = array('link' => "{$lang->u $lang->admin->menu->company['subMenu']->dept = array('link' => "{$lang->dept->common}|dept|browse", 'subModule' => 'dept'); $lang->admin->menu->company['subMenu']->browseGroup = array('link' => "{$lang->priv}|group|browse", 'subModule' => 'group'); -$lang->admin->menu->dev['subMenu'] = new stdclass(); -$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); -$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); -$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); -$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); +$lang->admin->menu->dev['subMenu'] = new stdclass(); +$lang->admin->menu->dev['subMenu']->api = array('link' => "API|dev|api"); +$lang->admin->menu->dev['subMenu']->db = array('link' => "$lang->db|dev|db"); +$lang->admin->menu->dev['subMenu']->langItem = array('link' => "{$lang->langItem}|dev|langitem"); +$lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor"); +$lang->admin->menu->dev['subMenu']->entry = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry'); $lang->admin->menu->dev['menuOrder'][5] = 'api'; $lang->admin->menu->dev['menuOrder'][10] = 'db'; -$lang->admin->menu->dev['menuOrder'][15] = 'editor'; -$lang->admin->menu->dev['menuOrder'][20] = 'entry'; +$lang->admin->menu->dev['menuOrder'][15] = 'langItem'; +$lang->admin->menu->dev['menuOrder'][20] = 'editor'; +$lang->admin->menu->dev['menuOrder'][25] = 'entry'; $lang->admin->menu->system['subMenu'] = new stdclass(); $lang->admin->menu->system['subMenu']->backup = array('link' => "{$lang->backup->common}|backup|index"); diff --git a/module/dev/config.php b/module/dev/config.php index 23b889cf3c..2b3d032639 100644 --- a/module/dev/config.php +++ b/module/dev/config.php @@ -246,5 +246,4 @@ $config->dev->navTypes = array('second', 'third', 'feature'); $config->disableFeature = array(); if(!helper::hasFeature('waterfall')) $config->disableFeature = array('design', 'stage', 'programplan', 'weekly', 'researchplan', 'researchreport', 'gapanalysis'); -$config->dev->disableMainMenu = array(); -if($config->systemMode == 'light') $config->dev->disableMainMenu = array('project'); +$config->dev->disableMainMenu = array('project', 'product', 'execution'); diff --git a/module/dev/model.php b/module/dev/model.php index eaad5b7e53..dd8e57614d 100644 --- a/module/dev/model.php +++ b/module/dev/model.php @@ -344,7 +344,7 @@ class devModel extends model } elseif($type == 'feature') { - $langKey = $module . '_feature-' . $method . '_'; + $langKey = 'featureBar-' . $method . '_'; foreach($defaultLang->$module->featureBar[$method] as $feature => $featureName) { $selectKey = $feature . 'Selects'; @@ -360,7 +360,7 @@ class devModel extends model elseif($type == 'first') { $lang = $defaultLang->mainNav; - $langKey = 'mainMenu_'; + $langKey = 'mainNav_'; } elseif($type == 'second') { @@ -385,10 +385,10 @@ class devModel extends model if(isset($menu['dropMenu'])) { - foreach($menu['dropMenu'] as $menuKey => $menu) + foreach($menu['dropMenu'] as $key => $menu) { - $menuKey = 'dropMenu_' . $menuKey; - $menus->{$menuKey} = $menu; + $dropMenuKey = $menuKey . 'DropMenu_' . $key; + $menus->{$dropMenuKey} = $menu; } } } @@ -397,12 +397,13 @@ class devModel extends model } elseif($type == 'third') { - $langKey = "{$module}SubMenu_menu_{$method}_"; + $langKey = "{$method}_"; $lang = $defaultLang->$module->menu->$method['subMenu']; } foreach($lang as $linkKey => $link) { + if($type == 'first' and in_array($linkKey, $this->config->dev->disableMainMenu)) continue; if(is_array($link)) { if(!isset($link['link'])) continue; @@ -412,7 +413,6 @@ class devModel extends model $link = strip_tags($link); $link = explode('|', $link); - if($type == 'second') $langKey = $module . 'Menu_' . $linkKey . '_'; $originalLangs[$langKey . $linkKey] = trim($link[0]); } @@ -424,14 +424,35 @@ class devModel extends model * * @param string $type * @param string $module + * @param string $method * @param string $language * @access public * @return array */ - public function getCustomedLang($type, $module = '', $language = 'zh-cn') + public function getCustomedLang($type, $module = '', $method = '', $language = 'zh-cn') { $customedLangs = array(); $clientLang = $this->app->getClientLang(); + + // Defalut value set, remove when left tree display. + if($type == 'feature') + { + $module = 'product'; + $method = 'browse'; + } + elseif($type == 'second') + { + $module = 'scrum'; + } + elseif($type == 'third') + { + $module = 'kanbanProject'; + $method = 'settings'; + } + // Defalut value set end. + + $langKey = ''; + $customeds = array(); if($type == 'common') { $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common§ion=&vision={$this->config->vision}"); @@ -452,6 +473,32 @@ class devModel extends model } if(!$this->config->URAndSR) unset($customedLangs['SRCommon']); } + elseif($type == 'first') + { + $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module=common§ion=mainNav&vision={$this->config->vision}"); + $langKey = 'mainNav_'; + } + elseif($type == 'second') + { + $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}Menu§ion=&vision={$this->config->vision}"); + } + elseif($type == 'third') + { + $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}SubMenu§ion=$method&vision={$this->config->vision}"); + $langKey = "{$method}_"; + } + elseif($type == 'feature') + { + $customeds = $this->loadModel('custom')->getItems("lang={$clientLang}&module={$module}§ion=featureBar-$method&vision={$this->config->vision}"); + $langKey = "featureBar-{$method}_"; + } + + foreach($customeds as $customed) + { + $customedKey = $customed->key; + if($type == 'second') $customedKey = $customed->section . '_' . $customed->key; + $customedLangs[$langKey . $customedKey] = $customed->value; + } return $customedLangs; }