diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index c52725fcb6..44395058dd 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -139,9 +139,11 @@ $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +$xuanxuanMenu = $lang->admin->menu->xuanxuan; /* Admin menu. */ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); +$lang->admin->menu->xuanxuan = $xuanxuanMenu; $lang->admin->menu->company = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,'); $lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate'); $lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension'); @@ -149,9 +151,12 @@ $lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias' $lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms'); $lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany'); +$lang->admin->menu->xuanxuan['link'] = 'Chat|admin|xuanxuan'; + /* Admin menu order. */ $lang->admin->menuOrder = array(); $lang->admin->menuOrder[5] = 'index'; +$lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menuOrder[10] = 'company'; $lang->admin->menuOrder[15] = 'custom'; $lang->admin->menuOrder[20] = 'message'; diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index 9c77550db4..c01a054394 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -139,9 +139,11 @@ $lang->doc->menuOrder[30] = 'custom'; $lang->doc->menu->project['subMenu'] = new stdclass(); $lang->doc->menu->custom['subMenu'] = new stdclass(); +$xuanxuanMenu = $lang->admin->menu->xuanxuan; /* Admin menu. */ $lang->admin->menu = new stdclass(); $lang->admin->menu->index = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany'); +$lang->admin->menu->xuanxuan = $xuanxuanMenu; $lang->admin->menu->company = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,'); $lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate'); $lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension'); @@ -149,9 +151,12 @@ $lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias' $lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms'); $lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany'); +$lang->admin->menu->xuanxuan['link'] = '聊天|admin|xuanxuan'; + /* Admin menu order. */ $lang->admin->menuOrder = array(); $lang->admin->menuOrder[5] = 'index'; +$lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menuOrder[10] = 'company'; $lang->admin->menuOrder[15] = 'custom'; $lang->admin->menuOrder[20] = 'message'; diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 2fe6471589..a412c19a97 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -73,6 +73,9 @@ if($this->config->vision == 'lite') $extHookFiles = glob($extHookRule); if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; } +$extHookRule = $extensionRoot . 'custom/common/ext/view/footer.*.hook.php'; +$extHookFiles = glob($extHookRule); +if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; ?> diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index abee5700a6..39ad793f27 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -57,7 +57,7 @@ createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), " " . $lang->programplan->create, '', "class='btn btn-info'");?> - createLink('execution', 'create', "projectID=$projectID"), " " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='execution'");?> + createLink('execution', 'create', "projectID=$projectID"), " " . (($from == 'execution' and $config->systemMode == 'new') ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='execution'");?>

@@ -77,9 +77,9 @@ idAB);?> - systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?> + systemMode == 'new') ? $lang->execution->execName : $lang->execution->name);?> - systemMode == 'new')) ? $lang->execution->execCode : $lang->execution->code);?> + systemMode == 'new') ? $lang->execution->execCode : $lang->execution->code);?> systemMode == 'new' and $this->app->tab == 'execution'):?> execution->projectName);?>