From a99bc96a49ce499ad102792224ab95edae8cf3f5 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Wed, 20 Feb 2013 02:42:10 +0000 Subject: [PATCH] * finish task#1089. --- module/bug/view/batchedit.html.php | 4 ++-- module/story/css/batchcreate.css | 1 - module/story/lang/en.php | 1 - module/story/lang/zh-cn.php | 1 - module/story/view/batchclose.html.php | 2 +- module/story/view/batchcreate.html.php | 13 ++++--------- module/story/view/batchedit.html.php | 8 ++++---- module/task/view/batchcreate.html.php | 2 +- module/testcase/css/batchcreate.css | 1 - module/testcase/lang/en.php | 1 - module/testcase/lang/zh-cn.php | 1 - module/testcase/view/batchcreate.html.php | 13 ++++--------- module/todo/css/batchcreate.css | 2 ++ module/todo/view/batchcreate.html.php | 4 ++-- module/todo/view/batchedit.html.php | 12 ++++++------ module/user/view/batchcreate.html.php | 2 +- 16 files changed, 27 insertions(+), 41 deletions(-) diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index af90affd06..760b691d30 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -19,7 +19,7 @@ bug->type;?> bug->severityAB;?> bug->pri;?> - bug->title;?> + bug->title;?> bug->assignedTo;?> bug->status;?> bug->resolvedByAB;?> @@ -40,7 +40,7 @@ id]", $lang->bug->typeList, $bug->type, 'class=select-1');?> id]", (array)$lang->bug->severityList, $bug->severity, 'class=select-1');?> id]", (array)$lang->bug->priList, $bug->pri, 'class=select-1');?> - id]", $bug->title, 'class=text-1'); echo "*";?> + id]", $bug->title, 'class=text-1');?> id]", $users, $bug->assignedTo, 'class=select-1');?> id]", (array)$lang->bug->statusList, $bug->status, 'class=select-1');?> id]", $users, $bug->resolvedBy, 'class=select-1');?> diff --git a/module/story/css/batchcreate.css b/module/story/css/batchcreate.css index 5468bcc6c8..1fce6d5599 100644 --- a/module/story/css/batchcreate.css +++ b/module/story/css/batchcreate.css @@ -1,4 +1,3 @@ -.text-1, .select-1{height:30px} .w-300px{width:300px} .w-280px{width:280px} .w-180px{width:180px} diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 9e5f31bb74..e62640dbfd 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -163,7 +163,6 @@ $lang->story->affectedBugs = 'Affected bugs'; $lang->story->affectedCases = 'Affected cases'; $lang->story->specTemplate = "Recommend template:：As <a type of user>,I want <some goals>,so that <some reason>."; -$lang->story->notes = "(notes:if the title is empty, it is no use)"; $lang->story->needNotReview = "needn't review"; $lang->story->afterSubmit = "After created"; $lang->story->successSaved = "Successfully saved"; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 848d112d4a..dbacacfe3e 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -163,7 +163,6 @@ $lang->story->affectedBugs = '影响的Bug'; $lang->story->affectedCases = '影响的用例'; $lang->story->specTemplate = "建议参考的模板：作为一名<某种类型的用户>，我希望<达成某些目的>，这样可以<开发的价值>。"; -$lang->story->notes = '(注：如果“需求名称”为空，则表示不使用此行)'; $lang->story->needNotReview = '不需要评审'; $lang->story->afterSubmit = "添加之后"; $lang->story->successSaved = "需求成功添加，"; diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index ce877c907b..4da433d750 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -52,7 +52,7 @@ - id]", '', "rows='1' class='area-1'");?> + id]", '', "class='area-1'");?> diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index d26d40ca88..913b3760ff 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -18,7 +18,7 @@ idAB;?> story->module;?> story->plan;?> - story->title;?> + story->title;?> story->spec;?> story->pri;?> story->estimate;?> @@ -31,19 +31,14 @@ - *";?> - + + story->priList, $pri, 'class=select-1');?> story->reviewList, 0, "class='text-1'");?> - - -
story->notes;?>
-
- - + diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 83e57b57d7..7add3b986e 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -16,7 +16,7 @@ story->common . $lang->colon . $lang->story->batchEdit;?> idAB;?> - story->title;?> + story->title;?> story->estimateAB;?> priAB;?> story->module;?> @@ -30,8 +30,8 @@ id . html::hidden("storyIDList[$story->id]", $story->id);?> - id]", $story->title, 'class=text-1'); echo "*";?> - id]", $story->estimate, 'class=text-1'); echo "*";?> + id]", $story->title, 'class=text-1'); ?> + id]", $story->estimate, 'class=text-1'); ?> id]", (array)$lang->story->priList, $story->pri, 'class=select-1');?> id]", $moduleOptionMenus[$story->product], $story->module, 'class=select-1');?> id]", $productPlans[$story->product], $story->plan, 'class=select-1');?> @@ -63,7 +63,7 @@ - id]", $lang->story->reasonList, $story->closedReason, 'class="w-60px" disabled="disabled"');?> +
id]", $lang->story->reasonList, $story->closedReason, 'class="w-60px" disabled="disabled"');?>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 27a5ebf4fd..3512d20445 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -41,7 +41,7 @@ task->typeList, $type, 'class=select-1');?> - + task->priList, $pri, 'class=select-1');?> diff --git a/module/testcase/css/batchcreate.css b/module/testcase/css/batchcreate.css index cbefbcd7df..d834da99d9 100644 --- a/module/testcase/css/batchcreate.css +++ b/module/testcase/css/batchcreate.css @@ -1,4 +1,3 @@ -.text-1, .select-1{height:30px} .w-300px{width:300px} .w-180px{width:180px} .half-left {text-align:right} diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index ab8f8b1dc0..e77a02065e 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -101,7 +101,6 @@ $lang->testcase->legendVersion = 'Versions'; $lang->testcase->confirmDelete = 'Are you sure to delete this case?'; $lang->testcase->same = 'The same as above'; -$lang->testcase->notes = '(Notes: the type and title must be written, otherwise it is no use)'; $lang->testcase->priList[3] = 3; $lang->testcase->priList[1] = 1; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 58f9f00e41..8d849b832f 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -101,7 +101,6 @@ $lang->testcase->legendVersion = '版本历史'; $lang->testcase->confirmDelete = '您确认要删除该测试用例吗？'; $lang->testcase->same = '同上'; -$lang->testcase->notes = '(注：“用例类型”和“用例标题”必须填写，否则此行无效)'; $lang->testcase->priList[3] = 3; $lang->testcase->priList[1] = 1; diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index be9ae661c0..c6a8ca2ddd 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -21,7 +21,7 @@ testcase->module;?> testcase->type;?> testcase->story;?> - testcase->title;?> + testcase->title;?> testcase->batchCreate; $i++):?> testcase->same; if($i != 0) $currentModuleID = 'same';?> @@ -31,17 +31,12 @@ - testcase->typeList, $type, "class=select-1"); echo "*";?> + testcase->typeList, $type, "class=select-1");?> - *";?> + - - -
testcase->notes;?>
-
- - + diff --git a/module/todo/css/batchcreate.css b/module/todo/css/batchcreate.css index 58d667d613..a13856fb35 100755 --- a/module/todo/css/batchcreate.css +++ b/module/todo/css/batchcreate.css @@ -2,3 +2,5 @@ .half-right{text-align:left} .nameBox .f-left {margin-left:20px} .select-2 {width: 75px} +.text-1, .select-1{width:98%} +select {border:1px solid #ccc} diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index d246cdd107..d458764f98 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -20,7 +20,7 @@ idAB;?> todo->type;?> todo->pri;?> - todo->name;?> + todo->name;?> todo->desc;?> todo->beginAndEnd;?> @@ -35,7 +35,7 @@
- + todo->batchEdit . $lang->colon;?> idAB;?> - todo->date;?> + todo->date;?> todo->type;?> todo->pri;?> - todo->name;?> - todo->beginAndEnd;?> + todo->name;?> + todo->beginAndEnd;?> id . html::hidden("todoIDList[$todo->id]", $todo->id);?> - id]", $todo->date, "class='text-1 date'");?> + id]", $todo->date, "class='text-2 date'");?> id]", $lang->todo->typeList, $todo->type, "onchange=loadList(this.value,$todo->id) class='select-1'");?> id]", $lang->todo->priList, $todo->pri, 'class=select-1');?> - +
type == 'custom') { - echo html::input("names[$todo->id]", $todo->name, "class='f-left text-1'"); echo "*"; + echo html::input("names[$todo->id]", $todo->name, "class='f-left text-1'"); ; } elseif($todo->type == 'task') { diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 59e66ac9d6..56ac4c01bc 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -48,7 +48,7 @@ - +