From 0f26f8f7d7e4c03f25639403c4f9305155b275d1 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Tue, 22 Nov 2016 17:19:08 +0800
Subject: [PATCH 1/2]  * finish task #2777.

---
 module/project/view/kanban.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 2b07eeb07d..f31355e368 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -70,6 +70,7 @@
                   <div class='dropdown-menu pull-right'>
                     <?php
                     echo (common::hasPriv('task', 'create')) ? html::a($this->createLink('task', 'create', "projectID=$story->project&storyID=$story->story&moduleID=$story->module", '', true), $lang->project->wbs, '', "class='kanbanFrame'") : '';
+                    echo (common::hasPriv('task', 'batchCreate')) ? html::a($this->createLink('task', 'batchCreate', "projectID=$story->project&storyID=$story->story&iframe=true", '', true), $lang->project->batchWBS, '', "class='kanbanFrame'") : '';
                     echo (common::hasPriv('project', 'unlinkStory')) ? html::a($this->createLink('project', 'unlinkStory', "projectID=$story->project&storyID=$story->story&confirm=no", '', true), $lang->project->unlinkStory, 'hiddenwin') : '';
                     echo (common::hasPriv('story', 'activate') and storyModel::isClickable($story, 'activate')) ? html::a($this->createLink('story', 'activate', "storyID=$story->id", '', 'true'), $lang->story->activate, '', "class='kanbanFrame'") : '';
                     echo (common::hasPriv('story', 'close')    and storyModel::isClickable($story, 'close')) ? html::a($this->createLink('story', 'close', "storyID=$story->id", '', 'true'), $lang->story->close, '', "class='kanbanFrame'") : '';

From 7a9b077972f78d9c42fcfd34e438a1d1527cc25a Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 23 Nov 2016 09:24:38 +0800
Subject: [PATCH 2/2]  * finish task #2745.

---
 module/task/view/create.html.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index a7dcd0d1fc..f6c9c6d3e1 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -29,7 +29,7 @@
       <tr>
         <th class='w-100px'><?php echo $lang->task->module;?></th>
         <td id='moduleIdBox' class='w-p25-f'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?></td>
-        <td class='w-p25-f'></td><td></td>
+        <td></td><td></td><td></td><td></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->type;?></th>
@@ -45,7 +45,7 @@
       <?php if(strpos(",$showFields,", ',story,') !== false):?>
       <tr>
         <th><?php echo $lang->task->story;?></th>
-        <td colspan='3'>
+        <td colspan='5'>
           <div class='input-group'>
             <?php if(empty($stories)):?>
             <span id='story'><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank'), html::a("javascript:loadStories($project->id)", $lang->refresh));?></span>
@@ -59,7 +59,7 @@
       <?php endif;?>
       <tr>
         <th><?php echo $lang->task->name;?></th>
-        <td colspan='3'>
+        <td colspan='5'>
           <div class='row-table'>
             <div class='col-table'>
               <div class="input-group w-p100">
@@ -113,7 +113,7 @@
       </tr>
       <tr>
         <th><?php echo $lang->task->desc;?></th>
-        <td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
+        <td colspan='5'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
       </tr>
       <?php
       $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
@@ -124,7 +124,7 @@
       <tr>
         <th><?php echo ($hiddenEstStarted and $hiddenDeadline) ? $lang->task->mailto : $lang->task->datePlan;?></th>
         <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
-        <td>
+        <td colspan='2'>
           <div class='input-group' id='dataPlanGroup'>
             <?php if(!$hiddenEstStarted):?>
             <?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
@@ -139,7 +139,7 @@
         </td>
         <?php endif;?>
         <?php if(!$hiddenMailto):?>
-        <?php $colspan = ($hiddenEstStarted and $hiddenDeadline) ? '3' : '2';?>
+        <?php $colspan = ($hiddenEstStarted and $hiddenDeadline) ? '5' : '4';?>
         <td colspan='<?php echo $colspan?>'>
           <div id='mailtoGroup' class='input-group'>
             <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
@@ -154,15 +154,15 @@
       <?php endif;?>
       <tr>
         <th><?php echo $lang->files;?></th>
-        <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
+        <td colspan='5'><?php echo $this->fetch('file', 'buildform');?></td>
       </tr>
       <tr>
         <th><?php echo $lang->task->afterSubmit;?></th>
-        <td colspan='3'><?php echo html::radio('after', $lang->task->afterChoices, 'continueAdding');?></td>
+        <td colspan='5'><?php echo html::radio('after', $lang->task->afterChoices, 'continueAdding');?></td>
       </tr>
       <tr>
         <td></td>
-        <td colspan='3'><?php echo html::submitButton() . html::backButton();?></td>
+        <td colspan='5'><?php echo html::submitButton() . html::backButton();?></td>
       </tr>
     </table>
     <span id='responser'></span>