* Move the assignTo btton to actions column and remove label-dot near status.

module/my/view/task.html.php

@@ -78,12 +78,10 @@
             <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?>
           </td>
           <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
-          <td class='c-user'>
+          <td class="c-assign">
             <?php
-            $assignedToText = !empty($task->assignedTo) ? zget($users, $task->assignedTo) : $this->lang->task->noAssigned;
             $btnTextClass   = 'text-red';
-            $btnClass = $assignedToText == 'closed' ? ' disabled' : '';
-            echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'");
+            echo "<span class='$btnTextClass'>" . zget($users, $task->assignedTo) . "</span>";
             ?>
           </td>
           <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
@@ -91,7 +89,7 @@
           <td class='c-hours'><?php echo $task->consumed;?></td>
           <td class='c-hours'><?php echo $task->left;?></td>
           <td class='c-date <?php if(isset($task->delay)) echo 'text-red';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-          <td class='c-status'><span class="status-<?php echo $task->status;?>"><span class="label label-dot"></span> <?php echo $lang->task->statusList[$task->status];?></span></td>
+          <td class='c-status'><span class="status-<?php echo $task->status;?>"><?php echo $lang->task->statusList[$task->status];?></span></td>
           <td class='c-actions'>
             <?php
             if($task->needConfirm)
@@ -101,9 +99,7 @@
             }
             else
             {
-                echo "<div class='more'>";
-                if($task->status == 'wait') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-                echo "</div>";
+                common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
 
                 if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
                 if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);

module/my/view/todo.html.php

@@ -94,7 +94,7 @@
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td class="c-begin"><?php echo $todo->begin;?></td>
           <td class="c-end"><?php echo $todo->end;?></td>
-          <td class="c-status"><span class="status-<?php echo $todo->status;?>"><span class="label label-dot"></span> <?php echo $lang->todo->statusList[$todo->status];?></span></td>
+          <td class="c-status"><span class="status-<?php echo $todo->status;?>"><?php echo $lang->todo->statusList[$todo->status];?></span></td>
           <td class="c-actions">
             <?php
             if($todo->status == 'done' or $todo->status == 'closed')

module/product/view/project.html.php

@@ -52,14 +52,12 @@
           <?php if(isset($project->delay)):?>
           <td class='c-status' title='<?php echo $lang->project->delayed;?>'>
             <span class="status-delayed">
-              <span class="label label-dot"></span>
               <span class='status-text'><?php echo $lang->project->delayed;?></span>
             </span>
           </td>
           <?php else:?>
           <td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
             <span class="status-<?php echo $project->status?>">
-              <span class="label label-dot"></span>
               <span class='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
             </span>
           </td>

module/productplan/view/view.html.php

@@ -142,8 +142,7 @@
                 <td><?php echo $story->estimate;?></td>
                 <td>
                   <span class='status-<?php echo $story->status?>'>
-                    <span class='label label-dot'></span>
-                    <?php echo $lang->story->statusList[$story->status];?><span>
+                    <?php echo $lang->story->statusList[$story->status];?>
                   </span>
                 </td>
                 <td><?php echo $lang->story->stageList[$story->stage];?></td>
@@ -378,7 +377,6 @@
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>
                   <span class='status-<?php echo $bug->status?>'>
-                    <span class='label label-dot'></span>
                     <?php echo $lang->bug->statusList[$bug->status];?>
                   </span>
                 </td>

module/project/view/grouptask.html.php

@@ -119,7 +119,7 @@
         <th class="w-50px"><?php echo $lang->task->progress;?></th>
         <th class="c-type"><?php echo $lang->typeAB;?></th>
         <th class="c-date"><?php echo $lang->task->deadlineAB;?></th>
-        <th class="c-actions-2"><?php echo $lang->actions;?></th>
+        <th class="c-actions-3"><?php echo $lang->actions;?></th>
       </tr>
     </thead>
     <tbody>
@@ -191,9 +191,8 @@
             if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;
           ?>
         </td>
-        <td class="c-status"><span class='status-<?php echo $task->status;?>'><span class="label label-dot"></span> <?php echo $lang->task->statusList[$task->status];?></span></td>
-        <?php $assignedToRealName = $task->assignedToRealName ? $task->assignedToRealName : $lang->task->noAssigned;?>
-        <td class="c-assign text-left has-btn"><?php echo html::a($this->createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', "class='iframe btn btn-icon-left btn-sm' $assignedToClass");?></td>
+        <td class="c-status"><span class='status-<?php echo $task->status;?>'> <?php echo $lang->task->statusList[$task->status];?></span></td>
+        <td class="c-assign"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
         <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
         <td class="c-hours em"><?php echo $task->estimate;?></td>
         <td class="c-hours em"><?php echo $task->consumed;?></td>
@@ -202,6 +201,7 @@
         <td class="c-type"><?php echo zget($lang->task->typeList, $task->type);?></td>
         <td class='c-date <?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
         <td class="c-actions">
+          <?php common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);?>
           <?php common::printIcon('task', 'edit', "taskid=$task->id", '', 'list');?>
           <?php common::printIcon('task', 'delete', "projectID=$task->project&taskid=$task->id", '', 'list', '', 'hiddenwin');?>
         </td>

