Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust task #2300.

Browse Source
This commit is contained in:
wangyidong
2015-09-17 14:08:15 +08:00
parent 9cf05383df
commit eb0e1c2f47
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/company/control.php
View File

@@ -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. */

9
module/company/css/dynamic.css
View File

@@ -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}

4
module/company/lang/en.php
View File

@@ -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';

4
module/company/lang/zh-cn.php
View File

@@ -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] = '允许';