diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index a4262dc180..b6dfb3888c 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -42,132 +42,134 @@ } ?>
- - - - - - - - - - - - - - - - - - - - - bug->typeList['designchange']); - unset($lang->bug->typeList['newfeature']); - unset($lang->bug->typeList['trackthings']); - - $moduleOptionMenu += array('ditto' => $lang->bug->ditto); - $projects += array('ditto' => $lang->bug->ditto); - $lang->bug->typeList += array('ditto' => $lang->bug->ditto); - $lang->bug->priList += array('ditto' => $lang->bug->ditto); - $lang->bug->osList += array('ditto' => $lang->bug->ditto); - $lang->bug->browserList += array('ditto' => $lang->bug->ditto); - ?> - - - $fileName):?> - - - - - - - - + + + + + + + + + + + + + + + + +
idAB;?>'> product->branch;?> bug->module;?>'>bug->project;?>bug->openedBuild;?>bug->title;?>'>bug->deadline;?>'>bug->steps;?>'>typeAB;?>'>bug->pri;?>'>bug->severity;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>
' style='overflow:visible'>' style='overflow:visible'>' style='overflow:visible'> -
-
- -
- -
    -
  • story->colorTag;?>
    • -
- +
+ + + + + + + + + + + + + + + + + + + + + bug->typeList['designchange']); + unset($lang->bug->typeList['newfeature']); + unset($lang->bug->typeList['trackthings']); + + $moduleOptionMenu += array('ditto' => $lang->bug->ditto); + $projects += array('ditto' => $lang->bug->ditto); + $lang->bug->typeList += array('ditto' => $lang->bug->ditto); + $lang->bug->priList += array('ditto' => $lang->bug->ditto); + $lang->bug->osList += array('ditto' => $lang->bug->ditto); + $lang->bug->browserList += array('ditto' => $lang->bug->ditto); + ?> + + + $fileName):?> + + + + + + + + - - - - - - - - - - - - - - bug->batchCreate; $i++):?> - - - - - - - - + + + + + + + + + + + + + + bug->batchCreate; $i++):?> + + + + + + + + - - - - - - - - - - - - - - - - -
idAB;?>'> product->branch;?> bug->module;?>'>bug->project;?>bug->openedBuild;?>bug->title;?>'>bug->deadline;?>'>bug->steps;?>'>typeAB;?>'>bug->pri;?>'>bug->severity;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>
' style='overflow:visible'>' style='overflow:visible'>' style='overflow:visible'> +
+
+ +
+ +
    +
  • story->colorTag;?>
    • +
+ +
- - 		'>'>' 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->osList, $os, "class='form-control chosen'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?>'>
' style='overflow:visible'>' style='overflow:visible'>' style='overflow:visible'> -
-
- -
- -
    -
  • bug->colorTag;?>
    • -
- +
'>'>' 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->osList, $os, "class='form-control chosen'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?>'>
' style='overflow:visible'>' style='overflow:visible'>' style='overflow:visible'> +
+
+ +
+ +
    +
  • bug->colorTag;?>
    • +
+ +
- - 		'>'>' 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->osList, $os, "class='form-control chosen'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?>'>
- - -
+
'>'>' 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->osList, $os, "class='form-control chosen'");?>' style='overflow:visible'> bug->browserList, $browser, "class='form-control chosen'");?>'>
+ + +
+
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index f9d8694b12..87eb789aa5 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -43,109 +43,111 @@ $columns = count($visibleFields) + 2; ?> " id='batchEditForm'> -
- - - - - - - - - - - - - - - - - - - - - - - $bug):?> - product->getByID($bug->product); - - $plans = $this->loadModel('productplan')->getPairs($bug->product, $branch); - $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans; - - $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); - if($product->type != 'normal') - { - foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; - $branches = array('ditto' => $this->lang->story->ditto) + $branches; - } - } - /** - * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task. - * These thress types if upgrade from bugfree2.x. - */ - if($bug->type != 'designchange') unset($typeList['designchange']); - if($bug->type != 'newfeature') unset($typeList['newfeature']); - if($bug->type != 'trackthings') unset($typeList['trackthings']); - ?> - - - - - - + + + + + + + + + + + + + + + + + + + + +
idAB;?>'>bug->type;?>'>bug->severityAB;?>'>bug->pri;?>bug->title;?>'>bug->branch;?>'>bug->productplan;?>'>bug->assignedTo;?>'>bug->deadline;?>'>bug->status;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>'>bug->resolvedByAB;?>'>bug->resolutionAB;?>
>type, 'class=form-control');?>>severity, 'class=form-control');?>>pri, 'class=form-control');?> -
-
- title, "class='form-control' autocomplete='off' style='color:{$bug->color}'");?> -
- -
    -
  • story->colorTag;?>
    • -
- color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right' data-update-color='#titles\\[{$bugID}\\]'");?> +
+ + + + + + + + + + + + + + + + + + + + + + + + $bug):?> + product->getByID($bug->product); + + $plans = $this->loadModel('productplan')->getPairs($bug->product, $branch); + $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans; + + $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); + if($product->type != 'normal') + { + foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; + $branches = array('ditto' => $this->lang->story->ditto) + $branches; + } + } + /** + * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task. + * These thress types if upgrade from bugfree2.x. + */ + if($bug->type != 'designchange') unset($typeList['designchange']); + if($bug->type != 'newfeature') unset($typeList['newfeature']); + if($bug->type != 'trackthings') unset($typeList['trackthings']); + ?> + + + + + + - - - - - - - - - - - - - - - - - - - - -
idAB;?>'>bug->type;?>'>bug->severityAB;?>'>bug->pri;?>bug->title;?>'>bug->branch;?>'>bug->productplan;?>'>bug->assignedTo;?>'>bug->deadline;?>'>bug->status;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>'>bug->resolvedByAB;?>'>bug->resolutionAB;?>
>type, 'class=form-control');?>>severity, 'class=form-control');?>>pri, 'class=form-control');?> +
+
+ title, "class='form-control' autocomplete='off' style='color:{$bug->color}'");?> +
+ +
    +
  • story->colorTag;?>
    • +