module/release/view/browse.html.php

@@ -61,7 +61,6 @@
         <td class='text-center'><?php echo $release->date;?></td>
         <td class='c-status' title='<?php echo zget($lang->release->statusList, $release->status);?>'>
           <span class="status-<?php echo $release->status?>">
-            <span class="label label-dot"></span>
             <span class='status-text'><?php echo zget($lang->release->statusList, $release->status);?></span>
           </span>
         </td>

module/release/view/view.html.php

@@ -107,7 +107,9 @@
                     <td class='text-left nobr' title='<?php echo $story->title?>'><?php echo html::a($storyLink,$story->title, '', "class='preview'");?></td>
                     <td><?php echo $users[$story->openedBy];?></td>
                     <td><?php echo $story->estimate;?></td>
-                    <td><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo $lang->story->statusList[$story->status];?></span></td>
+                    <td>
+                      <span class='status-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></span>
+                    </td>
                     <td><?php echo $lang->story->stageList[$story->stage];?></td>
                     <td class='c-actions'>
                       <?php
@@ -175,7 +177,9 @@
                       <?php echo sprintf('%03d', $bug->id);?>
                     </td>
                     <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='preview'");?></td>
-                    <td><span class='status-<?php echo $bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></td>
+                    <td>
+                      <span class='status-<?php echo $bug->status?>'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
+                    </td>
                     <td><?php echo $users[$bug->openedBy];?></td>
                     <td><?php echo substr($bug->openedDate, 5, 11)?></td>
                     <td><?php echo $users[$bug->resolvedBy];?></td>

module/story/model.php

@@ -2354,7 +2354,7 @@ class storyModel extends model
                 break;
             case 'status':
                 echo "<span class='status-{$story->status}'>";
-                echo "<span class='label label-dot'></span> " . $this->lang->story->statusList[$story->status];
+                echo $this->lang->story->statusList[$story->status];
                 echo '</span>';
                 break;
             case 'estimate':

module/task/config.php

@@ -197,5 +197,5 @@ $config->task->datatable->fieldList['lastEditedDate']['required'] = 'no';
 
 $config->task->datatable->fieldList['actions']['title']    = 'actions';
 $config->task->datatable->fieldList['actions']['fixed']    = 'right';
-$config->task->datatable->fieldList['actions']['width']    = '160';
+$config->task->datatable->fieldList['actions']['width']    = '180';
 $config->task->datatable->fieldList['actions']['required'] = 'yes';

module/task/model.php

@@ -2418,7 +2418,7 @@ class taskModel extends model
                     echo $this->lang->task->typeList[$task->type];
                     break;
                 case 'status':
-                    $storyChanged ? print("<span class='status-changed'><span class='label label-dot'></span> {$this->lang->story->changed}</span>") : print("<span class='status-{$task->status}'><span class='label label-dot'></span> {$this->lang->task->statusList[$task->status]}</span>");
+                    $storyChanged ? print("<span class='status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-{$task->status}'> {$this->lang->task->statusList[$task->status]}</span>");
                     break;
                 case 'estimate':
                     echo round($task->estimate, 1);
@@ -2450,15 +2450,8 @@ class taskModel extends model
                 case 'assignedTo':
                     $btnTextClass   = '';
                     $assignedToText = zget($users, $task->assignedTo);
-                    $btnTextClass   = '';
-                    if(empty($task->assignedTo))
-                    {
-                        $btnTextClass = 'text-primary';
-                        $assignedToText = $this->lang->task->noAssigned;
-                    } else if($task->assignedTo == $account) $btnTextClass = 'text-red';
-                    $btnClass = $assignedToText == 'closed' ? ' disabled' : '';
-                    
-                    echo html::a(helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-icon-left btn-sm {$btnClass}'");
+                    if($task->assignedTo == $account) $btnTextClass = 'text-red';
+                    echo "<span class='{$btnTextClass}'>{$assignedToText}</span>";
                     break;
                 case 'assignedDate':
                     echo substr($task->assignedDate, 5, 11);
@@ -2519,10 +2512,8 @@ class taskModel extends model
                         break;
                     }
 
-                    echo "<div class='more'>";
-                    if($task->status == 'wait') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-                    echo "</div>";
-                    
+                    common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+
                     if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
                     if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
                     if($task->status == 'done' or $task->status == 'cancel' or $task->status == 'closed') common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list', '', '', 'iframe', true);