From d5aecda9076588be7493421e1561bedd93b3781f Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Fri, 18 Dec 2009 09:02:35 +0000 Subject: [PATCH] * adjust the UI. --- trunk/module/bug/view/edit.html.php | 2 +- trunk/module/company/control.php | 7 ++ trunk/module/company/lang/zh-cn.php | 3 + trunk/module/company/model.php | 6 ++ trunk/module/company/view/browse.html.php | 67 ++++++++----------- trunk/module/company/view/create.html.php | 26 ++++--- trunk/module/company/view/edit.html.php | 26 ++++--- trunk/module/dept/model.php | 2 +- trunk/module/dept/view/browse.html.php | 8 +-- trunk/module/group/control.php | 38 ++++++++--- trunk/module/group/lang/zh-cn.php | 63 +++++++++-------- trunk/module/group/view/create.html.php | 12 ++-- trunk/module/group/view/edit.html.php | 12 ++-- trunk/module/group/view/managemember.html.php | 15 ++--- trunk/module/group/view/managepriv.html.php | 9 +-- trunk/module/index/view/index.html.php | 2 +- trunk/module/project/view/project.html.php | 2 - trunk/module/project/view/task.html.php | 4 +- trunk/module/project/view/team.html.php | 17 +---- trunk/module/testcase/view/edit.html.php | 2 +- 20 files changed, 153 insertions(+), 170 deletions(-) diff --git a/trunk/module/bug/view/edit.html.php b/trunk/module/bug/view/edit.html.php index 3d6d87f5c0..2b9b7df02b 100644 --- a/trunk/module/bug/view/edit.html.php +++ b/trunk/module/bug/view/edit.html.php @@ -122,7 +122,7 @@ function setDuplicate(resolution) -
+
diff --git a/trunk/module/company/control.php b/trunk/module/company/control.php index c05e18a3b6..0829356e4e 100644 --- a/trunk/module/company/control.php +++ b/trunk/module/company/control.php @@ -44,6 +44,8 @@ class company extends control $this->lang->set('menugroup.company', 'company'); $childDeptIds = $this->dept->getAllChildID($deptID); + $this->company->setMenu($deptID); + $header['title'] = $this->lang->company->index . $this->lang->colon . $this->lang->dept->common; $position[] = $this->lang->dept->common; @@ -52,6 +54,7 @@ class company extends control $this->assign('users', $this->dept->getUsers($childDeptIds)); $this->assign('deptTree', $this->dept->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createMemberLink'))); $this->assign('parentDepts', $this->dept->getParents($deptID)); + $this->assign('deptID', $deptID); $this->display(); } @@ -66,6 +69,8 @@ class company extends control } $this->lang->set('menugroup.company', 'admin'); + $this->lang->company->menu = $this->lang->admin->menu; + $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->company->create; $position[] = html::a($this->createLink('admin', 'browsecompany'), $this->lang->admin->company); $position[] = $this->lang->company->create; @@ -85,6 +90,8 @@ class company extends control } $this->lang->set('menugroup.company', 'admin'); + $this->lang->company->menu = $this->lang->admin->menu; + $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->company->edit; $position[] = html::a($this->createLink('admin', 'browsecompany'), $this->lang->admin->company); $position[] = $this->lang->company->edit; diff --git a/trunk/module/company/lang/zh-cn.php b/trunk/module/company/lang/zh-cn.php index 5b7aa9a1cd..479aa31a0d 100644 --- a/trunk/module/company/lang/zh-cn.php +++ b/trunk/module/company/lang/zh-cn.php @@ -44,3 +44,6 @@ $lang->company->website = '公司网站'; $lang->company->backyard = '内网网址'; $lang->company->pms = 'PMS网站'; $lang->company->guest = '匿名登陆'; + +$lang->company->guestList[0] = '不允许'; +$lang->company->guestList[1] = '允许'; diff --git a/trunk/module/company/model.php b/trunk/module/company/model.php index 44ed3413b3..216a3478b2 100644 --- a/trunk/module/company/model.php +++ b/trunk/module/company/model.php @@ -25,6 +25,12 @@ lang->company->menu, 'addUser', array($this->app->company->id, $dept)); + } + /* ù˾б*/ function getList() { diff --git a/trunk/module/company/view/browse.html.php b/trunk/module/company/view/browse.html.php index ef54974383..aa6afee0c5 100644 --- a/trunk/module/company/view/browse.html.php +++ b/trunk/module/company/view/browse.html.php @@ -22,40 +22,30 @@ * @link http://www.zentao.cn */ ?> - - - -
+ +
- - - - - -
dept->common;?>
-
-
- createLink('dept', 'browse'), $lang->dept->manage);?> - createLink('user', 'create', "companyID={$this->app->company->id}&from=company"), $lang->user->create);?> -
-
- +
dept->common;?>
+
+ +
+ dept->manage); + common::printLink('user', 'create', "companyID={$this->app->company->id}&from=company", $lang->user->create); + common::printLink('company', 'browse', '', $lang->user->allUsers); + ?> +
-
+
+
- - +
- createLink('company', 'browse'), $app->company->name) . $lang->arrow; - foreach($parentDepts as $dept) - { - echo html::a($this->createLink('company', 'browse', "deptID=$dept->id"), $dept->name) . $lang->arrow; - } - echo $lang->dept->users; - ?> -
- + @@ -71,28 +61,25 @@ - - + + - + - +
user->id;?> user->realname;?> user->account;?>
id;?>createLink('user', 'view', "account=$user->account"), $user->realname); else echo $user->realname;?>id;?>account", $user->realname)) echo $user->realname;?> account;?> nickname;?> email);?>user->gendarList->{$user->gendar})) echo $lang->user->gendarList->{$user->gendar};?>user->gendarList->{$user->gendar})) echo $lang->user->gendarList->{$user->gendar};?> phone;?>join;?>join;?> visits;?> - createLink('user', 'edit', "userID=$user->id&from=company"), $lang->user->edit);?> - createLink('user', 'delete', "userID=$user->id"), $lang->user->delete, "hiddenwin");?> + id&from=company", $lang->user->edit);?> + id", $lang->user->delete, "hiddenwin");?>
-
- -
+ diff --git a/trunk/module/company/view/create.html.php b/trunk/module/company/view/create.html.php index 2e32515321..c472c3726b 100644 --- a/trunk/module/company/view/create.html.php +++ b/trunk/module/company/view/create.html.php @@ -23,49 +23,47 @@ */ ?> -
+
- +
- + - + - + - + - + - + - + - + - + - - - +
company->create;?>
company->name;?>
company->phone;?>
company->fax;?>
company->address;?>
company->zipcode;?>
company->website;?>
company->backyard;?>
company->pms;?>
company->guest;?>company->guestList);?>
diff --git a/trunk/module/company/view/edit.html.php b/trunk/module/company/view/edit.html.php index 33ca537b81..7e65231799 100644 --- a/trunk/module/company/view/edit.html.php +++ b/trunk/module/company/view/edit.html.php @@ -23,49 +23,47 @@ */ ?> -
+
- +
- + - + - + - + - + - + - + - + - + - - - +
company->create;?>
company->name;?>
company->phone;?>
company->fax;?>
company->address;?>
company->zipcode;?>
company->website;?>
company->backyard;?>
company->pms;?>
company->guest;?>company->guestList, $company->guest);?>
diff --git a/trunk/module/dept/model.php b/trunk/module/dept/model.php index 0cc969e9cd..f0390c56f5 100644 --- a/trunk/module/dept/model.php +++ b/trunk/module/dept/model.php @@ -147,7 +147,7 @@ class deptModel extends model /* 生成用户链接。*/ function createMemberLink($dept) { - $linkHtml = html::a(helper::createLink('company', 'browse', "dept={$dept->id}"), $dept->name); + $linkHtml = html::a(helper::createLink('company', 'browse', "dept={$dept->id}"), $dept->name, '_self', "id='dept{$dept->id}'"); return $linkHtml; } diff --git a/trunk/module/dept/view/browse.html.php b/trunk/module/dept/view/browse.html.php index ad6d9cb3c1..180fecb9e3 100644 --- a/trunk/module/dept/view/browse.html.php +++ b/trunk/module/dept/view/browse.html.php @@ -28,15 +28,11 @@
'> - +
- -
-
- -
+
dept->updateOrder);?>
diff --git a/trunk/module/group/control.php b/trunk/module/group/control.php index 9a47adbd9e..67a724361e 100644 --- a/trunk/module/group/control.php +++ b/trunk/module/group/control.php @@ -31,6 +31,26 @@ class group extends control $this->loadModel('user'); } + /* 分组列表。*/ + public function browse($companyID = 0) + { + if($companyID == 0) $companyID = $this->app->company->id; + + $header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->browse; + $position[] = $this->lang->group->browse; + + $groups = $this->group->getList($companyID); + $groupUsers = array(); + foreach($groups as $group) $groupUsers[$group->id] = $this->group->getUserPairs($group->id); + + $this->assign('header', $header); + $this->assign('position', $position); + $this->assign('groups', $groups); + $this->assign('groupUsers', $groupUsers); + + $this->display(); + } + /* 创建一个用户组。*/ public function create($companyID = 0) { @@ -38,11 +58,10 @@ class group extends control if(!empty($_POST)) { $this->group->create($companyID); - die(js::locate($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), 'parent')); + die(js::locate($this->createLink('group', 'browse'), 'parent')); } - $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->group->create; - $position[] = html::a($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), $this->lang->admin->group); + $header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->create; $position[] = $this->lang->group->create; $this->assign('header', $header); $this->assign('position', $position); @@ -56,11 +75,10 @@ class group extends control if(!empty($_POST)) { $this->group->update($groupID); - die(js::locate($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), 'parent')); + die(js::locate($this->createLink('group', 'browse'), 'parent')); } - $header['title'] = $this->lang->admin->common . $this->lang->colon . $this->lang->group->edit; - $position[] = html::a($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), $this->lang->admin->group); + $header['title'] = $this->lang->company->orgView . $this->lang->colon . $this->lang->group->edit; $position[] = $this->lang->group->edit; $this->assign('header', $header); $this->assign('position', $position); @@ -100,7 +118,7 @@ class group extends control if(!empty($_POST)) { $this->group->updateUser($groupID); - die(js::locate($this->createLink('admin', 'browsegroup', "companyid={$this->app->company->id}"), 'parent')); + die(js::locate($this->createLink('group', 'browse'), 'parent')); } $group = $this->group->getById($groupID); $groupUsers = $this->group->getUserPairs($groupID); @@ -125,14 +143,12 @@ class group extends control { if($confirm == 'no') { - echo js::confirm($this->lang->group->confirmDelete, $this->createLink('group', 'delete', "groupID=$groupID&confirm=yes")); - exit; + die(js::confirm($this->lang->group->confirmDelete, $this->createLink('group', 'delete', "groupID=$groupID&confirm=yes"))); } else { $this->group->delete($groupID); - echo js::locate($this->createLink('admin', 'browsegroup', "companyID={$this->app->company->id}"), 'parent'); - exit; + die(js::locate($this->createLink('group', 'browse'), 'parent')); } } } diff --git a/trunk/module/group/lang/zh-cn.php b/trunk/module/group/lang/zh-cn.php index 5088c157e2..ac490854f9 100644 --- a/trunk/module/group/lang/zh-cn.php +++ b/trunk/module/group/lang/zh-cn.php @@ -45,6 +45,20 @@ $lang->group->priv = '权限'; $lang->resource->index->index = 'index'; $lang->resource->index->ping = 'ping'; +$lang->resource->my->index = 'index'; +$lang->resource->my->todo = 'todo'; +$lang->resource->my->task = 'task'; +$lang->resource->my->bug = 'bug'; +$lang->resource->my->project = 'project'; +$lang->resource->my->profile = 'profile'; +$lang->resource->my->editProfile = 'editProfile'; + +$lang->resource->todo->create = 'create'; +$lang->resource->todo->edit = 'edit'; +$lang->resource->todo->delete = 'delete'; +$lang->resource->todo->mark = 'mark'; +$lang->resource->todo->import2Today = 'import2Today'; + $lang->resource->product->index = 'index'; $lang->resource->product->browse = 'browse'; $lang->resource->product->create = 'create'; @@ -59,22 +73,9 @@ $lang->resource->story->view = 'view'; $lang->resource->story->tasks = 'tasks'; $lang->resource->story->ajaxGetProjectStories = 'ajaxGetProjectStories'; $lang->resource->story->ajaxGetProductStories = 'ajaxGetProductStories'; -//$lang->resource->story->comment = 'comment'; - -//$lang->resource->release->index = 'index'; -//$lang->resource->release->create = 'create'; -//$lang->resource->release->read = 'read'; -//$lang->resource->release->update = 'update'; -//$lang->resource->release->delete = 'delete'; -//$lang->resource->release->browse = 'browse'; - -$lang->resource->tree->browse = 'browse'; -$lang->resource->tree->updateOrder = 'updateOrder'; -$lang->resource->tree->manageChild = 'manageChild'; -$lang->resource->tree->delete = 'delete'; -$lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu'; $lang->resource->project->index = 'index'; +$lang->resource->project->view = 'view'; $lang->resource->project->browse = 'browse'; $lang->resource->project->create = 'create'; $lang->resource->project->edit = 'edit'; @@ -82,14 +83,15 @@ $lang->resource->project->delete = 'delete'; $lang->resource->project->task = 'task'; $lang->resource->project->story = 'story'; $lang->resource->project->bug = 'bug'; +$lang->resource->project->burn = 'burn'; +$lang->resource->project->burnData = 'burnData'; +$lang->resource->project->team = 'team'; $lang->resource->project->manageProducts = 'manageProducts'; $lang->resource->project->manageChilds = 'manageChilds'; $lang->resource->project->manageMembers = 'manageMembers'; $lang->resource->project->unlinkMember = 'unlinkMember'; $lang->resource->project->linkStory = 'linkStory'; $lang->resource->project->unlinkStory = 'unlinkStory'; -$lang->resource->project->burn = 'burn'; -$lang->resource->project->burnData = 'burnData'; $lang->resource->task->create = 'create'; $lang->resource->task->edit = 'edit'; @@ -116,11 +118,6 @@ $lang->resource->testcase->create = 'create'; $lang->resource->testcase->view = 'view'; $lang->resource->testcase->edit = 'edit'; -$lang->resource->admin->index = 'index'; -$lang->resource->admin->browseCompany = 'browseCompany'; -$lang->resource->admin->browseUser = 'browseUser'; -$lang->resource->admin->browseGroup = 'browseGroup'; - $lang->resource->company->index = 'index'; $lang->resource->company->browse = 'browse'; $lang->resource->company->create = 'create'; @@ -132,6 +129,7 @@ $lang->resource->dept->updateOrder = 'updateOrder'; $lang->resource->dept->manageChild = 'manageChild'; $lang->resource->dept->delete = 'delete'; +$lang->resource->group->browse = 'browse'; $lang->resource->group->create = 'create'; $lang->resource->group->edit = 'edit'; $lang->resource->group->delete = 'delete'; @@ -146,19 +144,18 @@ $lang->resource->user->todo = 'todo'; $lang->resource->user->task = 'task'; $lang->resource->user->bug = 'bug'; $lang->resource->user->project= 'project'; +$lang->resource->user->profile= 'profile'; -$lang->resource->my->index = 'index'; -$lang->resource->my->editProfile = 'editProfile'; -$lang->resource->my->todo = 'todo'; -$lang->resource->my->task = 'task'; -$lang->resource->my->bug = 'bug'; -$lang->resource->my->project = 'project'; - -$lang->resource->todo->create = 'create'; -$lang->resource->todo->edit = 'edit'; -$lang->resource->todo->delete = 'delete'; -$lang->resource->todo->mark = 'mark'; -$lang->resource->todo->import2Today = 'import2Today'; +$lang->resource->tree->browse = 'browse'; +$lang->resource->tree->updateOrder = 'updateOrder'; +$lang->resource->tree->manageChild = 'manageChild'; +$lang->resource->tree->delete = 'delete'; +$lang->resource->tree->ajaxGetOptionMenu = 'ajaxGetOptionMenu'; $lang->resource->search->buildForm = 'buildForm'; $lang->resource->search->buildQuery = 'buildQuery'; + +$lang->resource->admin->index = 'index'; +$lang->resource->admin->browseCompany = 'browseCompany'; +$lang->resource->admin->browseUser = 'browseUser'; +$lang->resource->admin->browseGroup = 'browseGroup'; diff --git a/trunk/module/group/view/create.html.php b/trunk/module/group/view/create.html.php index 09d3478c1b..07bc1fac35 100644 --- a/trunk/module/group/view/create.html.php +++ b/trunk/module/group/view/create.html.php @@ -23,21 +23,19 @@ */ ?> -
+
- +
- + - + - - - +
group->create;?>
group->name;?>
group->desc;?>
diff --git a/trunk/module/group/view/edit.html.php b/trunk/module/group/view/edit.html.php index 44f680029e..50b3cbc2ba 100644 --- a/trunk/module/group/view/edit.html.php +++ b/trunk/module/group/view/edit.html.php @@ -23,21 +23,19 @@ */ ?> -
+
- +
- + - + - - - +
group->edit;?>
group->name;?>
group->desc;?>
diff --git a/trunk/module/group/view/managemember.html.php b/trunk/module/group/view/managemember.html.php index 0457aebacd..36613272eb 100644 --- a/trunk/module/group/view/managemember.html.php +++ b/trunk/module/group/view/managemember.html.php @@ -23,19 +23,12 @@ */ ?> -
+
- +
- - - - - + +
name . $lang->colon . $lang->group->manageMember;?>
- -
diff --git a/trunk/module/group/view/managepriv.html.php b/trunk/module/group/view/managepriv.html.php index 018d6973b4..2611567adb 100644 --- a/trunk/module/group/view/managepriv.html.php +++ b/trunk/module/group/view/managepriv.html.php @@ -23,11 +23,10 @@ */ ?> -
+
- - + @@ -41,9 +40,7 @@ - - - +
name . $lang->colon . $lang->group->managePriv;?>
group->module;?> group->method;?>
diff --git a/trunk/module/index/view/index.html.php b/trunk/module/index/view/index.html.php index a8d21cb80f..838c4052a0 100644 --- a/trunk/module/index/view/index.html.php +++ b/trunk/module/index/view/index.html.php @@ -22,7 +22,7 @@ */ ?> -
+
$project):?> diff --git a/trunk/module/project/view/project.html.php b/trunk/module/project/view/project.html.php index e9e1abb889..0cdf82a8fc 100644 --- a/trunk/module/project/view/project.html.php +++ b/trunk/module/project/view/project.html.php @@ -1,4 +1,3 @@ -
project->oneLineStats, @@ -11,4 +10,3 @@ printf($lang->project->oneLineStats, $project->totalConsumed, $project->totalLeft); ?> -
diff --git a/trunk/module/project/view/task.html.php b/trunk/module/project/view/task.html.php index 1795f691ab..9a7ebf51dc 100644 --- a/trunk/module/project/view/task.html.php +++ b/trunk/module/project/view/task.html.php @@ -25,11 +25,13 @@
+
+ +
createLink('task', 'create', "project=$project->id"), $lang->task->create);?>
- id&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?> diff --git a/trunk/module/project/view/team.html.php b/trunk/module/project/view/team.html.php index 79935df7ad..18249c67b6 100644 --- a/trunk/module/project/view/team.html.php +++ b/trunk/module/project/view/team.html.php @@ -24,22 +24,10 @@ ?> -
-
-
-
-
- id", $lang->project->manageMembers);?> -
-
-
-
- +
- project->team . $lang->colon . $project->team; ?> -
- + @@ -62,6 +50,7 @@ " . html::a($this->createLink('project', 'unlinkmember', "projectID=$project->id&account=$member->account"), $lang->project->unlinkMember, 'hiddenwin') . '';?> +
team->account;?> team->role;?> team->joinDate;?>
id", $lang->project->manageMembers);?>
diff --git a/trunk/module/testcase/view/edit.html.php b/trunk/module/testcase/view/edit.html.php index 347e330992..1e6fdb3d8c 100644 --- a/trunk/module/testcase/view/edit.html.php +++ b/trunk/module/testcase/view/edit.html.php @@ -60,7 +60,7 @@ function loadStory(productID)
-
+