From c7c4ec7429db41a289ed8766427a681acdb53100 Mon Sep 17 00:00:00 2001 From: dingyongliang Date: Wed, 21 Sep 2022 07:56:30 +0000 Subject: [PATCH] * task #70018, change bug confirmed color. --- module/bug/config.php | 2 +- module/bug/css/browse.css | 2 -- module/bug/css/m.browse.css | 4 ++-- module/bug/lang/en.php | 4 ++-- module/bug/lang/fr.php | 4 ++-- module/bug/lang/vi.php | 4 ++-- module/bug/lang/zh-cn.php | 4 ++-- module/bug/lang/zh-tw.php | 4 ++-- module/my/css/bug.css | 5 ++--- www/theme/default/style.css | 4 ++++ 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/module/bug/config.php b/module/bug/config.php index ad67ba65e3..d17bbaaa9e 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -188,7 +188,7 @@ $config->bug->datatable->fieldList['pri']['name'] = $lang->bug->pri; $config->bug->datatable->fieldList['confirmed']['title'] = 'confirmedAB'; $config->bug->datatable->fieldList['confirmed']['fixed'] = 'left'; -$config->bug->datatable->fieldList['confirmed']['width'] = '50'; +$config->bug->datatable->fieldList['confirmed']['width'] = '100'; $config->bug->datatable->fieldList['confirmed']['required'] = 'no'; $config->bug->datatable->fieldList['title']['title'] = 'title'; diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index 7a2518c139..55068d74be 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -2,8 +2,6 @@ .closed, .closed a {color: gray; text-decoration:line-through;} .resolved, .resolved a {color: #8EC21F; text-decoration: none;} .tree .closed, .tree .closed a {color: #003366; text-decoration: none;} -.confirm0 {color: gray;} -.confirm1 {color: green;} td.delayed {color: #fff; background: #e84e0f !important;} #bugForm .setting {height: 25px;} diff --git a/module/bug/css/m.browse.css b/module/bug/css/m.browse.css index 55fe95f277..2bade6e64b 100644 --- a/module/bug/css/m.browse.css +++ b/module/bug/css/m.browse.css @@ -1,2 +1,2 @@ -.confirm0 {color:gray; font-size:9px} -.confirm1 {color:green; font-size:9px} +.confirm0 {font-size:9px} +.confirm1 {font-size:9px} diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 439690a04f..6b20c15b4e 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = 'Resolved'; $lang->bug->statusList['closed'] = 'Closed'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = 'Yes'; -$lang->bug->confirmedList[0] = 'No'; +$lang->bug->confirmedList[1] = 'confirmed'; +$lang->bug->confirmedList[0] = 'unconfirmed'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'As Designed'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index de0bfd7c05..ff9fd3073a 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = 'Résolu'; $lang->bug->statusList['closed'] = 'Fermé'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = 'Oui'; -$lang->bug->confirmedList[0] = 'Non'; +$lang->bug->confirmedList[1] = 'confirmé'; +$lang->bug->confirmedList[0] = 'non confirmé'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'Du Design'; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index 2f0305172f..b21a1eed16 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -265,8 +265,8 @@ $lang->bug->statusList['active'] = 'Kích hoạt'; $lang->bug->statusList['resolved'] = 'Đã giải quyết'; $lang->bug->statusList['closed'] = 'Đã đóng'; -$lang->bug->confirmedList[1] = 'Có'; -$lang->bug->confirmedList[0] = 'Không'; +$lang->bug->confirmedList[1] = 'đã xác nhận'; +$lang->bug->confirmedList[0] = 'chưa được xác nhận'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = 'Như thiết kế'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index cab71d93d5..070655bf86 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -285,8 +285,8 @@ $lang->bug->statusList['resolved'] = '已解决'; $lang->bug->statusList['closed'] = '已关闭'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = '是'; -$lang->bug->confirmedList[0] = '否'; +$lang->bug->confirmedList[1] = '已确认'; +$lang->bug->confirmedList[0] = '未确认'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = '设计如此'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 9ac6af81b9..98fbcaaec9 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -283,8 +283,8 @@ $lang->bug->statusList['resolved'] = '已解決'; $lang->bug->statusList['closed'] = '已關閉'; $lang->bug->confirmedList[''] = ''; -$lang->bug->confirmedList[1] = '是'; -$lang->bug->confirmedList[0] = '否'; +$lang->bug->confirmedList[1] = '已確認'; +$lang->bug->confirmedList[0] = '未確認'; $lang->bug->resolutionList[''] = ''; $lang->bug->resolutionList['bydesign'] = '設計如此'; diff --git a/module/my/css/bug.css b/module/my/css/bug.css index 7cd56756df..2e23fc9a87 100644 --- a/module/my/css/bug.css +++ b/module/my/css/bug.css @@ -1,4 +1,3 @@ td.delayed {color: #fff; background: #e84e0f !important;} -.confirmed {color: #008000;} -.unconfirmed {color: #808080;} -.c-confirm {width:50px;} +.c-confirm {width:60px;} + diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 6b30ab7c81..27fba89d60 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -71,6 +71,10 @@ a.showMoreImage:hover {opacity: 1;} .c-object {width: 250px;} .c-case-step {width: 300px;} .c-actions-8 {width: 240px;} + +.confirmed, .confirm1 {color: #0DBB7D;} +.unconfirmed, .confirm0 {color: gray;} + #userNav>li.open>a:before, #userNav>li>a:hover:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;} #userNav .dropdown-menu {z-index: 2000;} #userNav .dropdown-menu:hover + .dropdown-toggle:before {position: absolute; bottom: 0px; left: calc(50% - 10px); width: 0; height: 0; content: ' '; border-color: transparent transparent #fff transparent; border-style: solid; border-width: 0 10px 10px 10px;}