diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index c02156b6a8..7ab226a68f 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -10,3 +10,4 @@ .confirm0 {color:gray; font-size:9px} .confirm1 {color:green; font-size:9px} tfoot .f-left {color:#141414;} +table.border-sep {border-collapse:separate;} diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 6d94a13b9a..bbf1eca342 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -62,7 +62,7 @@ var customed = ; recTotal}&recPerPage={$pager->recPerPage}"; ?> - +
@@ -76,8 +76,8 @@ var customed = ; - - + + diff --git a/module/my/control.php b/module/my/control.php index 888bd4de71..b9398c6b7b 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -86,7 +86,7 @@ class my extends control /* Assign. */ $this->view->dates = $this->loadModel('todo')->buildDateList(); $this->view->todos = $this->todo->getList($type, $account, $status, 0, $pager); - $this->view->date = (int)$type == 0 ? $this->todo->today() : $type; + $this->view->date = (int)$type == 0 ? date(DT_DATE1) : $type; $this->view->type = $type; $this->view->status = $status; $this->view->account = $this->app->user->account; diff --git a/module/my/js/todo.js b/module/my/js/todo.js index 8bfeb90bde..50285af3cf 100644 --- a/module/my/js/todo.js +++ b/module/my/js/todo.js @@ -1,6 +1,6 @@ function changeDate(date) { - link = createLink('my', 'todo', 'date=' + date); + link = createLink('my', 'todo', 'type=' + date); location.href=link; } diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index acf723b89b..886ff54b70 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -17,8 +17,8 @@
'. html::a(inlink('todo', "date=yesterday"), $lang->todo->yesterdayTodos). ''; echo '' . html::a(inlink('todo', "date=today"), $lang->todo->todayTodos) . ''; + echo ''. html::a(inlink('todo', "date=yesterday"), $lang->todo->yesterdayTodos). ''; echo '' . html::a(inlink('todo', "date=thisweek"), $lang->todo->thisWeekTodos) . ''; echo '' . html::a(inlink('todo', "date=lastweek"), $lang->todo->lastWeekTodos) . ''; echo ''. html::a(inlink('todo', "date=thismonth"), $lang->todo->thismonthTodos). ''; @@ -28,13 +28,13 @@ echo '' . html::a(inlink('todo', "date=future"), $lang->todo->futureTodos) . ''; echo '' . html::a(inlink('todo', "date=all"), $lang->todo->allDaysTodos) . ''; echo '' . html::a(inlink('todo', "date=before&account={$app->user->account}&status=undone"), $lang->todo->allUndone) . ''; - echo "" . html::input('date', $date,"class='select-2 date'") . ''; + echo "" . html::input('date', $date,"class='select-2 date' onchange=changeDate(this.value)") . ''; ?>
export, '', 'class="export"'); + common::printLink('todo', 'export', "account=$account&orderBy=id_desc", $lang->export, '', 'class="w-date"'); common::printLink('todo', 'batchCreate', "", $lang->todo->batchCreate); echo html::a($this->createLink('todo', 'create', "date=$date"), $lang->todo->create); ?> diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php index 1934ad3cfd..91d8307f52 100755 --- a/module/product/view/dynamic.html.php +++ b/module/product/view/dynamic.html.php @@ -52,7 +52,7 @@
- +
idAB);?> bug->story);?>actions;?>bug->story);?>actions;?> openedByAB);?>
show();?>
show();?>
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 4ec2ef359d..9ce5332a13 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -58,6 +58,6 @@ - show();?> + show();?> diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php index a6c236d465..5c543b7723 100644 --- a/module/release/lang/zh-cn.php +++ b/module/release/lang/zh-cn.php @@ -19,6 +19,7 @@ $lang->release->browse = "浏览发布"; $lang->release->confirmDelete = "您确认删除该release吗?"; $lang->release->basicInfo='基本信息'; +$lang->release->create ='创建版本'; $lang->release->id = 'ID'; $lang->release->product = '产品';