Merge branch 'master' into zentaopms_workflow

module/task/view/edit.html.php

@@ -20,7 +20,7 @@
 <?php js::set('confirmChangeProject', $lang->task->confirmChangeProject);?>
 <?php js::set('changeProjectConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>
-<?php $thWidth = $this->app->getClientLang() == 'en' ? 'w-85px' : 'w-70px';?>
+<?php $thWidth = common::checkEnLang() ? 'w-85px' : 'w-70px';?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>
@@ -151,10 +151,6 @@
                 <th class=<?php echo $thWidth;?>><?php echo $lang->task->estStarted;?></th>
                 <td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
               </tr>
-              <tr>
-                <th><?php echo $lang->task->realStarted;?></th>
-                <td><?php echo html::input('realStarted', $task->realStarted, "class='form-control form-date'");?></td>
-              </tr>
               <tr>
                 <th><?php echo $lang->task->deadline;?></th>
                 <td><?php echo html::input('deadline', $task->deadline, "class='form-control form-date'");?></td>
@@ -181,11 +177,16 @@
           </div>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->task->legendLife;?></div>
+            <?php $thWidth = common::checkEnLang() ? 'w-120px' : 'w-70px';?>
             <table class='table table-form'>
               <tr>
                 <th class=<?php echo $thWidth;?>><?php echo $lang->task->openedBy;?></th>
                 <td><?php echo $users[$task->openedBy];?></td>
               </tr>
+              <tr>
+                <th><?php echo $lang->task->realStarted;?></th>
+                <td><?php echo html::input('realStarted', $task->realStarted, "class='form-control form-date'");?></td>
+              </tr>
               <tr>
                 <th><?php echo $lang->task->finishedBy;?></th>
                 <td><?php echo html::select('finishedBy', $members, $task->finishedBy, "class='form-control chosen'");?></td>