+ color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right' data-update-color='#titles\\[{$bugID}\\]'");?> +
-
-
-
' style='overflow:visible'> - id;?> - type == 'normal') ? "disabled='disabled'" : '';?> - branch, "class='form-control chosen' $disabled");?> - ' style='overflow:visible'>plan, "class='form-control chosen'");?>' style='overflow:visible'>assignedTo, "class='form-control chosen'");?>' style='overflow:visible'>deadline, "class='form-control form-date'");?>>status, 'class=form-control');?>>os, 'class=form-control');?>>browser, 'class=form-control');?>>keywords, 'class=form-control');?>' style='overflow:visible'>resolvedBy, "class='form-control chosen'");?>> - - - - - -
resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?>' resolution != 'duplicate') echo "style='display:none'";?>> - bug->duplicateBug}'");?> -
-
- - -
+
+
' style='overflow:visible'> + id;?> + type == 'normal') ? "disabled='disabled'" : '';?> + branch, "class='form-control chosen' $disabled");?> + ' style='overflow:visible'>plan, "class='form-control chosen'");?>' style='overflow:visible'>assignedTo, "class='form-control chosen'");?>' style='overflow:visible'>deadline, "class='form-control form-date'");?>>status, 'class=form-control');?>>os, 'class=form-control');?>>browser, 'class=form-control');?>>keywords, 'class=form-control');?>' style='overflow:visible'>resolvedBy, "class='form-control chosen'");?>> + + + + + +
resolution, "class='form-control' onchange=setDuplicate(this.value,$bugID)");?>' resolution != 'duplicate') echo "style='display:none'";?>> + bug->duplicateBug}'");?> +
+
+ + +
+ diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7796a060e3..3757c46210 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -229,29 +229,31 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; ?> - - - - $value) - { - if($value->show) - { - $this->datatable->printHead($value, $orderBy, $vars); - $columns ++; - } - } - ?> - - - - - - $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $projects, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?> - - - -
+
+ + + + $value) + { + if($value->show) + { + $this->datatable->printHead($value, $orderBy, $vars); + $columns ++; + } + } + ?> + + + + + + $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $projects, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?> + + + +
+
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 90e99789e3..4331ee5fac 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -31,236 +31,238 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
- - - - - - - - - + + + + + + + config->global->flow != 'onlyTest'):?> + + + + + + config->global->flow != 'onlyTest'):?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
bug->product;?> -
- - session->currentProductType != 'normal'):?> - - -
-
bug->module;?> -
+
+ + + + + + + + + + + config->global->flow != 'onlyTest');?> + + + + + + + + + + + + + + + + + + + + + + + + + + + - - config->global->flow != 'onlyTest');?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config->global->flow != 'onlyTest' && $showProject):?> - - - - - + + + + + + - - - - - + + + config->global->flow != 'onlyTest' && $showProject):?> + + + + + - - - - + + + + + - - - config->global->flow != 'onlyTest'):?> - - - - - - config->global->flow != 'onlyTest'):?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bug->product;?> +
+ + session->currentProductType != 'normal'):?> + + +
+
bug->module;?> +
+ "; + echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug¤tModuleID=0&branch=$branch"), $lang->tree->manage, '_blank'); + echo '  '; + echo html::a("javascript:loadProductModules($productID)", $lang->refresh); + echo ''; + } + ?> +
+
bug->project;?>
bug->openedBuild?> +
+ + +
bug->allBuilds, "class='btn' data-toggle='tooltip' onclick='loadAllBuilds()'")?>
+
+
bug->lblAssignedTo;?> + + + bug->allUsers;?> +
bug->deadline?>
bug->severity;?> bug->severityList as $severityKey => $severityValue) { - echo ""; - echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug¤tModuleID=0&branch=$branch"), $lang->tree->manage, '_blank'); - echo '  '; - echo html::a("javascript:loadProductModules($productID)", $lang->refresh); - echo ''; + if(!empty($severityKey) and (string)$severityKey != (string)$severityValue) + { + $hasCustomSeverity = true; + break; + } } ?> - -
bug->project;?>
bug->openedBuild?> -
- - -
bug->allBuilds, "class='btn' data-toggle='tooltip' onclick='loadAllBuilds()'")?>
-
-
bug->lblAssignedTo;?> - - - bug->allUsers;?> -
bug->deadline?>
bug->severity;?> - bug->severityList as $severityKey => $severityValue) - { - if(!empty($severityKey) and (string)$severityKey != (string)$severityValue) - { - $hasCustomSeverity = true; - break; - } - } - ?> - - bug->severityList, $severity, "class='form-control chosen'");?> - - bug->severityList, $severity, "class='form-control' data-provide='labelSelector' data-label-class='label-severity'");?> - -
bug->pri;?> - bug->priList as $priKey => $priValue) - { - if(!empty($priKey) and (string)$priKey != (string)$priValue) - { - $hasCustomPri = true; - break; - } - } - $priList = $lang->bug->priList; - if(end($priList)) - { - unset($priList[0]); - $priList[0] = ''; - } - ?> - - - - - -
bug->type;?> -
+ + bug->severityList, $severity, "class='form-control chosen'");?> + + bug->severityList, $severity, "class='form-control' data-provide='labelSelector' data-label-class='label-severity'");?> + +
bug->pri;?> bug->typeList['designchange']); - unset($lang->bug->typeList['newfeature']); - unset($lang->bug->typeList['trackthings']); - echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'"); + $hasCustomPri = false; + foreach($lang->bug->priList as $priKey => $priValue) + { + if(!empty($priKey) and (string)$priKey != (string)$priValue) + { + $hasCustomPri = true; + break; + } + } + $priList = $lang->bug->priList; + if(end($priList)) + { + unset($priList[0]); + $priList[0] = ''; + } ?> - - bug->os?> - bug->osList, $os, "class='form-control chosen'");?> - - - bug->browser?> - bug->browserList, $browser, "class='form-control chosen'");?> - - -
bug->title;?> -
- -
- -
    -
  • story->colorTag;?>
    • -
