diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 8da6c963c6..f64b44d4c0 100644 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -1,18 +1,2 @@ -.cards {margin: 5% auto;} -.cards > .col-sm-6 {width: 25%; padding: 0 10px} -.card {height: 250px; position: relative; padding-top: 50px; border-radius: 0; margin: 0} -.card > .media {position: absolute; left: 0; top: 0; width: 100%; background: #f1f1f1; height:50px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;} -.card > .media > .icon {position: absolute; display: block; font-size: 56px; color: #ddd; z-index: 99; bottom: -10px; right: -6px; transition: all 0.4s;} -.card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 14px; left: 15px; top: 10px; transition: all 0.4s;} -.card:hover > .media {background: #F8FAFE} -.card:hover > .media > .icon {color: #ccc} -.card .card-content {padding: 20px; border:1px solid #f1f1f1;} -.card-content > ul {padding-left: 20px;} -.card-content > ul > li {margin-bottom: 5px;} -.card a, .card:hover a {color: #444} -.card a:hover {color: #000;} - -#notice {margin: -20px -20px 20px} -#titlebar {margin-top: -20px; border-top: none} -#notice + #titlebar {margin-top: 0; border-top: 1px solid #e5e5e5} -#proversion, #zentaotrain{color:#D2322D} +#notice {margin: -20px -20px 20px; padding: 20px;} +#zentaoLinks {margin-top: 20px;} \ No newline at end of file diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 2b3d62c789..e0e96516a0 100644 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -14,21 +14,19 @@
- ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?> + ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?>
-
- - admin->info->version, $config->version); - if($bind) echo sprintf($lang->admin->info->account, '' . $account . ''); - echo $lang->admin->info->links; - ?> - -
+

+ admin->info->version, $config->version); + if($bind) echo sprintf($lang->admin->info->account, '' . $account . ''); + echo $lang->admin->info->links; + ?> +

diff --git a/module/bug/css/batchcreate.css b/module/bug/css/batchcreate.css index c642497ba7..a85cc5f40a 100644 --- a/module/bug/css/batchcreate.css +++ b/module/bug/css/batchcreate.css @@ -1,6 +1 @@ -#batchCreateForm .input-group, -#batchCreateForm .input-group .form-control {position: static;} -#batchCreateForm .input-group .colorpicker {z-index: 2;} -#batchCreateForm .input-group .colorpicker.open {z-index: 5;} - #importLines {white-space: nowrap; background: repeat-y url("data:image/png;base64,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"); background-position: 0 6px; padding-left: 30px; line-height: 20px;} diff --git a/module/bug/css/common.css b/module/bug/css/common.css index 2412c713a7..e9d21530d0 100644 --- a/module/bug/css/common.css +++ b/module/bug/css/common.css @@ -1,3 +1,9 @@ .ke-toolbar .ke-outline[data-name='savetemplate'] {display: none} #modulemenu .nav #dropMenu #searchResult .closed{text-decoration:none;} .nav #moreMenus{cursor: pointer;} + +#batchCreateForm .input-group, #batchEditForm .input-group, +#batchCreateForm .input-group .form-control, #batchEditForm .input-group .form-control {position: static;} +#batchCreateForm .input-group .colorpicker, #batchEditForm .input-group .colorpicker {z-index: 2;} +#batchCreateForm .input-group .colorpicker.open, #batchEditForm .input-group .colorpicker.open {z-index: 5;} + diff --git a/module/bug/css/resolve.css b/module/bug/css/resolve.css index 122898b423..77ff393c42 100644 --- a/module/bug/css/resolve.css +++ b/module/bug/css/resolve.css @@ -1,2 +1,2 @@ .chosen-container[id^="buildProject"] {max-width: 160px; border-radius: 0} -.chosen-container[id^="buildProject"] .chosen-drop {min-width: 400px;!important} +.chosen-container[id^="buildProject"] .chosen-drop {min-width: 300px;!important} diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php index d29f4cb09e..bc7989836d 100644 --- a/module/bug/view/activate.html.php +++ b/module/bug/view/activate.html.php @@ -24,7 +24,7 @@ -
+ @@ -32,7 +32,7 @@ - + diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php index ce1fc14d4d..f254c4af79 100644 --- a/module/bug/view/assignto.html.php +++ b/module/bug/view/assignto.html.php @@ -28,7 +28,7 @@ js::set('page', 'assignedto'); - +
bug->assignedTo;?>
bug->openedBuild;?>openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?>openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?>
comment;?>
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 78dbacb25a..6be54ead98 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -13,157 +13,135 @@ lang->bug->dittoNotice);?> -
-
- icons['bug']);?> - icons['batchEdit']);?> bug->common . $lang->colon . $lang->bug->batchEdit;?> -
- +
+
+

bug->common . $lang->colon . $lang->bug->batchEdit;?>

