diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 74b4d7509e..a9e87064b4 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -53,7 +53,7 @@
bug->legendSteps;?> -
steps);?>
+
steps);?>
bug->legendAttatch;?> diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 1831d69608..0ec0b0cefd 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -60,7 +60,8 @@ $lang->actions = 'Actions'; $lang->comment = 'Comment'; $lang->history = 'History'; $lang->attatch = 'Attatch'; -$lang->reverse = '(Reverse)'; +$lang->reverse = '[Reverse]'; +$lang->switchDisplay= '[Toggle Show]'; $lang->addFiles = 'Add Files'; $lang->files = 'Files '; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 55fc63adf3..8d6146d0e5 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -60,7 +60,8 @@ $lang->actions = '操作'; $lang->comment = '备注'; $lang->history = '历史记录'; $lang->attatch = '附件'; -$lang->reverse = '(切换顺序)'; +$lang->reverse = '[切换顺序]'; +$lang->switchDisplay= '[切换显示]'; $lang->addFiles = '上传了附件 '; $lang->files = '附件 '; diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index 76025caa2b..7bbcd71172 100644 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -4,10 +4,16 @@
- history . $lang->reverse;?> + + history . $lang->reverse;?> + switchDisplay;?> + - +
history . $lang->reverse;?> + history . $lang->reverse;?> + switchDisplay;?> +
@@ -21,10 +27,10 @@ ?> action->printAction($action);?> comment) or !empty($action->history)):?> -
-
action->printChanges($action->objectType, $action->history);?>
+ comment)) echo "
";?> +
action->printChanges($action->objectType, $action->history);?>
comment and $action->history) echo '
'; echo nl2br($action->comment);?> -
+ comment)) echo "
";?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 76e1e28ac4..ef480ce237 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -277,12 +277,14 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #switcher {color:white; font-style:bold; background:red; cursor:pointer;} /* ҳԪء*/ -.history {border:1px solid #ccc; background:#f2f2f2; padding:10px; margin-top:10px; margin-bottom:10px; color:#333; line-height:20px;} +.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} .content {font-size:14px; padding:10px} .roadmap {width:200px; margin:10px auto 10px auto; padding:10px; border:1px solid gray;} .roadmap a{color:white;} .release {background:darkgreen; color:white} .plan {background:#9F9F5F;} +.steps {line-height:22px; font-size:14px} /* ҳš*/ #footer {width:100%; position:fixed; bottom:0; left:0; margin:0; color:#333; background-color:#CEE7F3; border-top:1px solid #59AED7;}