diff --git a/module/execution/css/story.css b/module/execution/css/story.css index 5189f5adf3..a1edd4dc01 100644 --- a/module/execution/css/story.css +++ b/module/execution/css/story.css @@ -7,5 +7,5 @@ tbody > tr > td > .btn-icon {margin-right: 4px;} @media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};} #batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;} th.c-pri{width:50px;} -.c-estimate {width: 40px;} -.c-status {width: 80px;} +.c-estimate {width: 50px;} +.c-status, .c-user {width: 80px;} diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index d85a6b72c7..77630ddbbd 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -19,3 +19,8 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;} .chosen-results > li.has-new-task {position: relative; color: #388E3C;} .chosen-results > li.has-task.highlighted, .chosen-results > li.has-new-task.highlighted {color: #fff;} + +.c-id {width: 30px;} +.c-module {width: 150px;} +.c-story {width: 200px;} +.c-assigned {width: 130px;} diff --git a/module/task/css/batchedit.css b/module/task/css/batchedit.css index e69de29bb2..dd7e102439 100644 --- a/module/task/css/batchedit.css +++ b/module/task/css/batchedit.css @@ -0,0 +1,4 @@ +.c-id {width: 50px;} +.c-pri, .c-record, .c-left {width: 70px;} +.c-reason {width: 100px;} +.c-module, .c-assigned {width: 150px;} diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index a5e48df001..dd91695c77 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -59,19 +59,19 @@ - - + + type != 'ops'):?> - + - - - - - - - + + + + + + + task->getFlowExtendFields(); foreach($extendFields as $extendField) echo ""; diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index f67a02544b..dc5831d118 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -53,25 +53,25 @@ js::set('dittoNotice', $dittoNotice);
idAB;?>'>task->module?>idAB;?>'>task->module?> '>task->story;?>'>task->story;?> task->name;?>typeAB;?>'>task->assignedTo;?>'>task->estimateAB;?>'>task->estStarted;?>'>task->deadline;?>'>task->desc;?>'>task->pri;?>typeAB;?>'>task->assignedTo;?>'>task->estimateAB;?>'>task->estStarted;?>'>task->deadline;?>'>task->desc;?>'>task->pri;?> {$extendField->name}
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + task->getFlowExtendFields(); - foreach($extendFields as $extendField) echo ""; + foreach($extendFields as $extendField) echo ""; ?> diff --git a/module/testcase/css/batchcreate.css b/module/testcase/css/batchcreate.css index 92f393bbbe..2704eb6794 100644 --- a/module/testcase/css/batchcreate.css +++ b/module/testcase/css/batchcreate.css @@ -7,3 +7,10 @@ #batchCreateForm .input-group .form-control {position: static;} #batchCreateForm .input-group .colorpicker {z-index: 2;} #batchCreateForm .input-group .colorpicker.open {z-index: 5;} + +.c-id {width: 50px;} +.c-pri, .c-keywords, .c-review {width: 100px;} +.c-branch, .c-type {width: 120px;} +.c-stage {width: 140px;} +.c-precondition {width: 150px;} +.c-story {width: 180px;} diff --git a/module/testcase/css/batchedit.css b/module/testcase/css/batchedit.css index 955a3a318f..59b39fd42f 100644 --- a/module/testcase/css/batchedit.css +++ b/module/testcase/css/batchedit.css @@ -5,3 +5,10 @@ #batchEditForm .input-group .form-control {position: static;} #batchEditForm .input-group .colorpicker {z-index: 2;} #batchEditForm .input-group .colorpicker.open {z-index: 5;} + +.c-id {width: 50px;} +.c-pri, .c-keywords, .c-review {width: 100px;} +.c-branch, .c-type {width: 120px;} +.c-stage {width: 140px;} +.c-precondition {width: 150px;} +.c-story {width: 180px;} diff --git a/module/testcase/css/bugs.css b/module/testcase/css/bugs.css index 1d5b4e6a4f..08a8efda8a 100644 --- a/module/testcase/css/bugs.css +++ b/module/testcase/css/bugs.css @@ -1,3 +1,5 @@ body {background: white;} .bugsList {padding: 10px;} .bugsList .table {border: 1px solid #ddd;} +.c-id {width: 50px;} +.c-user {width: 70px;} diff --git a/module/testcase/css/groupcase.css b/module/testcase/css/groupcase.css index 57a1fd1342..d71fbef76d 100644 --- a/module/testcase/css/groupcase.css +++ b/module/testcase/css/groupcase.css @@ -1,2 +1,4 @@ .title {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;} .group-header > a {line-height: 20px; display: block; max-height: 40px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden;} +.c-result {width: 80px;} +.c-bugs, .c-results, .c-steps {width: 30px;} diff --git a/module/testcase/css/showimport.css b/module/testcase/css/showimport.css index df3757a2cf..7a11ac000c 100644 --- a/module/testcase/css/showimport.css +++ b/module/testcase/css/showimport.css @@ -1 +1,6 @@ .table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;} +.c-line-number {width: 50px;} +.c-id {width: 40px;} +.c-story, .c-module, .c-type {width: 120px;} +.c-stage {width: 160px;} +.c-step {width: 300px;} diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 05f0f85b68..3d4079aef9 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -53,20 +53,20 @@
idAB;?>'>task->name?>'>task->module?>'>task->assignedTo;?>typeAB;?>'>task->status;?>'>task->estStarted?>'>task->deadline?>'>task->pri;?>'>task->estimateAB;?>'>task->consumedThisTime;?>'>task->leftAB?>'>task->finishedBy;?>'>task->canceledBy;?>'>task->closedBy;?>'>task->closedReason;?>idAB;?>'>task->name?>'>task->module?>'>task->assignedTo;?>typeAB; ?>'>task->status;?>'>task->estStarted?>'>task->deadline?>'>task->pri;?>'>task->estimateAB;?>'>task->consumedThisTime;?>'>task->leftAB?>'>task->finishedBy;?>'>task->canceledBy;?>'>task->closedBy;?>'>task->closedReason;?> {$extendField->name}{$extendField->name}
- - - - + + + + - - - - - - + + + + + + testcase->getFlowExtendFields(); - foreach($extendFields as $extendField) echo ""; + foreach($extendFields as $extendField) echo ""; ?> diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index 08c74c303a..4474520799 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -44,22 +44,22 @@
idAB;?>'>product->branch;?>'>testcase->module;?>'> testcase->story;?>idAB;?>'>product->branch;?>'>testcase->module;?>'> testcase->story;?> testcase->title;?>testcase->type;?>'>testcase->pri;?>'>testcase->precondition;?>'>testcase->keywords;?>'>testcase->stage;?>'>testcase->review;?>testcase->type;?>'>testcase->pri;?>'>testcase->precondition;?>'>testcase->keywords;?>'>testcase->stage;?>'>testcase->review;?> {$extendField->name}{$extendField->name}
- - - + + + - + - - + + - + - - + + testcase->getFlowExtendFields(); - foreach($extendFields as $extendField) echo ""; + foreach($extendFields as $extendField) echo ""; ?> diff --git a/module/testcase/view/bugs.html.php b/module/testcase/view/bugs.html.php index 2d8e3c48e4..84da9259f5 100644 --- a/module/testcase/view/bugs.html.php +++ b/module/testcase/view/bugs.html.php @@ -7,14 +7,14 @@
idAB;?>'>priAB;?>'>statusAB;?>idAB;?>'>priAB;?>'>statusAB;?> '>testcase->branch;?>'>testcase->branch;?> '>testcase->module;?>'>testcase->story;?>'>testcase->module;?>'>testcase->story;?> testcase->title;?>testcase->type;?>testcase->type;?> '>testcase->precondition;?>'>testcase->keywords;?>'>testcase->stage;?>'>testcase->keywords;?>'>testcase->stage;?> {$extendField->name}{$extendField->name}
- + - - - - - - + + + + + + diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index 88a1f876b6..2da8cdcdb6 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -35,16 +35,16 @@ - + - - - - - - - - + + + + + + + + diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php index 3b02661ad4..189705a9db 100644 --- a/module/testcase/view/importfromlib.html.php +++ b/module/testcase/view/importfromlib.html.php @@ -34,13 +34,13 @@ idAB);?> - + - + - - - + + + diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php index 96639df73a..0bd00d0d17 100644 --- a/module/testcase/view/linkcases.html.php +++ b/module/testcase/view/linkcases.html.php @@ -32,12 +32,12 @@ idAB;?> - + - - - + + + diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index 54119d7df1..d52eb25916 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -30,21 +30,21 @@ $(function()
idAB;?>idAB;?> bug->title;?> priAB;?>bug->type;?>statusAB;?>bug->assignedTo;?>bug->resolvedBy;?>bug->resolution;?> priAB;?>bug->type;?>statusAB;?>bug->assignedTo;?>bug->resolvedBy;?>bug->resolution;?>
idAB;?> priAB;?> priAB;?> testcase->title;?> typeAB;?> testtask->lastRunAccount;?>testtask->lastRunTime;?> testtask->lastRunResult;?> testcase->status;?>testcase->bugsAB;?>testcase->resultsAB;?>testcase->stepNumberAB;?> typeAB;?> testtask->lastRunAccount;?>testtask->lastRunTime;?> testtask->lastRunResult;?> testcase->status;?>testcase->bugsAB;?>testcase->resultsAB;?>testcase->stepNumberAB;?> actions;?>
testcase->branch ?>testcase->branch ?> priAB);?> priAB);?> testcase->title);?>testcase->fromModule ?>testcase->module ?>testcase->type)?>testcase->fromModule ?>testcase->module ?>testcase->type)?>
priAB;?>priAB;?> testcase->product;?> testcase->title;?>testcase->type;?>openedByAB;?>statusAB;?>testcase->type;?>openedByAB;?>statusAB;?>
- - + + - - - - - + + + + + - + -
lineNumber?>idAB?>lineNumber?>idAB?> testcase->title?>testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->stage?>testcase->module?>testcase->story?>testcase->pri?>testcase->type?>testcase->stage?> testcase->precondition?> testcase->{$appendField->field}?>testcase->{$appendField->field}?> + diff --git a/module/testtask/css/browse.css b/module/testtask/css/browse.css index 3439ccadb6..c68ac80a50 100644 --- a/module/testtask/css/browse.css +++ b/module/testtask/css/browse.css @@ -1,2 +1,3 @@ #taskList tbody>tr>td, #taskList thead>tr>th {white-space: nowrap;} td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.c-name {width: 200px;} diff --git a/module/testtask/css/linkcase.css b/module/testtask/css/linkcase.css index 34831568df..02b3b0cf79 100644 --- a/module/testtask/css/linkcase.css +++ b/module/testtask/css/linkcase.css @@ -1,2 +1,3 @@ td.title {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} -.main-table .table-header {box-shadow: none;} \ No newline at end of file +.main-table .table-header {box-shadow: none;} +.c-version, .c-result {width: 80px;} diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index 47294aecae..c43420bb66 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -66,15 +66,15 @@ $status = $this->session->testTaskVersionStatus; recTotal}&recPerPage={$pager->recPerPage}"; ?> - - - - - - - - - + + + + + + + + + testtask->getFlowExtendFields(); foreach($extendFields as $extendField) echo ""; diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 5d12f62fa1..357f653f2d 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -83,14 +83,14 @@ idAB;?> - + - - - + + +
testcase->stepDesc?>
idAB);?>testtask->name);?> testtask->product);?> testtask->execution);?> testtask->build);?> testtask->owner);?>testtask->begin);?>testtask->end);?> statusAB);?> idAB);?> testtask->name);?> testtask->product);?> testtask->execution);?> testtask->build);?> testtask->owner);?> testtask->begin);?> testtask->end);?>statusAB);?> {$extendField->name} testtask->linkVersion;?>testtask->linkVersion;?> priAB;?> testcase->title;?> testcase->type;?> openedByAB;?>testtask->lastRunAccount;?>testtask->lastRunTime;?>testtask->lastRunResult;?>testtask->lastRunAccount;?>testtask->lastRunTime;?>testtask->lastRunResult;?> statusAB;?>