From cb5d368c4828aba27d6e9b8e9e6c13452504bc2b Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 12 Apr 2016 11:23:05 +0800 Subject: [PATCH] * finish task #2524. --- module/common/lang/en.php | 2 ++ module/common/lang/menuOrder.php | 2 +- module/common/lang/zh-cn.php | 2 ++ module/common/model.php | 44 +++++++++++++++++++++++++++++- module/common/view/footer.html.php | 9 ++++++ module/misc/control.php | 13 +++++++++ module/misc/lang/en.php | 1 + module/misc/lang/zh-cn.php | 1 + module/misc/model.php | 19 +++++++++++++ 9 files changed, 91 insertions(+), 2 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d1a0d9ccfe..636db69bb5 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -66,6 +66,8 @@ $lang->ipLimited = "fold = '-'; $lang->hideNotCheck = 'Hide not checked field'; +$lang->quitNovice = 'Quit novice'; +$lang->enterNovice = 'Enter novice'; $lang->preShortcutKey = '[Shortcut key:←]'; $lang->nextShortcutKey = '[Shortcut key:→]'; diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index dce66592bb..c9b8bc7891 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -100,7 +100,7 @@ $lang->company->menuOrder[0] = 'name'; $lang->company->menuOrder[5] = 'browseUser'; $lang->company->menuOrder[10] = 'dept'; $lang->company->menuOrder[15] = 'browseGroup'; -$lang->company->menuOrder[20] = 'edit'; +$lang->company->menuOrder[20] = 'view'; $lang->company->menuOrder[25] = 'dynamic'; $lang->company->menuOrder[30] = 'addGroup'; $lang->company->menuOrder[35] = 'batchAddUser'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index b6b235358a..480d8788d5 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -66,6 +66,8 @@ $lang->ipLimited = "fold = '-'; $lang->hideNotCheck = '页面隐藏取消选中字段'; +$lang->quitNovice = '退出新手'; +$lang->enterNovice = '进入新手'; $lang->preShortcutKey = '[快捷键:←]'; $lang->nextShortcutKey = '[快捷键:→]'; diff --git a/module/common/model.php b/module/common/model.php index 58d7c9db36..afc59e8e5a 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -31,6 +31,7 @@ class commonModel extends model $this->loadCustomFromDB(); if(!$this->checkIP()) die($this->lang->ipLimited); if($this->app->getViewType() == 'mhtml') $this->setMobileMenu(); + if(self::inNoviceMode()) $this->setNoviceMenu(); $this->app->loadLang('company'); } } @@ -248,7 +249,6 @@ class commonModel extends model { $isGuest = $app->user->account == 'guest'; - echo "