From ddbcdf63b41b5c512c9697e590d890700cc7b6da Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 09:09:28 +0800 Subject: [PATCH 1/5] * Fix bug #12233. --- module/repo/css/browse.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css index 373d732f0a..6d03a01e34 100644 --- a/module/repo/css/browse.css +++ b/module/repo/css/browse.css @@ -1,2 +1,4 @@ #mainMenu > .btn-toolbar {height: 35px; line-height: 35px;} +#sidebar>.sidebar-toggle>.icon {right: -2px; left: auto;} +.main-row {width: 99%;} .btn-toolbar > .last-sync-time {display: inline-block; float: left; margin-right: 10px;} From c342f476288e6cf995dd16097116a73e379ab1fd Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 09:21:39 +0800 Subject: [PATCH 2/5] * Fix bug #12210. --- module/index/css/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/index/css/index.css b/module/index/css/index.css index 9e40089173..535005d726 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -93,7 +93,7 @@ body.menu-hide {padding-left: 0;} #searchbox .dropdown-menu > li {display: none;} #searchbox .dropdown-menu > li.search-type-all {width: 100%; display: block;} #searchbox .dropdown-menu > li:hover {position: relative;} -#searchbox .dropdown-menu.show-quick-go.with-active {position: absolute; top: initial; bottom: 4px; min-height: 362px; padding-top: 30px;} +#searchbox .dropdown-menu.show-quick-go.with-active {position: absolute; top: initial; bottom: 4px; min-height: 318px; padding-top: 30px;} #searchbox .dropdown-menu.show-quick-go > li {display: block;} #searchbox .dropdown-menu.show-quick-go > li.active {width: 100%; position: absolute; top: 0; left: 0; right: 0;} #searchbox .dropdown-menu>li.active>a, #searchbox .dropdown-menu>li.selected>a {position: relative; color: #fff; background-color: #16a8f8;} From b13b635102a3d5a52d14b3419b72a81c14580d01 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 21 Apr 2021 09:35:48 +0800 Subject: [PATCH 3/5] * Fix error. --- module/custom/lang/de.php | 2 +- module/custom/lang/en.php | 2 +- module/custom/lang/fr.php | 2 +- module/custom/lang/vi.php | 2 +- module/custom/lang/zh-cn.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 408511bd8b..1cdf6d058a 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index c503045d1c..55ed40f1fd 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 6f7ef9f418..8e44c229c8 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index cf9b0cbf18..58232273fe 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index ef5ab02d70..b6a783ee18 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "一个{$lang->hourCommon}"; $lang->custom->convertRelationTitle = "请先设置{$lang->hourCommon}转换为%s的换算系数"; if($config->systemMode == 'new') $lang->custom->execution = '执行'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = '工时/'; $lang->custom->unitList['manhour'] = '人时/'; From 8f5359eba4990e955d5c76c8bd95bf9a7c6c71ea Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 10:27:33 +0800 Subject: [PATCH 4/5] * Fix bug #12096. --- module/tree/control.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/tree/control.php b/module/tree/control.php index ea7e48d692..214b4c6bdd 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -395,7 +395,9 @@ class tree extends control if($confirm == 'no') { $module = $this->tree->getByID($moduleID); - $confirmLang = $module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete; + $confirmLang = $this->lang->tree->confirmDelete; + if($module->type == 'line') $confirmLang = $this->lang->tree->confirmDeleteLine; + if($module->type == 'host') $confirmLang = $this->lang->tree->confirmDeleteHost; die(js::confirm($confirmLang, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes"))); } else From ae9fc5a1e8b86e838b42b7d4163c05797706b4f4 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 10:56:54 +0800 Subject: [PATCH 5/5] * Fix bug #12228. --- module/task/css/create.css | 2 +- module/task/js/create.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/css/create.css b/module/task/css/create.css index b9fc9218b2..8df0054d67 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -2,7 +2,7 @@ .title-group.required:after {display: none;} .title-group.required > .required:after {display: block; right: 29px; top: 5px;} -#copyStory-input:after {display: block; right: 85px; top: 5px;} +#copyStory-input:after {display: block; right: 110px; top: 5px;} #pri + .chosen-container > .chosen-single {border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important;} .pri-selector > .btn {padding: 5px 8px !important; width: 100%;} diff --git a/module/task/js/create.js b/module/task/js/create.js index e8f48c8011..e955040ec2 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -191,7 +191,7 @@ function setPreview() $('#preview a').attr('href', storyLink); $('#copyButton').removeClass('hidden'); $('.title-group.required > div').attr('id', 'copyStory-input').removeClass('.required'); - $('div.colorpicker').css('right', '90px');//Adjust for task #4151; + $('div.colorpicker').css('right', '80px');//Adjust for task #4151; $('#copyButton').css('width', '80px'); }