Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

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/';

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/';

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/';

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/';

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']    = '人时/';

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;}

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;}

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%;}

module/task/js/create.js

@@ -193,7 +193,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');
     }
 

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