- + + + + + +
bug->type;?> +
+ bug->typeList['designchange']); + unset($lang->bug->typeList['newfeature']); + unset($lang->bug->typeList['trackthings']); + echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'"); + ?> + + bug->os?> + bug->osList, $os, "class='form-control chosen'");?> + + + bug->browser?> + bug->browserList, $browser, "class='form-control chosen'");?> +
- -
bug->steps;?> -
-
-
- - -
bug->title;?> +
+ +
+ +
    +
  • story->colorTag;?>
+
- - -
bug->story;?>
bug->task;?>
bug->lblMailto;?> -
- fetch('my', 'buildContactLists'); - ?> -
-
bug->keywords;?>
bug->files;?>fetch('file', 'buildform', 'fileCount=1&percent=0.85');?>
- - - - -
+
bug->steps;?> +
+
+
+ + + +
+
+
+ +
bug->story;?>
bug->task;?>
bug->lblMailto;?> +
+ fetch('my', 'buildContactLists'); + ?> +
+
bug->keywords;?>
bug->files;?>fetch('file', 'buildform', 'fileCount=1&percent=0.85');?>
+ + + + +
+
diff --git a/module/product/view/batchedit.html.php b/module/product/view/batchedit.html.php index 2494b33b30..339bb23223 100755 --- a/module/product/view/batchedit.html.php +++ b/module/product/view/batchedit.html.php @@ -35,48 +35,50 @@ } ?>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>product->name;?>product->code;?>'>product->line;?>'>product->PO;?>'>product->QD;?>'>product->RD;?>'>product->type;?>'>product->status;?>'>product->desc;?>product->order;?>
name, "class='form-control' autocomplete='off'");?>code, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>line, "class='form-control chosen'");?>' style='overflow:visible'>PO, "class='form-control chosen'");?>' style='overflow:visible'>QD, "class='form-control chosen'");?>' style='overflow:visible'>RD, "class='form-control chosen'");?>'>product->typeList, $products[$productID]->type, "class='form-control'");?>'>product->statusList, $products[$productID]->status, "class='form-control'");?>'>desc), "rows='1' class='form-control autosize'");?>order, "class='form-control' autocomplete='off'");?>
- - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
idAB;?>product->name;?>product->code;?>'>product->line;?>'>product->PO;?>'>product->QD;?>'>product->RD;?>'>product->type;?>'>product->status;?>'>product->desc;?>product->order;?>
name, "class='form-control' autocomplete='off'");?>code, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>line, "class='form-control chosen'");?>' style='overflow:visible'>PO, "class='form-control chosen'");?>' style='overflow:visible'>QD, "class='form-control chosen'");?>' style='overflow:visible'>RD, "class='form-control chosen'");?>'>product->typeList, $products[$productID]->type, "class='form-control'");?>'>product->statusList, $products[$productID]->status, "class='form-control'");?>'>desc), "rows='1' class='form-control autosize'");?>order, "class='form-control' autocomplete='off'");?>
+ + +
+
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 14919c0629..5f1fa8ee36 100755 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -37,56 +37,58 @@ $minWidth = (count($visibleFields) > 5) ? 'w-150px' : ''; ?>
'> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>project->name;?>project->code;?>'>project->PM;?>'>project->PO;?>'>project->QD;?>'>project->RD;?>'>project->type;?>'>project->status;?>project->begin;?>project->end;?>'> project->desc;?>'>project->teamname;?>'>project->days;?>project->order;?>
name, "class='form-control' autocomplete='off'");?>code, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>PM, "class='form-control chosen'");?>' style='overflow:visible'>PO, "class='form-control chosen'");?>' style='overflow:visible'>QD, "class='form-control chosen'");?>' style='overflow:visible'>RD, "class='form-control chosen'");?>'>project->typeList, $projects[$projectID]->type, 'class=form-control');?>'>project->statusList, $projects[$projectID]->status, 'class=form-control');?>begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>'> desc, "rows='1' class='form-control autosize'");?>'>team, "class='form-control' autocomplete='off'");?>'> -
- days, "class='form-control' autocomplete='off'");?> - project->day;?> -
- 		order, "class='form-control' autocomplete='off'")?>
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
idAB;?>project->name;?>project->code;?>'>project->PM;?>'>project->PO;?>'>project->QD;?>'>project->RD;?>'>project->type;?>'>project->status;?>project->begin;?>project->end;?>'> project->desc;?>'>project->teamname;?>'>project->days;?>project->order;?>
name, "class='form-control' autocomplete='off'");?>code, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>PM, "class='form-control chosen'");?>' style='overflow:visible'>PO, "class='form-control chosen'");?>' style='overflow:visible'>QD, "class='form-control chosen'");?>' style='overflow:visible'>RD, "class='form-control chosen'");?>'>project->typeList, $projects[$projectID]->type, 'class=form-control');?>'>project->statusList, $projects[$projectID]->status, 'class=form-control');?>begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>'> desc, "rows='1' class='form-control autosize'");?>'>team, "class='form-control' autocomplete='off'");?>'> +
+ days, "class='form-control' autocomplete='off'");?> + project->day;?> +
+ 		order, "class='form-control' autocomplete='off'")?>
+
project->weekend);?> diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index e9601a4234..1008d1c5bc 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -185,38 +185,40 @@ js::set('browseType', $browseType); $widths = $this->datatable->setFixedFieldWidth($customFields); $columns = 0; ?> - - - - show) - { - $this->datatable->printHead($field, $orderBy, $vars); - $columns++; - } - } - ?> - - - - - - task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?> - - children)):?> - children as $key => $child):?> - - children)) ? ' table-child-bottom' : '';?> - - task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?> - - - - - -
+
+ + + + show) + { + $this->datatable->printHead($field, $orderBy, $vars); + $columns++; + } + } + ?> + + + + + + task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?> + + children)):?> + children as $key => $child):?> + + children)) ? ' table-child-bottom' : '';?> + + task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?> + + + + + +
+
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 58896b7d98..b7bd55aa80 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -33,127 +33,129 @@ foreach(explode(',', $showFields) as $field) } ?>
" id="batchEditForm"> - - - - - - - - - - - - - - - - - - - - - - - $story):?> - product->getByID($story->product); +
+
idAB;?>'>story->branch;?>story->module;?>'>story->planAB;?>story->title;?>'> story->estimateAB;?>'> priAB;?>'> story->assignedTo;?>'> story->source;?>story->status;?>'> story->stageAB;?>'>story->closedBy;?>'> story->closedReason;?>'>story->keywords;?>
+ + + + + + + + + + + + + + + + + + + + + + $story):?> + product->getByID($story->product); - $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); - if($product->type != 'normal') - { - foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; - $branches = array('ditto' => $this->lang->story->ditto) + $branches; - } + $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); + if($product->type != 'normal') + { + foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; + $branches = array('ditto' => $this->lang->story->ditto) + $branches; + } - $modules = $this->tree->getOptionMenu($story->product, $viewType = 'story', 0, $story->branch); - foreach($modules as $moduleID => $moduleName) $modules[$moduleID] = '/' . $product->name . $moduleName; - $modules = array('ditto' => $this->lang->story->ditto) + $modules; + $modules = $this->tree->getOptionMenu($story->product, $viewType = 'story', 0, $story->branch); + foreach($modules as $moduleID => $moduleName) $modules[$moduleID] = '/' . $product->name . $moduleName; + $modules = array('ditto' => $this->lang->story->ditto) + $modules; - $productPlans = $this->productplan->getPairs($story->product, $branch); - $productPlans = array('' => '', 'ditto' => $this->lang->story->ditto) + $productPlans; - } - ?> - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + - status == 'closed'):?> - - - - - - - - - - - - - -
idAB;?>'>story->branch;?>story->module;?>'>story->planAB;?>story->title;?>'> story->estimateAB;?>'> priAB;?>'> story->assignedTo;?>'> story->source;?>story->status;?>'> story->stageAB;?>'>story->closedBy;?>'> story->closedReason;?>'>story->keywords;?>
'> - id;?> - type == 'normal') ? "disabled='disabled'" : '';?> - branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $storyID);' $disabled");?> - '> - module, "class='form-control chosen'");?> - '> - plan, "class='form-control chosen'");?> - -
-
- title, "class='form-control input-story-title' autocomplete='off'"); ?> + $productPlans = $this->productplan->getPairs($story->product, $branch); + $productPlans = array('' => '', 'ditto' => $this->lang->story->ditto) + $productPlans; + } + ?> +
'> + id;?> + type == 'normal') ? "disabled='disabled'" : '';?> + branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $storyID);' $disabled");?> + '> + module, "class='form-control chosen'");?> + '> + plan, "class='form-control chosen'");?> + +
+
+ title, "class='form-control input-story-title' autocomplete='off'"); ?> -
- -
    -
  • story->colorTag;?>
    • -
