diff --git a/module/company/control.php b/module/company/control.php index f2cb427dbb..6069b4d0e8 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -201,17 +201,17 @@ class company extends control /* Get products' list.*/ $products = $this->loadModel('product')->getPairs('nocode'); - $products = array($this->lang->product->select) + $products; + $products = array($this->lang->company->product) + $products; $this->view->products = $products; /* Get projects' list.*/ $projects = $this->loadModel('project')->getPairs('nocode'); - $projects = array($this->lang->project->select) + $projects; + $projects = array($this->lang->company->project) + $projects; $this->view->projects = $projects; /* Get users.*/ $users = $this->loadModel('user')->getPairs('nodeleted|noclosed'); - $users[''] = $this->lang->user->select; + $users[''] = $this->lang->company->user; $this->view->users = $users; /* The header and position. */ diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index 2057cd30ad..e2f2ec0377 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -1,4 +1,5 @@ -#featurebar ul.nav li .chosen-container{height:20px;} -#featurebar ul.nav li .chosen-container a.chosen-single{background:#F8FAFE; border:none; -webkit-box-shadow:none;box-shadow:none; font-size:13px;} -#featurebar ul.nav li.active .chosen-container a.chosen-single{font-weight:bold} -#featurebar ul.nav li .chosen-container .chosen-drop {min-width: 300px;!important} +#featurebar ul.nav > li .chosen-container{height:20px;} +#featurebar ul.nav > li .chosen-container a.chosen-single{background:#F8FAFE; border:none; -webkit-box-shadow:none;box-shadow:none; font-size:14px;padding-top:0px;} +#featurebar ul.nav > li .chosen-container a.chosen-single div{top:-8px;} +#featurebar ul.nav > li.active .chosen-container a.chosen-single{font-weight:bold} +#featurebar ul.nav > li .chosen-container .chosen-drop {min-width: 300px;!important} diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 4b30650cbc..c67a5efccb 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -35,5 +35,9 @@ $lang->company->backyard = 'Intranet'; $lang->company->pms = 'Zentao'; $lang->company->guest = 'Guest'; +$lang->company->product = $lang->productCommon; +$lang->company->project = $lang->projectCommon; +$lang->company->user = 'User'; + $lang->company->guestList[0] = 'Deny'; $lang->company->guestList[1] = 'Allow'; diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index 476eabfea9..e0c85c7893 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -35,5 +35,9 @@ $lang->company->backyard = '内网'; $lang->company->pms = 'PMS网站'; $lang->company->guest = '匿名登录'; +$lang->company->product = $lang->productCommon; +$lang->company->project = $lang->projectCommon; +$lang->company->user = '用户'; + $lang->company->guestList[0] = '不允许'; $lang->company->guestList[1] = '允许';