From e1846cb0673057aa0beb436a26f485e7d7c87348 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 27 Apr 2018 15:46:46 +0800
Subject: [PATCH]  * adjust for kanban and import task page.

---
 module/my/view/story.html.php           |   2 +-
 module/project/css/importtask.css       |   3 +-
 module/project/view/importtask.html.php | 133 ++++++++++++------------
 3 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 16e91d76b9..59e675868f 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -60,8 +60,8 @@
               <input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' /> 
               <label></label>
               <?php endif;?>
-              <?php printf('%03d', $story->id);?>
             </div>
+            <?php printf('%03d', $story->id);?>
           </td>
           <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td class='c-product'><?php echo $story->productTitle;?></td>
diff --git a/module/project/css/importtask.css b/module/project/css/importtask.css
index 9c7db148a6..7e4673db47 100644
--- a/module/project/css/importtask.css
+++ b/module/project/css/importtask.css
@@ -1,2 +1 @@
-#titlebar .input-group {position: relative; top: -6px; margin-left: 10px; width: 300px;}
-#titlebar .input-group-addon, #titlebar .form-control {font-size: 12px; padding: 5px 10px; line-height: 18px; height: 30px}
+#fromproject_chosen .chosen-single{width: 220px;}
diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php
index 8957d6d75e..f3b01cf063 100644
--- a/module/project/view/importtask.html.php
+++ b/module/project/view/importtask.html.php
@@ -11,77 +11,80 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/tablesorter.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix pull-left'><?php echo html::icon($lang->icons['task']);?></span>
-    <strong class='pull-left'><small class='text-muted'><?php echo html::icon($lang->icons['import']);?></small> <?php echo $lang->project->importTask;?></strong>
-    <div class='input-group pull-left' style='font-weight:normal;'>
+<div id='mainMenu' class='clearfix'>
+  <div class='pull-left btn-toolbar'>
+    <?php echo html::a($this->createLink('project', 'importTask', "project=$projectID"), "<span class='text'>{$lang->project->importTask}</span>", '', "class='btn btn-link btn-active-text'");?>
+    <div class='input-control input-group space w-150px'>
       <?php $projects = array(0 => $lang->project->allProjects) + $projects;?>
       <span class='input-group-addon'><?php echo $lang->project->selectProject;?></span>
       <?php  echo html::select('fromproject', $projects, $fromProject, "onchange='reload($projectID, this.value)' class='form-control chosen'");?>
     </div>
   </div>
 </div>
-<form class='form-condensed' method='post' target='hiddenwin' id='importTaskForm'>
-  <table class='table tablesorter table-fixed table-selectable'>
-    <thead>
-    <tr class='colhead'>
-      <th class='w-id'><?php echo $lang->idAB;?></th>
-      <th class='w-150px {sorter:false}'><?php echo $lang->project->name ?></th>
-      <th class='w-pri'><?php echo $lang->priAB;?></th>
-      <th class='w-p30'><?php echo $lang->task->name;?></th>
-      <th class='w-user'><?php echo $lang->task->assignedTo;?></th>
-      <th class='w-hour'><?php echo $lang->task->leftAB;?></th>
-      <th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
-      <th class='w-status'><?php echo $lang->statusAB;?></th>
-      <th><?php echo $lang->task->story;?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($tasks2Imported as $task):?>
-    <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
-    <tr class='text-center'>
-      <td class='cell-id'>
-        <input type='checkbox' name='tasks[]' value='<?php echo $task->id;?>' />
-        <?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
-      </td>
-      <td><?php echo substr($projects[$task->project], 2);?></td>
-      <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
-      <td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
-      <td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
-      <td><?php echo $task->left;?></td>
-      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-      <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
-      <td class='text-left nobr'>
-        <?php 
-        if($task->storyID)
-        {
-            if(common::hasPriv('story', 'view'))
+<div id='mainContent' class='main-content'>
+  <form class='main-table' method='post' target='hiddenwin' id='importTaskForm' data-ride='table'>
+    <table class='table table-fixed'>
+      <thead>
+        <tr>
+          <th class='c-id'>
+            <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
+              <label></label>
+            </div>
+            <?php echo $lang->idAB;?>
+          </th>
+          <th class='w-150px'><?php echo $lang->project->name ?></th>
+          <th class='w-pri'><?php echo $lang->priAB;?></th>
+          <th class='w-p30'><?php echo $lang->task->name;?></th>
+          <th class='w-user'><?php echo $lang->task->assignedTo;?></th>
+          <th class='w-hour'><?php echo $lang->task->leftAB;?></th>
+          <th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
+          <th class='w-status'><?php echo $lang->statusAB;?></th>
+          <th><?php echo $lang->task->story;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($tasks2Imported as $task):?>
+        <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
+        <tr>
+          <td class='c-id'>
+            <div class="checkbox-primary">
+              <input type='checkbox' name='tasks[]' value='<?php echo $task->id;?>' />
+              <label></label>
+            </div>
+            <?php printf('%03d', $task->id);?>
+          </td>
+          <td><?php echo substr($projects[$task->project], 2);?></td>
+          <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
+          <td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+          <td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
+          <td><?php echo $task->left;?></td>
+          <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
+          <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
+          <td class='text-left nobr'>
+            <?php 
+            if($task->storyID)
             {
-                echo html::a($this->createLink('story', 'view', "storyid=$task->storyID"), $task->storyTitle);
+                if(common::hasPriv('story', 'view'))
+                {
+                    echo html::a($this->createLink('story', 'view', "storyid=$task->storyID"), $task->storyTitle);
+                }
+                else
+                {
+                    echo $task->storyTitle;
+                }
             }
-            else
-            {
-                echo $task->storyTitle;
-            }
-        }
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    <tfoot>
-      <tr>
-        <td colspan='9'>
-          <div class='table-actions clearfix'>
-            <?php echo html::selectButton();?>
-            <?php echo html::submitButton($lang->project->importTask);?>
-          </div>
-        </td>
-      </tr>
-    </tfoot>
-    </tbody>
-  </table>
-  <div></div>
-</form>
+            ?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+    </table>
+    <?php if($tasks2Imported):?>
+    <div class='table-footer'>
+      <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <div class="table-actions btn-toolbar"><?php echo html::submitButton($lang->project->importTask);?></div>
+    </div>
+    <?php endif;?>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>