From d7b47e42b0d790510a4b44feb9eaad73962257a4 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Tue, 14 Dec 2021 14:35:24 +0800
Subject: [PATCH 1/2] *Fix bug

---
 module/kanban/js/common.js             | 4 ++--
 module/kanban/js/view.js               | 2 +-
 module/kanban/lang/en.php              | 1 +
 module/kanban/lang/zh-cn.php           | 1 +
 module/kanban/view/createlane.html.php | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js
index 5912d2d2f3..8bfd3536e3 100644
--- a/module/kanban/js/common.js
+++ b/module/kanban/js/common.js
@@ -42,9 +42,9 @@ function setMailto(field, value)
  */
 function initColorPicker()
 {
-    var colorList = ['#272E33', '#3DC6FD', '#2B529C', '#E48600', '#D2323D', '#229F24', '#777777', '#D2691E', '#008B8B', '#2E8B57', '#4169E1', '#4B0082', '#FA8072', '#BA55D3', '#6B8E23'];
+    var colorList = ['#7ec5ff', '#333', '#2B529C', '#E48600', '#D2323D', '#229F24', '#777777', '#D2691E', '#008B8B', '#2E8B57', '#4169E1', '#4B0082', '#FA8072', '#BA55D3', '#6B8E23'];
 
-    var selectedColor = $('input[name=color]').val();
+    var selectedColor = $().val();
     if(selectedColor && $.inArray(selectedColor.toUpperCase(), colorList) == -1) colorList.unshift(selectedColor);
     colorList.forEach(function(color, index)
     {
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 673cd4f803..1cf1de3c3a 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -166,7 +166,7 @@ function renderLaneName($lane, lane, $kanban, columns, kanban)
     if(!$lane.children('.actions').length && (canSet || canDelete))
     {
         $([
-          '<div class="actions" title="' + lang.more + '">',
+          '<div class="actions" title="' + kanbanLang.more + '">',
           '<a data-contextmenu="lane" data-lane="' + lane.id + '" data-kanban="' + kanban.id + '">',
           '<i class="icon icon-ellipsis-v"></i>',
           '</a>',
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 594278a62e..601281663c 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -116,6 +116,7 @@ $lang->kanban->moveDown           = 'Swimlane Down';
 $lang->kanban->laneMove           = 'Swimlane Sorting';
 $lang->kanban->laneGroup          = 'Lane Group';
 $lang->kanban->cardsSort          = 'Cards Sortting';
+$lang->kanban->more               = 'More';
 $lang->kanban->moreAction         = 'More Action';
 $lang->kanban->noGroup            = 'None';
 $lang->kanban->limitExceeded      = 'Limit Exceeded';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index c54bfaa31a..a8cae331cd 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -117,6 +117,7 @@ $lang->kanban->moveDown           = '泳道下移';
 $lang->kanban->laneMove           = '泳道排序';
 $lang->kanban->laneGroup          = '泳道分组';
 $lang->kanban->cardsSort          = '卡片排序';
+$lang->kanban->more               = '更多';
 $lang->kanban->moreAction         = '更多操作';
 $lang->kanban->noGroup            = '无';
 $lang->kanban->limitExceeded      = '超出在制品限制';
diff --git a/module/kanban/view/createlane.html.php b/module/kanban/view/createlane.html.php
index 72637b6004..03cbd3bcee 100644
--- a/module/kanban/view/createlane.html.php
+++ b/module/kanban/view/createlane.html.php
@@ -28,7 +28,7 @@
           <th><?php echo $lang->kanbanlane->color;?></th>
           <td>
             <div id='color-picker'></div>
-            <?php echo html::input('color', '#3DC6FD', "class='hidden'");?>
+            <?php echo html::input('color', '#7EC5FF', "class='hidden'");?>
           </td>
         </tr>
         <tr>

From 59eea3a8d3bcb07f99f6eab124afad5f87d23fcd Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Tue, 14 Dec 2021 14:54:19 +0800
Subject: [PATCH 2/2] *fix

---
 module/kanban/js/common.js             | 2 --
 module/kanban/view/createlane.html.php | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js
index 8bfd3536e3..bd6103cae8 100644
--- a/module/kanban/js/common.js
+++ b/module/kanban/js/common.js
@@ -42,8 +42,6 @@ function setMailto(field, value)
  */
 function initColorPicker()
 {
-    var colorList = ['#7ec5ff', '#333', '#2B529C', '#E48600', '#D2323D', '#229F24', '#777777', '#D2691E', '#008B8B', '#2E8B57', '#4169E1', '#4B0082', '#FA8072', '#BA55D3', '#6B8E23'];
-
     var selectedColor = $().val();
     if(selectedColor && $.inArray(selectedColor.toUpperCase(), colorList) == -1) colorList.unshift(selectedColor);
     colorList.forEach(function(color, index)
diff --git a/module/kanban/view/createlane.html.php b/module/kanban/view/createlane.html.php
index 03cbd3bcee..03de436fba 100644
--- a/module/kanban/view/createlane.html.php
+++ b/module/kanban/view/createlane.html.php
@@ -1,5 +1,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
+<?phpjs::set('colorList',$config->kanban->laneColorList);?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2>