From db94d8252c190376c150337bd5a68239721172b4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 17 Sep 2015 11:11:40 +0800 Subject: [PATCH] * adjust for create page of bug,story,task,testcase. --- module/bug/css/create.css | 3 +++ module/bug/view/create.html.php | 22 +++++++++++-------- module/file/control.php | 3 ++- module/productplan/model.php | 2 +- module/story/css/create.css | 3 +++ module/story/js/create.js | 1 - module/story/view/create.html.php | 24 ++++++++++++++------ module/task/css/create.css | 4 ++++ module/task/view/create.html.php | 33 ++++++++++++++++------------ module/testcase/css/create.css | 3 +++ module/testcase/view/create.html.php | 18 ++++++++++----- 11 files changed, 78 insertions(+), 38 deletions(-) diff --git a/module/bug/css/create.css b/module/bug/css/create.css index 87f3809f1a..e34aa1f98b 100644 --- a/module/bug/css/create.css +++ b/module/bug/css/create.css @@ -16,3 +16,6 @@ #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important} #openedBuild_chosen.chosen-container .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important} + +.row .col-sm-8{width:75%;} +.row .col-sm-4{padding-left:0px; width:25%;} diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 96ddada8f8..4832d5ca22 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -77,14 +77,6 @@ js::set('refresh', $lang->refresh); unset($lang->bug->typeList['trackthings']); echo html::select('type', $lang->bug->typeList, $type, "class='form-control'"); ?> - bug->pri?> - bug->priList, $severity, "class='form-control'");?> - bug->severity?> - bug->severityList, $severity, "class='form-control'");?> - - - -
bug->os?> bug->osList, $os, "class='form-control'");?> bug->browser?> @@ -94,7 +86,19 @@ js::set('refresh', $lang->refresh); bug->title;?> - + +
+
+
+
+ bug->pri?> + bug->priList, $severity, "class='form-control'");?> + bug->severity?> + bug->severityList, $severity, "class='form-control'");?> +
+
+
+ bug->steps;?> diff --git a/module/file/control.php b/module/file/control.php index def0a79bf1..386a1ea8d4 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -204,8 +204,9 @@ class file extends control */ public function sendDownHeader($fileName, $fileType, $content) { + /* Clean the ob content to make sure no space or utf-8 bom output. */ $obLevel = ob_get_level(); - for($i = 0; $i < $obLevel; $i++) ob_end_clean(); // clean the ob content to make sure no space or utf-8 bom output. + for($i = 0; $i < $obLevel; $i++) ob_end_clean(); /* Set the downloading cookie, thus the export form page can use it to judge whether to close the window or not. */ setcookie('downloading', 1); diff --git a/module/productplan/model.php b/module/productplan/model.php index 284f138ee0..16850378e8 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -85,7 +85,7 @@ class productplanModel extends model public function getPairs($product = 0, $expired = '') { $date = date('Y-m-d'); - return array('' => '') + $this->dao->select('id,CONCAT(title, " (", begin, " ~ ", end, ")") as title')->from(TABLE_PRODUCTPLAN) + return array('' => '') + $this->dao->select('id,CONCAT(title, " [", begin, " ~ ", end, "]") as title')->from(TABLE_PRODUCTPLAN) ->where('product')->in($product) ->andWhere('deleted')->eq(0) ->beginIF($expired == 'unexpired') diff --git a/module/story/css/create.css b/module/story/css/create.css index 935c7a68ab..099514a464 100644 --- a/module/story/css/create.css +++ b/module/story/css/create.css @@ -1,3 +1,6 @@ #mailto {width:90.3%} select {border:1px solid #ccc} #module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important} + +.row .col-sm-10{width:89%} +.row .col-sm-2{padding-left:0px; width:11%} diff --git a/module/story/js/create.js b/module/story/js/create.js index 45592f2f9d..bad3c11473 100644 --- a/module/story/js/create.js +++ b/module/story/js/create.js @@ -9,7 +9,6 @@ $(function() $('#assignedTo').removeAttr('disabled'); } $('#assignedTo').trigger("chosen:updated"); - $('#assignedTo_chosen').width(150); }) $('#needNotReview').change(function() diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index bbd97a0a29..d412182c6c 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -68,8 +68,13 @@ - story->pri;?> - story->priList, $pri, "class='form-control'");?> + story->reviewedBy;?> + +
+ PO : '', "class='form-control chosen'");?> + story->needNotReview, '', "id='needNotReview' {$needReview}");?> +
+
story->estimate;?> @@ -81,11 +86,16 @@ story->title;?> -
- - story->reviewedBy?> - PO : '', "class='form-control chosen'");?> - story->needNotReview, '', "id='needNotReview' {$needReview}");?> +
+
+ +
+
+
+ story->pri?> + story->priList, $pri, "class='form-control'");?> +
+
diff --git a/module/task/css/create.css b/module/task/css/create.css index 9d64549f55..55a19185ae 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -1 +1,5 @@ .input-group-btn {width: 0.01%} +.input-group-btn #copyButton{margin-top: -5px;} + +.row .col-sm-8{width:76%} +.row .col-sm-2{padding-left:0px; width:12%} diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index fa86bb081f..2a9b1a0769 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -51,9 +51,25 @@ task->name;?> -
- name, "class='form-control'");?> - task->copyStoryTitle;?> +
+
+
+ name, "class='form-control'");?> + task->copyStoryTitle;?> +
+
+
+
+ task->pri;?> + task->priList, $task->pri, 'class=form-control');?> +
+
+
+
+ task->estimate;?> + estimate, "class='form-control' autocomplete='off' placeholder='{$lang->task->hour}'")?> +
+
@@ -61,17 +77,6 @@ task->desc;?> desc, "rows='10' class='form-control'");?> - - task->pri;?> - task->priList, $task->pri, 'class=form-control');?> - -
- task->estimate;?> - estimate, "class='form-control'")?> - task->hour;?> -
-
task->estimateTip?>
- task->estStarted;?> estStarted, "class='form-control form-date'");?> diff --git a/module/testcase/css/create.css b/module/testcase/css/create.css index 5845b45cc4..3a5fca4722 100644 --- a/module/testcase/css/create.css +++ b/module/testcase/css/create.css @@ -15,3 +15,6 @@ #story_chosen .chosen-results > li.no-results:hover {color: #1a4f85; background-color: #ddd;} #story_chosen .chosen-results > li.no-results > span {font-weight: bold;} #module_chosen .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important} + +.row .col-sm-10{width:89%;} +.row .col-sm-2{padding-left:0px; width:11%;} diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 52f2cb2bec..9c6ad59de3 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -55,10 +55,6 @@
- - testcase->pri;?> - testcase->priList, $pri, "class='form-control'");?> - testcase->lblStory;?> @@ -76,7 +72,19 @@ testcase->title;?> - + +
+
+ +
+
+
+ testcase->pri;?> + testcase->priList, $pri, "class='form-control'");?> +
+
+
+ testcase->precondition;?>