diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 58da695603..c1c1a10455 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -56,7 +56,7 @@ '>bug->steps;?> '>typeAB;?> '>bug->pri;?> - '>bug->severity;?> + '>bug->severity;?> '>bug->os;?> '>bug->browser;?> '>bug->keywords;?> @@ -110,8 +110,8 @@ '> '> ' style='overflow:visible'> bug->typeList, $type, "class='form-control chosen'");?> - ' style='overflow:visible'> bug->priList, $pri, "class='form-control chosen'");?> - ' style='overflow:visible'>bug->severityList, '', "class='form-control chosen'");?> + ' style='overflow:visible'> bug->priList, $pri, "class='form-control'");?> + ' style='overflow:visible'>bug->severityList, '', "class='form-control'");?> ' style='overflow:visible'> bug->osList, $os, "class='form-control chosen'");?> ' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?> '> @@ -152,8 +152,8 @@ '> '> ' style='overflow:visible'> bug->typeList, $type, "class='form-control chosen'");?> - ' style='overflow:visible'> bug->priList, $pri, "class='form-control chosen'");?> - ' style='overflow:visible'>bug->severityList, '', "class='form-control chosen'");?> + ' style='overflow:visible'> bug->priList, $pri, "class='form-control'");?> + ' style='overflow:visible'>bug->severityList, '', "class='form-control'");?> ' style='overflow:visible'> bug->osList, $os, "class='form-control chosen'");?> ' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?> '> @@ -197,8 +197,8 @@ '> '> ' style='overflow:visible'> bug->typeList, $type, "class='form-control chosen'");?> - ' style='overflow:visible'> bug->priList, '', "class='form-control chosen'");?> - ' style='overflow:visible'>bug->severityList, '', "class='form-control chosen'");?> + ' style='overflow:visible'> bug->priList, '', "class='form-control'");?> + ' style='overflow:visible'>bug->severityList, '', "class='form-control'");?> ' style='overflow:visible'> bug->osList, $os, "class='form-control chosen'");?> ' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?> '> diff --git a/module/file/lang/zh-cn.php b/module/file/lang/zh-cn.php index 6b95ecc6fc..e68692e6c5 100644 --- a/module/file/lang/zh-cn.php +++ b/module/file/lang/zh-cn.php @@ -35,7 +35,7 @@ $lang->file->pathname = '路径'; $lang->file->title = '标题'; $lang->file->fileName = '文件名'; $lang->file->untitled = '未命名'; -$lang->file->extension = '扩展名'; +$lang->file->extension = '文件类型'; $lang->file->size = '大小'; $lang->file->encoding = '编码'; $lang->file->addedBy = '由谁添加'; diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php index 45e99f35a9..aa7ddff0fa 100644 --- a/module/file/view/buildform.html.php +++ b/module/file/view/buildform.html.php @@ -1,5 +1,8 @@ - +
diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index 877b99ebf5..604c144172 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -11,6 +11,8 @@ .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;} .dropdown-list > li > a:hover, .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} +.fail span{color:#f00} +.blocked span{color:#000} .pl-5px{padding-left:5px;} diff --git a/module/testcase/model.php b/module/testcase/model.php index d3f9a51924..fd5411bacf 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1378,7 +1378,7 @@ class testcaseModel extends model echo "$stages"; break; case 'status': - $case->needconfirm ? print(" {$this->lang->story->changed}") : print("{$this->lang->testcase->statusList[$case->status]}"); + $case->needconfirm ? print("{$this->lang->story->changed}") : print("{$this->lang->testcase->statusList[$case->status]}"); break; case 'story': static $stories = array();