diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 2c61e25efd..45fe485060 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -98,8 +98,8 @@ $lang->bug->unResolved = '未解决'; $lang->bug->unclosed = '未关闭'; $lang->bug->longLifeBugs = '久未处理'; $lang->bug->postponedBugs = '被延期'; -$lang->bug->allBugs = '所有Bug'; -$lang->bug->moduleBugs = '按模块浏览'; +$lang->bug->allBugs = '所有'; +$lang->bug->moduleBugs = '按模块'; $lang->bug->byQuery = '搜索'; $lang->bug->needConfirm = '需求变动'; $lang->bug->allProduct = '所有产品'; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 3374192763..a26b1c414f 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -23,6 +23,7 @@ var customed = ;
" . $lang->bug->moduleBugs . " "; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe¶m=0"), $lang->bug->assignToMe) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe¶m=0"), $lang->bug->openedByMe) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe¶m=0"), $lang->bug->resolvedByMe) . ""; @@ -31,7 +32,6 @@ var customed = ; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unclosed¶m=0"), $lang->bug->unclosed) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . ""; echo "{$lang->bug->byQuery} "; ?> diff --git a/module/common/control.php b/module/common/control.php index 45d1feaa40..2ee2da102d 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -302,7 +302,7 @@ class common extends control echo html::a($link, ' ', $target, "class='$class' title='$title'", true); if($method != 'edit' and $method != 'delete' and $method != 'copy') { - echo html::a($link, $title . '   ', $target, "class='$extraClass'", true); + echo html::a($link, $title, $target, "class='$extraClass'", true); } echo ""; } diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index ef93a7b998..efa47a87d2 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -59,7 +59,7 @@ $lang->product->RM = '发布负责人'; $lang->product->acl = '访问控制'; $lang->product->whitelist = '分组白名单'; -$lang->product->moduleStory = '按模块浏览'; +$lang->product->moduleStory = '按模块'; $lang->product->searchStory = '搜索'; $lang->product->assignedToMe = '指派给我'; $lang->product->openedByMe = '由我创建'; diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 0bc788b24d..b23cde9e8d 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -19,6 +19,7 @@ var browseType = '';
inlink('browse',"productID=$productID"), $lang->product->moduleStory);?> + inlink('browse', "productID=$productID&browseType=allStory"), $lang->product->allStory);?> inlink('browse', "productID=$productID&browseType=assignedtome"), $lang->product->assignedToMe);?> inlink('browse', "productID=$productID&browseType=openedByMe"), $lang->product->openedByMe);?> inlink('browse', "productID=$productID&browseType=reviewedByMe"), $lang->product->reviewedByMe);?> @@ -27,7 +28,6 @@ var browseType = ''; inlink('browse', "productID=$productID&browseType=activeStory"), $lang->product->activeStory);?> inlink('browse', "productID=$productID&browseType=changedStory"), $lang->product->changedStory);?> inlink('browse', "productID=$productID&browseType=closedStory"), $lang->product->closedStory);?> - inlink('browse', "productID=$productID&browseType=allStory"), $lang->product->allStory);?> product->searchStory;?>
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 296b77aa99..8827471ad2 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -108,9 +108,9 @@ $lang->project->importBug = '导入Bug'; $lang->project->ajaxGetProducts = '接口:获得项目产品列表'; /* 分组浏览。*/ -$lang->project->allTasks = '所有任务'; +$lang->project->allTasks = '所有'; $lang->project->assignedToMe = '指派给我'; -$lang->project->moduleTask = '按模块浏览'; +$lang->project->moduleTask = '按模块'; $lang->project->finishedByMe = '由我完成'; $lang->project->statusWait = '未开始'; $lang->project->statusDoing = '进行中'; @@ -183,4 +183,4 @@ $lang->project->placeholder->code = '团队内部的简称'; $lang->project->selectGroup->doing = '(进行中)'; $lang->project->selectGroup->done = '(已结束)'; -$lang->project->projectTasks = '按项目浏览'; +$lang->project->projectTasks = '按项目'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 5cd6ac5326..91e34d45f8 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -68,9 +68,9 @@ $lang->testcase->selectProduct = '请选择产品'; $lang->testcase->byModule = '按模块'; $lang->testcase->assignToMe = '指派给我的用例'; $lang->testcase->openedByMe = '由我创建的用例'; -$lang->testcase->allCases = '所有用例'; -$lang->testcase->needConfirm = '需求有变动的用例'; -$lang->testcase->moduleCases = '按模块浏览'; +$lang->testcase->allCases = '所有'; +$lang->testcase->needConfirm = '需求变动'; +$lang->testcase->moduleCases = '按模块'; $lang->testcase->bySearch = '搜索'; $lang->testcase->doneByMe = '我完成的用例'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 732e03744f..984ce6382b 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -11,7 +11,7 @@ */ $lang->todo->common = 'TODO'; $lang->todo->index = "todo一览"; -$lang->todo->create = "新增TODO"; +$lang->todo->create = "新增"; $lang->todo->batchCreate = "批量添加"; $lang->todo->edit = "更新TODO"; $lang->todo->view = "TODO详情"; @@ -71,15 +71,15 @@ $lang->todo->successMarked = "成功切换状态!"; $lang->todo->thisIsPrivate = '这是一条私人事务。:)'; $lang->todo->lblDisableDate = '暂时不设定时间'; -$lang->todo->thisWeekTodos = '本周计划'; -$lang->todo->lastWeekTodos = '上周工作'; +$lang->todo->thisWeekTodos = '本周'; +$lang->todo->lastWeekTodos = '上周'; $lang->todo->futureTodos = '暂不指定'; -$lang->todo->allDaysTodos = '所有TODO'; +$lang->todo->allDaysTodos = '所有'; $lang->todo->allUndone = '之前未完'; -$lang->todo->todayTodos = '今日安排'; -$lang->todo->yesterdayTodos = '昨日安排'; -$lang->todo->lastmonthTodos = '上月TODO'; -$lang->todo->thisseasonTodos = '本季TODO'; -$lang->todo->thisyearTodos = '本年TODO'; -$lang->todo->thismonthTodos = '本月TODO'; +$lang->todo->todayTodos = '今日'; +$lang->todo->yesterdayTodos = '昨日'; +$lang->todo->lastmonthTodos = '上月'; +$lang->todo->thisseasonTodos = '本季'; +$lang->todo->thisyearTodos = '本年'; +$lang->todo->thismonthTodos = '本月'; $lang->todo->action->marked = array('main' => '$date, 由 $actor 标记为$extra。', 'extra' => $lang->todo->statusList); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index c9d00f1d7e..02662272de 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -312,8 +312,8 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #projectID {background:#e5e5e5; border:1px solid #e5e5e5} /* Feature bar. */ -#featurebar { height:28px; line-height:28px; cursor:pointer; padding:20px 8px 10px 8px; margin: -15px -15px 10px -15px;} -#featurebar a {text-decoration:none; border-right:1px solid #ddd; padding:4px 10px 4px 4px; color:#003366} +#featurebar {height:28px; line-height:28px; cursor:pointer; padding:20px 8px 10px 8px; margin: -15px -15px 10px -15px;} +#featurebar a {text-decoration:none; border-right:1px solid #ddd; padding:4px 4px 4px 4px; color:#003366; font-size:12px} #featurebar a:hover {color:#ff3600;} #featurebar .f-right a {border-right:none; padding:0px} #featurebar #bysearchTab a {border:none;} @@ -530,7 +530,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #featurebar .f-right .icon-black-testcase-create {padding:2px 8px; background:url(images/main/zt-green.png) 0px -340px;} #featurebar .f-right .icon-black-testcase-batchCreate {padding:2px 8px; background:url(images/main/zt-black.png) -20px -340px;} -.link-button {padding:5px 0px 5px 12px; margin-left:-1px; background:url(images/main/link-button.png) 0px 0px repeat-x; border-right:1px solid RGB(234, 234, 234); border-left:1px solid RGB(234, 234, 234)} +.link-button {padding:5px 0px 5px 0px; margin-left:-1px; background:url(images/main/link-button.png) 0px 0px repeat-x; border-right:1px solid RGB(234, 234, 234); border-left:1px solid RGB(234, 234, 234)} .link-button:hover {background:RGB(200, 200, 200)} .link-button a{color:black; font-weight:normal; font-size:12px;} .link-button a:hover {color:RGB(234, 0, 0);}