Merge branch 'sprint/177_zhengrunyu_' into 'kanban'

*Fix bug

See merge request easycorp/zentaopms!933

module/kanban/js/common.js

@@ -42,9 +42,7 @@ function setMailto(field, value)
  */
 function initColorPicker()
 {
-    var colorList = ['#272E33', '#3DC6FD', '#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)
     {

module/kanban/js/view.js

@@ -180,7 +180,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>',

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

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      = '超出在制品限制';

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>
@@ -28,7 +29,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>