From 65036c3cf7ede8b61347a0d559c25371b40e81c3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 28 Mar 2018 17:27:13 +0800
Subject: [PATCH]  * adjust for table width.

---
 module/datatable/model.php   | 3 +--
 module/my/view/task.html.php | 8 ++++----
 module/my/view/todo.html.php | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/module/datatable/model.php b/module/datatable/model.php
index 659de29674..577ad6b7a2 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -142,9 +142,8 @@ class datatableModel extends model
             }
             else
             {
-                if($id == 'id') echo "<div class='checkbox-primary check-all' title='{$this->lang->selectAll}'><label></label>";
+                if($id == 'id') echo "<div class='checkbox-primary check-all' title='{$this->lang->selectAll}'><label></label></div>";
                 common::printOrderLink($id, $orderBy, $vars, $col->title);
-                if($id == 'id') echo "</div>";
             }
             echo '</th>';
         }
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 0f6f4fea0f..3130d35383 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -29,17 +29,17 @@
       <form id='myTaskForm' class="main-table table-task" data-ride="table" method="post">
         <?php $canBatchEdit  = common::hasPriv('task', 'batchEdit');?>
         <?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
-        <table class="table has-sort-head table-lg">
+        <table class="table has-sort-head table-lg table-fixed">
           <?php $vars = "type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
           <thead>
             <tr>
               <th class="w-100px">
+                <?php if($canBatchEdit or $canBatchClose):?>
                 <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
-                  <?php if($canBatchEdit or $canBatchClose):?>
                   <label></label>
-                  <?php endif;?>
-                  <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </div>
+                <?php endif;?>
+                <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
               </th>
               <th class='w-pri'>   <?php common::printOrderLink('pri',         $orderBy, $vars, $lang->priAB);?></th>
               <th class='w-150px'> <?php common::printOrderLink('project',     $orderBy, $vars, $lang->task->project);?></th>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 48edc43b4a..fad02cd953 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -44,12 +44,12 @@
           <thead>
             <tr>
               <th class="c-id">
+                <?php if($type != 'cycle' and (common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture))):?>
                 <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
-                  <?php if($type != 'cycle' and (common::hasPriv('todo', 'batchEdit') or (common::hasPriv('todo', 'import2Today') and $importFuture))):?>
                   <label></label>
-                  <?php endif;?>
-                  <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
                 </div>
+                <?php endif;?>
+                <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
               </th>
               <th class="c-date">  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
               <th class="c-type">  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>