Merge branch 'sprint/tianshujie_css' into 'master'

Sprint/tianshujie css

See merge request easycorp/zentaopms!6061

module/block/lang/en.php

@@ -49,7 +49,7 @@ $lang->block->contribute   = 'Personal Contribution';
 $lang->block->finish       = 'Finish';
 
 $lang->block->leftToday           = 'Remained Work';
-$lang->block->myTask              = 'My Tasks';
+$lang->block->myTask              = 'Tasks';
 $lang->block->myStory             = 'Stories';
 $lang->block->myBug               = 'Bugs';
 $lang->block->myExecution         = 'Unclosed ' . $lang->executionCommon . 's';

module/block/lang/fr.php

@@ -49,7 +49,7 @@ $lang->block->contribute   = 'Personal Contribution';
 $lang->block->finish       = 'Terminé';
 
 $lang->block->leftToday           = 'Reste à faire';
-$lang->block->myTask              = 'Mes Tâches';
+$lang->block->myTask              = 'Tâches';
 $lang->block->myStory             = 'Stories';
 $lang->block->myBug               = 'Bugs';
 $lang->block->myExecution         = 'Unclosed ' . $lang->executionCommon . 's';

module/task/css/recordestimate.css

@@ -21,5 +21,7 @@
 .table.has-sort-head thead>tr>th>a:after, .table.has-sort-head thead>tr>th>a:before {top: -7px;}
 .table.has-sort-head thead>tr>th>a:hover, .table.has-sort-head thead>tr>th>a:hover:after, .table.has-sort-head thead>tr>th>a:hover:before {color: #000;}
 
+.taskEffort thead > tr > th {padding-right: 10px !important;}
 #toggleFoldIcon:hover {cursor: pointer;}
 #toggleFoldIcon .icon-border {width: 20px; height: 20px; border-radius: 8px;}
+#toggleFoldIcon {margin-bottom: 10px;}

module/task/view/lineareffort.html.php

@@ -3,11 +3,13 @@
 #mainContent {min-height: 500px;}
 #mainContent .main-header {padding-bottom: 5px;}
 #linearefforts {margin-top: -18px;}
-#linearefforts .nav-tabs{margin-bottom: 10px;}
+#linearefforts .nav-tabs {margin-bottom: 10px;}
+#linearefforts .nav-tabs > li.active > a {color: #313c52 !important;}
 #linearefforts div.caption {height:25px; margin: 10px 0px;}
 #linearefforts div.caption .account{font-weight: bolder;}
-#linearefforts .tabs ul > li > a { padding-top: 6px; padding-bottom: 4px;}
-#linearefforts .table thead > tr > th { padding-right: 10px;}
+#linearefforts .tabs ul > li > a {padding-top: 6px; padding-bottom: 4px;}
+#linearefforts .table thead > tr > th {padding-right: 10px;}
+#toggleFoldIcon {margin-bottom: 10px;}
 </style>
 <?php
 $this->app->loadLang('execution');
@@ -156,3 +158,6 @@ ksort($myOrders);
   </div>
 </div>
 <?php endif;?>
+<?php if($i > 4):?>
+<style>#legendMyEffort > .table {margin-bottom: 5px;}</style>
+<?php endif;?>

module/task/view/recordestimate.html.php

@@ -67,10 +67,10 @@ if(!empty($members) && $task->mode == 'linear')
         <tr class='text-center'>
           <?php $vars = "taskID=$task->id&from=$from&orderBy=%s";?>
           <th class="w-120px"><?php common::printOrderLink('date', !strpos($orderBy, ',') ? $orderBy : 'date_asc', $vars, $lang->task->date);?></th>
-          <th class="w-120px"><?php echo $lang->task->recordedBy;?></th>
-          <th><?php echo $lang->task->work;?></th>
-          <th class="thWidth"><?php echo $lang->task->consumed;?></th>
-          <th class="thWidth"><?php echo $lang->task->left;?></th>
+          <th class="w-120px text-center"><?php echo $lang->task->recordedBy;?></th>
+          <th class='text-left'><?php echo $lang->task->work;?></th>
+          <th class="thWidth text-center"><?php echo $lang->task->consumed;?></th>
+          <th class="thWidth text-center"><?php echo $lang->task->left;?></th>
           <th class='c-actions-2'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
@@ -177,4 +177,7 @@ if(!empty($members) && $task->mode == 'linear')
     <?php endif;?>
   </div>
 </div>
+<?php if(count($efforts) > 3):?>
+<style>.taskEffort {margin-bottom: 5px;}</style>
+<?php endif;?>
 <?php include '../../common/view/footer.lite.html.php';?>