- color, "class='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->story->colorTag}' data-update-color='#titles\\[{$storyID}\\]'");?> - +
+ +
    +
  • story->colorTag;?>
    • +
+ color, "class='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->story->colorTag}' data-update-color='#titles\\[{$storyID}\\]'");?> + +
-
- 		>estimate, "class='form-control' autocomplete='off'"); ?>>pri, 'class=form-control');?>'>assignedTo, "class='form-control chosen'");?>>source, 'class=form-control');?>story->statusList[$story->status];?>>stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?>'>closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?>>estimate, "class='form-control' autocomplete='off'"); ?>>pri, 'class=form-control');?>'>assignedTo, "class='form-control chosen'");?>>source, 'class=form-control');?>story->statusList[$story->status];?>>stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?>'>closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?>> - - - - - - -
- closedReason, "class=form-control onchange=setDuplicateAndChild(this.value,$storyID) style='min-width: 70px'");?> - ' closedReason != 'duplicate') echo "style='display:none'";?>> - idAB}' autocomplete='off'");?> - ' closedReason != 'subdivided') echo "style='display:none'";?>> - idAB}' autocomplete='off'");?> -
- 		>closedReason, 'class="form-control" disabled="disabled"');?>>keywords, 'class="form-control" autocomplete="off"');?>
- - -
+ status == 'closed'):?> + > + + + + + + +
+ closedReason, "class=form-control onchange=setDuplicateAndChild(this.value,$storyID) style='min-width: 70px'");?> + ' closedReason != 'duplicate') echo "style='display:none'";?>> + idAB}' autocomplete='off'");?> + ' closedReason != 'subdivided') echo "style='display:none'";?>> + idAB}' autocomplete='off'");?> +
+ + + >closedReason, 'class="form-control" disabled="disabled"');?> + + >keywords, 'class="form-control" autocomplete="off"');?> + + + + + + + + + + + + +
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 57b8645478..7ed28053de 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -23,175 +23,177 @@
- - - - - - - - - - - - + + + + + + + + + story->checkForceReview()):?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
story->product;?> - type != 'normal'):?> -
- - - type != 'normal'):?> - - -
- - 		-
-
story->module;?>
- "; - echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch=$branch"), $lang->tree->manage, '_blank'); - echo '  '; - echo html::a("javascript:loadProductModules($productID)", $lang->refresh); - echo '
'; - } - ?> - -
story->plan;?> -
- "; - echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "", '_blank', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->productplan->create}'"); - echo '
'; - echo "
"; - echo html::a("javascript:loadProductPlans($productID)", "", '', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->refresh}'"); - echo '
'; - } - ?> - - 		-
+
+ + + + + + + + + + + + - - - - - + + + + + - - - story->priList as $priKey => $priValue) - { - if(!empty($priKey) and (string)$priKey != (string)$priValue) - { - $hasCustomPri = true; - break; - } - } - $priList = $lang->story->priList; - if(end($priList)) - { - unset($priList[0]); - $priList[0] = ''; - } - ?> - - - - - - - - - - - - - - - - story->checkForceReview()):?> - + + + + story->priList as $priKey => $priValue) + { + if(!empty($priKey) and (string)$priKey != (string)$priValue) + { + $hasCustomPri = true; + break; + } + } + $priList = $lang->story->priList; + if(end($priList)) + { + unset($priList[0]); + $priList[0] = ''; + } + ?> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
story->product;?> + type != 'normal'):?> +
+ + + type != 'normal'):?> + + +
+ + 		+
+
story->module;?>
+ "; + echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch=$branch"), $lang->tree->manage, '_blank'); + echo '  '; + echo html::a("javascript:loadProductModules($productID)", $lang->refresh); + echo '
'; + } + ?> + +
story->plan;?> +
+ "; + echo html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), "", '_blank', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->productplan->create}'"); + echo '
'; + echo "
"; + echo html::a("javascript:loadProductPlans($productID)", "", '', "class='btn btn-icon' data-toggle='tooltip' title='{$lang->refresh}'"); + echo '
'; + } + ?> + +
-
story->source;?>
- story->sourceList, $source, "class='form-control chosen'");?> - story->sourceNote;?> - +
+
story->source;?>
+ story->sourceList, $source, "class='form-control chosen'");?> + story->sourceNote;?> + +
- -
story->title;?> -
- -
- -
    -
  • story->colorTag;?>
    • -
