diff --git a/module/testtask/js/edit.js b/module/testtask/js/edit.js index 6ab890c270..ae6af5abce 100755 --- a/module/testtask/js/edit.js +++ b/module/testtask/js/edit.js @@ -24,3 +24,15 @@ function loadProjectBuilds(projectID) link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild); $('#buildBox').load(link, function(){$('#build').chosen(defaultChosenOptions);}); } + +$(function() +{ + var adjustPriBoxWidth = function() + { + var boxWidth = $('#ownerAndPriBox').width(); + var beginWidth = $("input[name='begin']").outerWidth(); + var addonWidth = $('#ownerAndPriBox .input-group-addon').outerWidth(); + $('#pri').css('width', boxWidth - beginWidth -addonWidth); + }; + adjustPriBoxWidth();//Adjust testtask pri box width. +}) diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php index a68393c535..abf2971040 100644 --- a/module/testtask/view/close.html.php +++ b/module/testtask/view/close.html.php @@ -23,10 +23,6 @@
- - - - diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index 7f672be158..67486284ea 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -25,7 +25,9 @@
testtask->report;?>
comment;?>
- + @@ -34,19 +36,23 @@ - - - - - + - - - - - + @@ -60,10 +66,6 @@ - - - -
testtask->project;?>project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?> + project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?> + product)?>
testtask->owner;?>owner, "class='form-control chosen'");?>
testtask->pri;?>testtask->priList, $task->pri, "class='form-control'");?> +
+ owner, "class='form-control chosen'");?> + testtask->pri;?> + testtask->priList, $task->pri, "class='form-control'");?> +
+
testtask->begin;?>begin, "class='form-control form-date'");?>
testtask->end;?>end, "class='form-control form-date'");?> +
+ begin, "class='form-control form-date'");?> + testtask->end;?> + end, "class='form-control form-date'");?> +
+
testtask->status;?>testtask->desc;?> desc), "rows=10 class='form-control'");?>
testtask->report;?>report), "rows=10 class='form-control'");?>
testtask->mailto;?> diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index 6b625cbb18..206bac0a63 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -60,10 +60,6 @@ testtask->legendDesc;?>
desc;?>
-
- testtask->legendReport;?> -
report;?>
-