From 7eb5c6142c4685ea473c0212fc6668fefe8c6912 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Fri, 27 Aug 2021 16:40:43 +0800 Subject: [PATCH] * Code for task #41764. --- module/bug/css/batchactivate.css | 4 +++ module/bug/css/batchcreate.css | 6 +++++ module/bug/css/batchedit.css | 7 +++++ module/bug/view/batchactivate.html.php | 8 +++--- module/bug/view/batchcreate.html.php | 28 ++++++++++---------- module/bug/view/batchedit.html.php | 36 +++++++++++++------------- module/bug/view/linkbugs.html.php | 8 +++--- module/company/css/dynamic.css | 3 +++ module/company/view/dynamic.html.php | 10 +++---- module/compile/css/browse.css | 3 +++ module/compile/view/browse.html.php | 12 ++++----- module/cron/css/index.css | 5 ++++ module/cron/view/index.html.php | 18 ++++++------- www/theme/default/style.css | 2 +- 14 files changed, 89 insertions(+), 61 deletions(-) create mode 100644 module/bug/css/batchactivate.css create mode 100644 module/compile/css/browse.css create mode 100644 module/cron/css/index.css diff --git a/module/bug/css/batchactivate.css b/module/bug/css/batchactivate.css new file mode 100644 index 0000000000..808c59e64b --- /dev/null +++ b/module/bug/css/batchactivate.css @@ -0,0 +1,4 @@ +.c-id {width: 40px !important;} +.c-title {width: 160px;} +.c-assigned {width: 160px;} +.c-build {width: 160px;} diff --git a/module/bug/css/batchcreate.css b/module/bug/css/batchcreate.css index e69de29bb2..30412ed704 100644 --- a/module/bug/css/batchcreate.css +++ b/module/bug/css/batchcreate.css @@ -0,0 +1,6 @@ +.c-id {width: 50px !important;} +.c-branch, .c-module, .c-os {width: 120px;} +.c-execution {width: 130px;} +.c-build, .c-browser, .c-keywords, .c-other {width: 100px;} +.c-steps {width: 150px;} +.c-pri, .c-severity {width: 80px;} diff --git a/module/bug/css/batchedit.css b/module/bug/css/batchedit.css index 18e25bbcab..b928b1c4ac 100644 --- a/module/bug/css/batchedit.css +++ b/module/bug/css/batchedit.css @@ -1,2 +1,9 @@ .duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px;} .duplicate-input:focus {border-left-width: 1px; padding-left: 8px;} + +.c-id {width: 50px !important;} +.c-branch, .c-module, .c-os {width: 120px;} +.c-execution {width: 130px;} +.c-build, .c-browser, .c-keywords, .c-other {width: 100px;} +.c-steps, .c-title, .c-plan, .c-assigned, .c-resolution {width: 150px;} +.c-pri, .c-severity {width: 80px;} diff --git a/module/bug/view/batchactivate.html.php b/module/bug/view/batchactivate.html.php index 5090cf657d..7d861c682a 100644 --- a/module/bug/view/batchactivate.html.php +++ b/module/bug/view/batchactivate.html.php @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index a2d3a68f29..26e6b3cfda 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -46,23 +46,23 @@
idAB;?>bug->title;?>bug->assignedTo;?>bug->openedBuild;?>idAB;?>bug->title;?>bug->assignedTo;?>bug->openedBuild;?> bug->legendComment;?>
- - - - - + + + + + - - - - - - - - + + + + + + + + bug->getFlowExtendFields(); - foreach($extendFields as $extendField) echo ""; + foreach($extendFields as $extendField) echo ""; ?> diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 0cd8db28cf..490f027efa 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -47,26 +47,26 @@
idAB;?>'> product->branch;?>'> bug->module;?>'>bug->execution;?>bug->openedBuild;?>idAB;?>'> product->branch;?>'> bug->module;?>'>bug->execution;?>bug->openedBuild;?> bug->title;?>'>bug->deadline;?>'>bug->steps;?>'>typeAB;?>'>bug->pri;?>'>bug->severity;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>'>bug->deadline;?>'>bug->steps;?>'>typeAB;?>'>bug->pri;?>'>bug->severity;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?> {$extendField->name}{$extendField->name}
- - - - - + + + + + - + - - - - - - - - - + + + + + + + + + bug->getFlowExtendFields(); - foreach($extendFields as $extendField) echo ""; + foreach($extendFields as $extendField) echo ""; ?> @@ -77,10 +77,10 @@ if(!$productID) { $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') { diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php index d74a98e619..b6d6e378aa 100644 --- a/module/bug/view/linkbugs.html.php +++ b/module/bug/view/linkbugs.html.php @@ -35,9 +35,9 @@ - - - + + + @@ -47,7 +47,7 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - + - - + + - - - + + + diff --git a/module/cron/css/index.css b/module/cron/css/index.css new file mode 100644 index 0000000000..6a6a07af08 --- /dev/null +++ b/module/cron/css/index.css @@ -0,0 +1,5 @@ +.c-minute {width: 60px;} +.c-hour, .c-dom {width: 50px;} +.c-mon, .c-dow, .c-status {width: 60px;} +.c-remark {width: 200px;} +.c-actions {width: 100px;} diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php index aa9993434d..bedf432683 100644 --- a/module/cron/view/index.html.php +++ b/module/cron/view/index.html.php @@ -27,16 +27,16 @@
idAB;?>'>bug->type;?>'>bug->severity;?>'>bug->pri;?>bug->title;?>idAB;?>'>bug->type;?>'>bug->severity;?>'>bug->pri;?>bug->title;?> '>bug->branch;?>'>bug->branch;?> '>bug->productplan;?>'>bug->assignedTo;?>'>bug->deadline;?>'>bug->status;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>'>bug->resolvedByAB;?>'>bug->resolutionAB;?>'>bug->productplan;?>'>bug->assignedTo;?>'>bug->deadline;?>'>bug->status;?>'>bug->os;?>'>bug->browser;?>'>bug->keywords;?>'>bug->resolvedByAB;?>'>bug->resolutionAB;?> {$extendField->name}{$extendField->name}
priAB;?> bug->product;?> bug->title;?>bug->statusAB;?>openedByAB;?>assignedToAB;?>bug->statusAB;?>openedByAB;?>assignedToAB;?>
- +
id);?> diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index c11b53e924..eeb6571277 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -17,3 +17,6 @@ .dynamic.collapsed .timeline {max-height: 58px;} .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} + +.c-user, .c-project, .c-product, .c-execution {width: 150px !important;} +.c-date {width: 200px;} diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 591a73a589..721d080d51 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -25,12 +25,12 @@ echo html::a(inlink('dynamic', "browseType=$period"), $label, '', "class='btn btn-link $active' id='{$period}'") ?> -
id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?>
-
+
id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?>
+
systemMode == 'new'):?> -
+
-
+
action->dynamic->search;?> @@ -42,7 +42,7 @@ $actions):?>
-
+
action->dynamic->today;?> diff --git a/module/compile/css/browse.css b/module/compile/css/browse.css new file mode 100644 index 0000000000..8e03463502 --- /dev/null +++ b/module/compile/css/browse.css @@ -0,0 +1,3 @@ +.c-id {width: 60px;} +.c-repo, .c-build-type {width: 150px;} +.c-date, .c-actions {width: 130px !important;} diff --git a/module/compile/view/browse.html.php b/module/compile/view/browse.html.php index 91588ca7c3..5dd9c2a77d 100644 --- a/module/compile/view/browse.html.php +++ b/module/compile/view/browse.html.php @@ -30,14 +30,14 @@
compile->id);?>compile->id);?> compile->name);?>compile->buildType;?>job->repo;?>compile->buildType;?>job->repo;?> job->triggerType;?>compile->status);?>compile->time);?>actions;?>compile->status);?>compile->time);?>actions;?>
- - - - - + + + + + - - - - + + + + diff --git a/www/theme/default/style.css b/www/theme/default/style.css index cb32f08387..9e0e492e40 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -52,7 +52,7 @@ a.showMoreImage:hover {opacity: 1;} .c-icon {width: 20px;} .c-number {width: 80px;} .c-company, .c-budget {width: 80px;} -.c-status, .c-user, .c-date, .c-encode {width: 100px;} +.c-status, .c-type, .c-user, .c-date, .c-encode {width: 100px;} .c-object-type {width: 130px;} .c-full-date, .c-mobile, .c-text {width: 150px;} .c-module {width: 180px;}
cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?>cron->m?>cron->h?>cron->dom?>cron->mon?>cron->dow?> cron->command?>cron->remark?>cron->lastTime?>cron->status?>actions;?>cron->remark?>cron->lastTime?>cron->status?>actions;?>