- +
story->title;?> +
+ +
+ +
    +
  • story->colorTag;?>
    • +
+ +
- -
story->pri;?> - - - - - -
story->estimateAB;?>story->hour;?>
story->reviewedBy;?>PO : '', "class='form-control chosen'");?> -
- /> - -
-
story->pri;?> + + + + + +
story->spec;?>story->specTemplate) . "'");?>
story->verify;?>
story->legendAttatch;?>fetch('file', 'buildform');?>
story->mailto;?> -
- chooseUsersToMail}' multiple");?> - fetch('my', 'buildContactLists');?> -
-
story->keywords;?> - -
- - -
+ +
story->estimateAB;?>story->hour;?>
story->reviewedBy;?>PO : '', "class='form-control chosen'");?> +
+ /> + +
+
story->spec;?>story->specTemplate) . "'");?>
story->verify;?>
story->legendAttatch;?>fetch('file', 'buildform');?>
story->mailto;?> +
+ chooseUsersToMail}' multiple");?> + fetch('my', 'buildContactLists');?> +
+
story->keywords;?> + +
+ + +
+
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 9a66945c4c..f03e958432 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -53,95 +53,97 @@ if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1; ?>
- - - - - - type != 'ops'):?> - - - - - - - - - - - - - - task->ditto; - $lang->task->typeList['ditto'] = $lang->task->ditto; - $members['ditto'] = $lang->task->ditto; - $modules['ditto'] = $lang->task->ditto; - if($project->type == 'ops') $colspan = $colspan - 1; - ?> - task->batchCreate; $i++):?> - module : $moduleID; - } - else - { - $currentStory = $type = $member = $module = 'ditto'; - } - ?> - - - - - type != 'ops'):?> - - - + + + + + + + + + + + + + +
idAB;?>'>task->module?>'>task->story;?>task->name;?>typeAB;?>'>task->assignedTo;?>'>task->estimateAB;?>'>task->estStarted;?>'>task->deadline;?>'>task->desc;?>'>task->pri;?>
style='overflow:visible'> - id, $i)'")?> - - style='overflow: visible'> -
- - - - - -
- 		-
-
- -
- -
    -
  • story->colorTag;?>
    • -
- +
+ + + + + + type != 'ops'):?> + + + + + + + + + + + + + + task->ditto; + $lang->task->typeList['ditto'] = $lang->task->ditto; + $members['ditto'] = $lang->task->ditto; + $modules['ditto'] = $lang->task->ditto; + if($project->type == 'ops') $colspan = $colspan - 1; + ?> + task->batchCreate; $i++):?> + module : $moduleID; + } + else + { + $currentStory = $type = $member = $module = 'ditto'; + } + ?> + + + + + type != 'ops'):?> + + + - - - - - - - - - - - - - -
idAB;?>'>task->module?>'>task->story;?>task->name;?>typeAB;?>'>task->assignedTo;?>'>task->estimateAB;?>'>task->estStarted;?>'>task->deadline;?>'>task->desc;?>'>task->pri;?>
style='overflow:visible'> + id, $i)'")?> + + style='overflow: visible'> +
+ + + + + +
+ 		+
+
+ +
+ +
    +
  • story->colorTag;?>
    • +
+ +
- - 		task->typeList, $type, 'class=form-control');?> style='overflow:visible'>>>>>>task->priList, $pri, 'class=form-control');?>
- - -
+
task->typeList, $type, 'class=form-control');?> style='overflow:visible'>>>>>>task->priList, $pri, 'class=form-control');?>
+ + +
+
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 45a61e2e54..8d58987979 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -46,82 +46,84 @@ } ?> "> -
- - - - - - - - - - - - - - - - - - - - - - - project->getById($tasks[$taskID]->project); - $modules = $this->tree->getOptionMenu($tasks[$taskID]->project, $viewType = 'task'); - foreach($modules as $moduleID => $moduleName) $modules[$moduleID] = '/' . $prjInfo->name. $moduleName; - $modules = array('ditto' => $this->lang->task->ditto) + $modules; - - $members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted'); - $members = array('' => '', 'ditto' => $this->lang->task->ditto) + $members; - } - ?> - - - - + + + + + + + + + + + + + + + + + + + + + + +
idAB;?>'>task->name?>'>task->module?>'>task->assignedTo;?>typeAB;?>'>task->status;?>'>task->pri;?>'>task->estimateAB;?>'>task->consumedThisTime?>'>task->leftAB?>'>task->estStarted?>'>task->deadline?>'>task->finishedBy;?>'>task->canceledBy;?>'>task->closedBy;?>'>task->closedReason;?>
-
- name, "class='form-control' autocomplete='off'");?> -
- -
    -
  • story->colorTag;?>
    • -