+
+ createLink('custom', 'ajaxSaveCustomFields', 'module=bug§ion=custom&key=batchEditFields')?> +
-
- -
- -config->bug->edit->requiredFields) as $field) -{ - if($field) - { - $requiredFields[$field] = ''; - if(strpos(",{$config->bug->list->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; - } -} -$columns = count($visibleFields) + 2; -?> -"> -
bug->assignBug;?>
- - - - - - - - - - - - - - - - - - - - - - - $bug):?> - +
+ + config->bug->edit->requiredFields) as $field) + { + if($field) { - $product = $this->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; - } + $requiredFields[$field] = ''; + if(strpos(",{$config->bug->list->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = ''; } - /** - * 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;?> - ";?> - = 10) echo "class='w-150px'"?>>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');?> -
- color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#titles\\[{$bugID}\\]'");?> - title, 'class=form-control');?> -
-
' 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}'");?> -
-
-
- -createLink('custom', 'ajaxSaveCustomFields', 'module=bug§ion=custom&key=batchEditFields')?> - + } + $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}\\]'");?> +
+
+
+
' 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/close.html.php b/module/bug/view/close.html.php index 16606021e5..d40bf7664e 100644 --- a/module/bug/view/close.html.php +++ b/module/bug/view/close.html.php @@ -24,7 +24,7 @@ -
+ diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php index 285d3e8b7c..e1372c0c24 100755 --- a/module/bug/view/confirmbug.html.php +++ b/module/bug/view/confirmbug.html.php @@ -28,7 +28,7 @@ js::set('page', 'confirmbug'); - +
comment;?>
@@ -37,11 +37,11 @@ js::set('page', 'confirmbug'); - + - + diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php index 1f6f117e49..baec465844 100644 --- a/module/bug/view/resolve.html.php +++ b/module/bug/view/resolve.html.php @@ -29,11 +29,11 @@ js::set('productID' , $bug->product); - +
bug->assignedTo;?>
bug->type;?>bug->typeList, $bug->type, 'class=form-control');?>bug->typeList, $bug->type, "class='form-control chosen'");?>
bug->pri;?>bug->priList, $bug->pri, 'class=form-control');?>bug->priList, $bug->pri, "class='form-control chosen'");?>
bug->mailto;?>
- + @@ -63,7 +63,11 @@ js::set('productID' , $bug->product); - + diff --git a/module/misc/css/about.css b/module/misc/css/about.css index 791ffad935..5b36dfa561 100644 --- a/module/misc/css/about.css +++ b/module/misc/css/about.css @@ -1,19 +1,4 @@ -.cards {padding-bottom: 0;} -.cards > .col-sm-6 {width: 25%; padding: 0 10px} -.card {height: 225px; position: relative; padding-top: 50px; margin: 0} -.card > .media {position: absolute; left: 0; top: 0; width: 100%; background: #f1f1f1; height:50px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;} -.card > .media > .icon {position: absolute; display: block; font-size: 56px; color: #ddd; z-index: 99; bottom: -10px; right: -6px; transition: all 0.4s;} -.card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 14px; left: 15px; top: 10px; transition: all 0.4s;} -.card:hover > .media {background: #e5e5e5} -.card:hover > .media > .icon {color: #ccc} -.card .card-content {padding: 10px 20px} -.card-content > ul {padding-left: 8px;} -.card-content > ul > li {margin-bottom: 5px;} -.card a, .card:hover a {color: #444} -.card a:hover {color: #000;} - -body {padding: 20px; font-size: 12px} -.modal-dialog.hide-header .modal-header .close {top: 5px; right: 20px} -.copyright {padding: 0 10px 20px} - -#proversion, #zentaotrain{color:#D2322D} +#mainContent {padding-top: 50px;} +#mainContent .main-header {display: none;} +#mainContent .copyright {line-height: 20px;} +#mainContent .copyright a {vertical-align: baseline;} \ No newline at end of file diff --git a/module/misc/view/about.html.php b/module/misc/view/about.html.php index 7ad6202adf..17d06a9bfc 100644 --- a/module/misc/view/about.html.php +++ b/module/misc/view/about.html.php @@ -1,20 +1,25 @@ -
bug->resolution;?>bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?>bug->resolutionList, '', "class='form-control chosen' onchange=setDuplicate(this.value)");?>
bug->resolvedDate;?> +
+ +
+
bug->assignedTo;?>
- - - - - - - -
- -

misc->zentao->version, $config->version);?>

- 		- -
-
- misc->copyright;?> +
+
+
+
+

misc->zentao->labels['about'];?>

-
+ + + + + + + + +
+ +

misc->zentao->version, $config->version);?>

+
+ misc->copyright;?> +
+ + + diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php index 0daa4c0db7..0c58149f95 100755 --- a/module/misc/view/links.html.php +++ b/module/misc/view/links.html.php @@ -1,15 +1,14 @@ -
-
+