diff --git a/module/common/lang/en.php b/module/common/lang/en.php index c5fc7120b6..e76267ae06 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -53,6 +53,8 @@ $lang->switchDisplay= '[Toggle Show]'; $lang->switchHelp = 'Toggle Help'; $lang->addFiles = 'Add Files'; $lang->files = 'Files '; +$lang->unfold = '+'; +$lang->fold = '-'; $lang->selectAll = 'Select All'; $lang->notFound = 'Sorry, the object not found.'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index f5841bf2b9..ab34ec0ff5 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -53,6 +53,8 @@ $lang->switchDisplay= '[切换显示]'; $lang->switchHelp = '切换帮助'; $lang->addFiles = '上传了附件 '; $lang->files = '附件 '; +$lang->unfold = '+'; +$lang->fold = '-'; $lang->selectAll = '全选'; $lang->notFound = '抱歉,您访问的对象并不存在!'; @@ -110,6 +112,7 @@ $lang->my->menu->project = '我的项目|my|project|'; $lang->my->menu->profile = array('link' => '我的档案|my|profile|', 'alias' => 'editprofile'); $lang->todo->menu = $lang->my->menu; + /* 产品视图设置。*/ $lang->product->menu->list = '%s'; $lang->product->menu->story = array('link' => '需求列表|product|browse|productID=%s', 'subModule' => 'story'); diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index 7bbcd71172..9408bd8827 100644 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -1,8 +1,23 @@ + getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> -
+
history . $lang->reverse;?> @@ -26,9 +41,12 @@ if(strpos($action->actor, ':') !== false) $action->actor = substr($action->actor, strpos($action->actor, ':') + 1); ?> action->printAction($action);?> + history)) echo html::commonButton($lang->unfold, "id=switchButton$i onclick=switchHistoryDisplay($i,this.value)");?> comment) or !empty($action->history)):?> comment)) echo "
";?> -
action->printChanges($action->objectType, $action->history);?>
+ ";?> +
action->printChanges($action->objectType, $action->history);?>
+ comment and $action->history) echo '
'; echo nl2br($action->comment);?> comment)) echo "
";?> diff --git a/module/my/control.php b/module/my/control.php index 114a76de0f..214974d80a 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -79,7 +79,7 @@ class my extends control } /* 用户的bug列表。*/ - public function bug($type = 'assignToMe', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function bug($type = 'assigntome', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { /* 登记session,加载语言。*/ $this->session->set('bugList', $this->app->getURI(true)); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index bd3af3e3a6..d2e6e97123 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -267,6 +267,7 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table /* Other items. */ .history, .changes {border:1px solid #ccc; background:#f2f2f2; padding:10px; margin-top:10px; margin-bottom:10px; color:#333; line-height:20px;} .history .changes {border:none; margin:0; padding:0} +#actionbox .button-c {font-size:9px; height:20px; padding:0 5px 0 5px} .content {font-size:14px; padding:10px} .content p {margin:0} .roadmap {width:200px; margin:10px auto 10px auto; padding:10px; border:1px solid gray;}