- color, "data-provide='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->task->colorTag}' data-update-text='#names\\[{$taskID}\\]'");?> +
+ + + + + + + + + + + + + + + + + + + + + + + + project->getById($tasks[$taskID]->project); + $modules = $this->tree->getOptionMenu($tasks[$taskID]->project, $viewType = 'task'); + foreach($modules as $moduleID => $moduleName) $modules[$moduleID] = '/' . $prjInfo->name. $moduleName; + $modules = array('ditto' => $this->lang->task->ditto) + $modules; + + $members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted'); + $members = array('' => '', 'ditto' => $this->lang->task->ditto) + $members; + } + ?> + + + + - - - - - - - - - - - - - - - - - - - - - - -
idAB;?>'>task->name?>'>task->module?>'>task->assignedTo;?>typeAB;?>'>task->status;?>'>task->pri;?>'>task->estimateAB;?>'>task->consumedThisTime?>'>task->leftAB?>'>task->estStarted?>'>task->deadline?>'>task->finishedBy;?>'>task->canceledBy;?>'>task->closedBy;?>'>task->closedReason;?>
+
+ name, "class='form-control' autocomplete='off'");?> +
+ +
    +
  • story->colorTag;?>
    • +
+ color, "data-provide='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->task->colorTag}' data-update-text='#names\\[{$taskID}\\]'");?> +
- - 		' style='overflow:visible'>module, "class='form-control chosen'")?>' style='overflow:visible'>assignedTo, "class='form-control chosen'");?>type, "class='form-control'");?>>status, "class='form-control'");?>>pri, "class='form-control'");?>>estimate, "class='form-control text-center' autocomplete='off' {$disableHour}");?>>>left, "class='form-control text-center' autocomplete='off' {$disableHour}");?>>estStarted, "class='form-control text-center form-date'");?>>deadline, "class='form-control text-center form-date'");?>' style='overflow:visible'>finishedBy, "class='form-control chosen'");?>' style='overflow:visible'>canceledBy, "class='form-control chosen'");?>' style='overflow:visible'>closedBy, "class='form-control chosen'");?>>task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?>
- - -
+
' style='overflow:visible'>module, "class='form-control chosen'")?>' style='overflow:visible'>assignedTo, "class='form-control chosen'");?>type, "class='form-control'");?>>status, "class='form-control'");?>>pri, "class='form-control'");?>>estimate, "class='form-control text-center' autocomplete='off' {$disableHour}");?>>>left, "class='form-control text-center' autocomplete='off' {$disableHour}");?>>estStarted, "class='form-control text-center form-date'");?>>deadline, "class='form-control text-center form-date'");?>' style='overflow:visible'>finishedBy, "class='form-control chosen'");?>' style='overflow:visible'>canceledBy, "class='form-control chosen'");?>' style='overflow:visible'>closedBy, "class='form-control chosen'");?>>task->reasonList, $tasks[$taskID]->closedReason, 'class=form-control');?>
+ + +
+ diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index e8b1ed0360..26af1f1459 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -23,153 +23,155 @@
- - - - - - - - - - - - - - - config->global->flow != 'onlyTask' and $project->type != 'ops'):?> - - - - - - - - + + + + + + + + + + + config->global->flow == 'onlyTask' ? "class='hidden'" : '';?>> + + + + + + +
task->type;?>task->typeList, $task->type, "class='form-control chosen' onchange='setOwners(this.value)' required");?>
task->module;?>module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?>
task->assignedTo;?> -
- assignedTo, "class='form-control chosen'");?> - - -
- 		-
- -
- -
task->story;?> - - task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($project->id)", $lang->refresh, '', 'class="text-primary"'));?> - -
- story, "class='form-control chosen' onchange='setStoryRelated();'");?> - preview;?> -
- -
task->name;?> -
-
- -
    -
  • task->colorTag;?>
    • -
- +
+ + + + + + + + + + + + + + + config->global->flow != 'onlyTask' and $project->type != 'ops'):?> + + + - - - - + + + + + + + + + + + task->priList as $priKey => $priValue) + { + if(!empty($priKey) and (string)$priKey != (string)$priValue) + { + $hasCustomPri = true; + break; + } + } + $priList = $lang->task->priList; + if(end($priList)) + { + unset($priList[0]); + $priList[0] = ''; + } + ?> + + + + + + + + + + + + + + + + + + task->priList as $priKey => $priValue) - { - if(!empty($priKey) and (string)$priKey != (string)$priValue) - { - $hasCustomPri = true; - break; - } - } - $priList = $lang->task->priList; - if(end($priList)) - { - unset($priList[0]); - $priList[0] = ''; - } + $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false; + $hiddenDeadline = strpos(",$showFields,", ',deadline,') === false; ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - config->global->flow == 'onlyTask' ? "class='hidden'" : '';?>> - - - - - - -
task->type;?>task->typeList, $task->type, "class='form-control chosen' onchange='setOwners(this.value)' required");?>
task->module;?>module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?>
task->assignedTo;?> +
+ assignedTo, "class='form-control chosen'");?> + + +
+ 		+
+ +
+ +
task->story;?> + + task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($project->id)", $lang->refresh, '', 'class="text-primary"'));?> + +
+ story, "class='form-control chosen' onchange='setStoryRelated();'");?> + preview;?>
- name, "class='form-control' autocomplete='off' required");?> - config->global->flow != 'onlyTask'):?> - task->copyStoryTitle;?> - - -
task->pri;?>
task->name;?> +
+
+ +
    +
  • task->colorTag;?>
    • +
