Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'

* Add button of set WIP and column name.

See merge request easycorp/zentaopms!216

module/common/lang/en.php

@@ -47,6 +47,7 @@ $lang->designedByAIUX = "<a href='https://api.zentao.net/goto.php?item=aiux' cla
 $lang->reset        = 'Reset';
 $lang->cancel       = 'Cancel';
 $lang->refresh      = 'Refresh';
+$lang->create       = 'Create';
 $lang->edit         = 'Edit';
 $lang->delete       = 'Delete';
 $lang->close        = 'Close';

module/common/lang/zh-cn.php

@@ -24,7 +24,6 @@ $lang->null      = '空';
 $lang->ellipsis  = '…';
 $lang->percent   = '%';
 $lang->dash      = '-';
-$lang->create    = '新建';
 
 $lang->zentaoPMS      = '禅道';
 $lang->pmsName        = '开源版';
@@ -48,6 +47,7 @@ $lang->designedByAIUX = "<a href='https://api.zentao.net/goto.php?item=aiux' cla
 $lang->reset        = '重填';
 $lang->cancel       = '取消';
 $lang->refresh      = '刷新';
+$lang->create       = '新建';
 $lang->edit         = '编辑';
 $lang->delete       = '删除';
 $lang->close        = '关闭';

module/execution/js/kanban.js

@@ -249,11 +249,6 @@ function renderLaneName($name, lane, $kanban, columns, kanban)
     }
 }
 
-function renderCardsCount($count, count, col)
-{
-    console.log('renderCardsCount', {$count, count, col});
-}
-
 /**
  * Updata kanban data
  * 更新看板上的数据
@@ -434,9 +429,9 @@ function createColumnMenu(options)
     var kanbanID = options.kanban;
     var items =
     [
-        {label: '编辑名称', url: $.createLink('kanban', 'editcolname', 'col=' + col.id + '&kanban=' + kanbanID), className: 'iframe'},
-        {label: '在制品数目', url: $.createLink('kanban', 'editcolwip'), className: 'iframe'},
-        {label: '看板卡片排序', items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards},
+        {label: editName, url: $.createLink('kanban', 'setColumn', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe'},
+        {label: setWIP, url: $.createLink('kanban', 'setWIP', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe'},
+        {label: sortColumn, items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards},
     ];
     return items;
 }
@@ -593,7 +588,7 @@ $(function()
     /* Init iframe modals */
     $(document).on('click', '.iframe', function(event)
     {
-        $(this).modalTrigger({show: true});
+        $(this).modalTrigger({show: true, width: '500px'});
         event.preventDefault();
     });
 

module/execution/lang/en.php

@@ -101,6 +101,9 @@ $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . '
 $lang->execution->noTeam          = 'No team members at the moment';
 $lang->execution->or              = ' or ';
 $lang->execution->selectProject   = 'Please select project';
+$lang->execution->editName        = 'Edit Name';
+$lang->execution->setWIP          = 'WIP Settings';
+$lang->execution->sortColumn      = 'Kanban Card Sorting';
 
 /* Fields of zt_team. */
 $lang->execution->root     = 'Root';

module/execution/lang/zh-cn.php

@@ -101,6 +101,9 @@ $lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon .
 $lang->execution->noTeam          = '暂时没有团队成员';
 $lang->execution->or              = '或';
 $lang->execution->selectProject   = '请选择项目';
+$lang->execution->editName        = '编辑名称';
+$lang->execution->setWIP          = '在制品数量设置（WIP）';
+$lang->execution->sortColumn      = '看板列卡片排序';
 
 /* Fields of zt_team. */
 $lang->execution->root     = '源ID';

module/execution/view/kanban.html.php

@@ -10,7 +10,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kanban.html.php';?>
-
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <div class="input-control space w-150px"><?php echo html::select('view', $lang->execution->kanbanViewList, $browseType, "onchange='changeView(this.value)' class='form-control chosen'");?></div>
@@ -108,4 +107,7 @@
 <?php js::set('executionID', $executionID);?>
 <?php js::set('kanbanGroup', $kanbanGroup);?>
 <?php js::set('browseType', $browseType);?>
+<?php js::set('editName', $lang->execution->editName);?>
+<?php js::set('setWIP', $lang->execution->setWIP);?>
+<?php js::set('sortColumn', $lang->execution->sortColumn);?>
 <?php include '../../common/view/footer.html.php';?>

module/kanban/model.php

@@ -67,6 +67,7 @@ class kanbanModel extends model
             foreach($columns[$laneID] as $columnID => $column)
             {
                 $columnData[$column->id]['id']         = $laneType . '-' . $column->type;
+                $columnData[$column->id]['columnID']   = $columnID;
                 $columnData[$column->id]['type']       = $column->type;
                 $columnData[$column->id]['name']       = $column->name;
                 $columnData[$column->id]['color']      = $column->color;