+ +
+ name, "class='form-control' autocomplete='off' required");?> + config->global->flow != 'onlyTask'):?> + task->copyStoryTitle;?> + + +
+
task->pri;?> + + pri, "class='form-control chosen'");?> + + pri, "class='form-control' data-provide='labelSelector'");?> + +
task->estimateAB;?>task->hour;?>
task->desc;?>desc, "rows='10' class='form-control'");?>
files;?>fetch('file', 'buildform');?>
- - pri, "class='form-control chosen'");?> - - pri, "class='form-control' data-provide='labelSelector'");?> - -
task->estimateAB;?>task->hour;?>
task->desc;?>desc, "rows='10' class='form-control'");?>
files;?>fetch('file', 'buildform');?>
task->datePlan;?> -
- - estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?> - - - ~ - - - deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?> - -
-
story->mailto;?> -
- acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?> - fetch('my', 'buildContactLists');?> -
-
task->afterSubmit;?>task->afterChoices, $this->config->global->flow == 'onlyTask' || !empty($task->id) ? 'toTaskList' : 'continueAdding');?>
- - -
+ +
task->datePlan;?> +
+ + estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?> + + + ~ + + + deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?> + +
+
story->mailto;?> +
+ acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?> + fetch('my', 'buildContactLists');?> +
+
task->afterSubmit;?>task->afterChoices, $this->config->global->flow == 'onlyTask' || !empty($task->id) ? 'toTaskList' : 'continueAdding');?>
+ + +
+
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php index c85d61bdc2..aef6708234 100644 --- a/module/testcase/view/batchedit.html.php +++ b/module/testcase/view/batchedit.html.php @@ -40,86 +40,88 @@ } ?> -
- - - - - - - - - - - - - - - - - - - - product->getByID($cases[$caseID]->product); +
+
idAB;?>'>priAB;?>'>statusAB;?>'>testcase->branch;?>'>testcase->module;?>'>testcase->story;?>testcase->title;?>testcase->type;?>'>testcase->precondition;?>'>testcase->keywords;?>'>testcase->stage;?>
+ + + + + + + + + + + + + + + + + + + + product->getByID($cases[$caseID]->product); - $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); - if($product->type != 'normal') - { - foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; - $branches = array('ditto' => $this->lang->story->ditto) + $branches; - } + $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); + if($product->type != 'normal') + { + foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; + $branches = array('ditto' => $this->lang->story->ditto) + $branches; + } - $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch); - $modules = array('ditto' => $this->lang->story->ditto) + $modules; - } - ?> - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - -
idAB;?>'>priAB;?>'>statusAB;?>'>testcase->branch;?>'>testcase->module;?>'>testcase->story;?>testcase->title;?>testcase->type;?>'>testcase->precondition;?>'>testcase->keywords;?>'>testcase->stage;?>
'> pri, 'class=form-control');?>'>testcase->statusList, $cases[$caseID]->status, 'class=form-control');?>' style='overflow:visible'> - id;?> - type == 'normal') ? "disabled='disabled'" : '';?> - branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?> - ' style='overflow:visible'>module, "class='form-control chosen'");?>' style='overflow:visible'>story, "class='form-control chosen'");?> -
-
- title, "class='form-control' autocomplete='off'");?> -
- -
    -
  • testcase->colorTag;?>
    • -
- color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right' data-update-color='#title\\[$caseID\\]'");?> + $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch); + $modules = array('ditto' => $this->lang->story->ditto) + $modules; + } + ?> +
'> pri, 'class=form-control');?>'>testcase->statusList, $cases[$caseID]->status, 'class=form-control');?>' style='overflow:visible'> + id;?> + type == 'normal') ? "disabled='disabled'" : '';?> + branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?> + ' style='overflow:visible'>module, "class='form-control chosen'");?>' style='overflow:visible'>story, "class='form-control chosen'");?> +
+
+ title, "class='form-control' autocomplete='off'");?> +
+ +
    +
  • testcase->colorTag;?>
    • +
+ color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right' data-update-color='#title\\[$caseID\\]'");?> +
- - 		type, 'class=form-control');?>'>precondition, "rows='1' class='form-control autosize'")?>'> keywords, "class='form-control' autocomplete='off'");?>' style='overflow:visible'>testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?>
- - -
+ + type, 'class=form-control');?> + '>precondition, "rows='1' class='form-control autosize'")?> + '> keywords, "class='form-control' autocomplete='off'");?> + ' style='overflow:visible'>testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?> + + + + + + + + + + + + + diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 3c78de79d4..4c3aa89839 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -56,29 +56,31 @@ js::set('branch', $branch); $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; ?> - ' id='caseList' data-checkable='true' data-fixed-left-width='' data-fixed-right-width='' data-custom-menu='true' data-checkbox-name='caseIDList[]'> - - - $value) - { - if($value->show) - { - $this->datatable->printHead($value, $orderBy, $vars); - $columns ++; - } - } - ?> - - - - - - $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?> - - - -
+
+ ' id='caseList' data-checkable='true' data-fixed-left-width='' data-fixed-right-width='' data-custom-menu='true' data-checkbox-name='caseIDList[]'> + + + $value) + { + if($value->show) + { + $this->datatable->printHead($value, $orderBy, $vars); + $columns ++; + } + } + ?> + + + + + + $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?> + + + +
+
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index a0862f4c18..25d2d088e9 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -25,203 +25,205 @@
- - - - - - - - - - - - - - - config->global->flow != 'onlyTest'):?> - - - - - - - - + + + + + + + + + + config->global->flow != 'onlyTest'):?> + + + + + + + + + + testcase->forceNotReview()):?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
testcase->product;?> -
- - session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?> -
- 		-
- testcase->module?> - "; - echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch=$branch"), "", '_blank', "data-toggle='tooltip' class='btn' title='{$lang->tree->manage}'"); - echo html::a("javascript:loadProductModules($productID)", "", '', "data-toggle='tooltip' class='btn' title='{$lang->refresh}'"); - echo ''; - } - ?> -
-
testcase->type;?>testcase->typeList, $type, "class='form-control chosen'");?> -
- testcase->stage?> - testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?> -
-
testcase->lblStory;?> -
- searchMore . '"');?> - - - - - createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn' id='preview'");?> - - -
-
testcase->title;?> -
- -
- -
    -
  • testcase->colorTag;?>
    • -
- +
+ + + + + - - testcase->forceNotReview()):?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
testcase->product;?> +
+ + session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
- -
testcase->forceNotReview, '', "id='forceNotReview0'");?>
testcase->pri;?> - testcase->priList as $priKey => $priValue) - { - if(!empty($priKey) and (string)$priKey != (string)$priValue) - { - $hasCustomPri = true; - break; - } - } - $priList = $lang->testcase->priList; - if(end($priList)) - { - unset($priList[0]); - $priList[0] = ''; - } - ?> - - - - - -
testcase->precondition;?>
testcase->steps;?> - - - - - - - - - - - - - - - - - $step):?> - - - - - - - - -
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
-
- - - - -
- - -
- -
- 		-
- - - -
-
-
- - desc, "rows='1' class='form-control autosize step-steps'") ?> - - type)) $step->type = 'step';?> - -
- type === 'group') echo ' checked' ?>> - -
- -
- 		expect, "rows='1' class='form-control autosize step-expects'") ?> -
- - - -
-
-
testcase->keywords;?>
testcase->files;?>fetch('file', 'buildform');?>
- - -
+
+
+ testcase->module?> + "; + echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch=$branch"), "", '_blank', "data-toggle='tooltip' class='btn' title='{$lang->tree->manage}'"); + echo html::a("javascript:loadProductModules($productID)", "", '', "data-toggle='tooltip' class='btn' title='{$lang->refresh}'"); + echo ''; + } + ?> +
+
testcase->type;?>testcase->typeList, $type, "class='form-control chosen'");?> +
+ testcase->stage?> + testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?> +
+
testcase->lblStory;?> +
+ searchMore . '"');?> + + + + + createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn' id='preview'");?> + + +
+
testcase->title;?> +
+ +
+ +
    +
  • testcase->colorTag;?>
    • +
+ +
+
+
testcase->forceNotReview, '', "id='forceNotReview0'");?>
testcase->pri;?> + testcase->priList as $priKey => $priValue) + { + if(!empty($priKey) and (string)$priKey != (string)$priValue) + { + $hasCustomPri = true; + break; + } + } + $priList = $lang->testcase->priList; + if(end($priList)) + { + unset($priList[0]); + $priList[0] = ''; + } + ?> + + + + + +
testcase->precondition;?>
testcase->steps;?> + + + + + + + + + + + + + + + + + $step):?> + + + + + + + + +
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>actions;?>
+
+ + + + +
+ + +
+ +
+ 		+
+ + + +
+
+
+ + desc, "rows='1' class='form-control autosize step-steps'") ?> + + type)) $step->type = 'step';?> + +
+ type === 'group') echo ' checked' ?>> + +
+ +
+ 		expect, "rows='1' class='form-control autosize step-expects'") ?> +
+ + + +
+
+
testcase->keywords;?>
testcase->files;?>fetch('file', 'buildform');?>
+ + +
+
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index adf901a92e..c09ce2982a 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -29,77 +29,79 @@ $minWidth = (count($visibleFields) > 7) ? 'w-120px' : ''; ?>
- - +
+
+ + + + + + + + + + + + + + + + + + + + + + + $lang->user->ditto) + $depts;?> + user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?> + + + dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); + $role = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); + $first = false; + ?> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - $lang->user->ditto) + $depts;?> - user->roleList = array('' => '', 'ditto' => $lang->user->ditto) + $lang->user->roleList;?> - - - dept)) ? 0 : (empty($user->dept) ? 'ditto' : $user->dept); - $role = ($first and empty($user->role)) ? 0 : (empty($user->role) ? 'ditto' : $user->role); - $first = false; - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - -
idAB;?>'> user->dept;?>user->account;?>user->realname;?>user->role;?>'>user->commiter;?>'> user->email;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'> user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>
idAB;?>'> user->dept;?>user->account;?>user->realname;?>user->role;?>'>user->commiter;?>'> user->email;?>'> user->join;?>'> user->skype;?>'> user->qq;?>'> user->yahoo;?>'> user->gtalk;?>'> user->wangwang;?>'> user->mobile;?>'> user->phone;?>'> user->address;?>'> user->zipcode;?>id;?>' style='overflow:visible'>id]", $depts, $dept, "class='form-control chosen'");?>id]", $user->account, "class='form-control' autocomplete='off'");?>id]", $user->realname, "class='form-control' autocomplete='off'");?>id]", $lang->user->roleList, $role, "class='form-control'");?>'>id]", $user->commiter, "class='form-control' autocomplete='off'");?>'> id]", $user->email, "class='form-control' autocomplete='off'");?>'> id]", $user->join, "class='form-control form-date'");?>'> id]", $user->skype, "class='form-control' autocomplete='off'");?>'> id]", $user->qq, "class='form-control' autocomplete='off'");?>'> id]", $user->yahoo, "class='form-control' autocomplete='off'");?>'> id]", $user->gtalk, "class='form-control' autocomplete='off'");?>'>id]", $user->wangwang, "class='form-control' autocomplete='off'");?>'> id]", $user->mobile, "class='form-control' autocomplete='off'");?>'> id]", $user->phone, "class='form-control' autocomplete='off'");?>'> id]", $user->address, "class='form-control' autocomplete='off'");?>'> id]", $user->zipcode, "class='form-control' autocomplete='off'");?>
id;?>' style='overflow:visible'>id]", $depts, $dept, "class='form-control chosen'");?>id]", $user->account, "class='form-control' autocomplete='off'");?>id]", $user->realname, "class='form-control' autocomplete='off'");?>id]", $lang->user->roleList, $role, "class='form-control'");?>'>id]", $user->commiter, "class='form-control' autocomplete='off'");?>'> id]", $user->email, "class='form-control' autocomplete='off'");?>'> id]", $user->join, "class='form-control form-date'");?>'> id]", $user->skype, "class='form-control' autocomplete='off'");?>'> id]", $user->qq, "class='form-control' autocomplete='off'");?>'> id]", $user->yahoo, "class='form-control' autocomplete='off'");?>'> id]", $user->gtalk, "class='form-control' autocomplete='off'");?>'>id]", $user->wangwang, "class='form-control' autocomplete='off'");?>'> id]", $user->mobile, "class='form-control' autocomplete='off'");?>'> id]", $user->phone, "class='form-control' autocomplete='off'");?>'> id]", $user->address, "class='form-control' autocomplete='off'");?>'> id]", $user->zipcode, "class='form-control' autocomplete='off'");?>
user->verifyPassword?> -
- - - user->placeholder->verify}'");?> -
- save, '', 'btn btn-wide btn-primary');?> - + user->verifyPassword?> +
+ + + user->placeholder->verify}'");?>
+ + + + + save, '', 'btn btn-wide btn-primary');?> + + + + + +