* Finish task #41786.

module/block/control.php

@@ -1650,8 +1650,12 @@ class block extends control
         $status = isset($this->params->type)  ? $this->params->type : 'all';
         $pager  = pager::init(0, $count, 1);
 
+        $projectPairs = array();
+        if($this->config->systemMode == 'new') $projectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchPairs('id', 'name');
+
         $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
         $this->view->executionStats = $this->loadModel('project')->getStats($projectID, $status, 0, 0, 30, 'id_asc', $pager);
+        $this->view->projectPairs   = $projectPairs;
     }
 
     /**

module/block/view/executionblock.html.php

@@ -10,7 +10,10 @@
  * @link        http://www.zentao.net
  */
 ?>
-<style>.table .c-progress {width: 60px;}</style>
+<style>
+.table .c-progress {width: 60px;}
+.c-hours {text-align: right !important;}
+</style>
 <?php if(empty($executionStats)): ?>
 <div class='empty-tip'><?php common::printLink('execution', 'create', '', "<i class='icon-plus'></i> " . $lang->execution->create, '', "class='btn btn-primary'")?></div>
 <?php else:?>
@@ -18,7 +21,7 @@
   <table class='table table-borderless table-hover table-fixed table-fixed-head tablesorter block-projects tablesorter'>
     <thead>
       <tr class='text-center'>
-        <th class='c-name text-left'><?php echo $lang->execution->name;?></th>
+        <th class='c-name text-left'><?php echo $lang->execution->execName;?></th>
         <th class="c-date"><?php echo $lang->execution->end;?></th>
         <?php if($longBlock):?>
         <?php $thClass = common::checkNotCN() ? 'w-85px' : 'c-hours';?>
@@ -39,6 +42,7 @@
       <?php
       $appid    = isset($_GET['entry']) ? "class='app-btn text-center' data-id='{$this->get->entry}'" : "class='text-center'";
       $viewLink = $this->createLink('execution', 'task', 'executionID=' . $execution->id);
+      if($config->systemMode == 'new') $execution->name = zget($projectPairs, $execution->project, '') . ' / ' . $execution->name;
       ?>
       <tr <?php echo $appid?>>
         <td class='c-name text-left' title='<?php echo $execution->name;?>'><nobr><?php echo html::a($viewLink, $execution->name, '', "title='$execution->name'");?></nobr></td>

module/execution/lang/zh-cn.php

@@ -29,7 +29,7 @@ $lang->execution->closedDate      = '关闭日期';
 $lang->execution->canceledBy      = '由谁取消';
 $lang->execution->canceledDate    = '取消日期';
 $lang->execution->begin           = '开始日期';
-$lang->execution->end             = '结束日期';
+$lang->execution->end             = '截止日期';
 $lang->execution->dateRange       = '起始日期';
 $lang->execution->realBegan       = '实际开始';
 $lang->execution->realEnd         = '实际结束';
@@ -321,7 +321,7 @@ $lang->execution->notAllowRemoveProducts    = "该{$lang->productCommon}中的{$
 $lang->execution->errorNoLinkedProducts     = "该{$lang->executionCommon}没有关联的{$lang->productCommon}，系统将转到{$lang->productCommon}关联页面";
 $lang->execution->errorSameProducts         = "{$lang->executionCommon}不能关联多个相同的{$lang->productCommon}。";
 $lang->execution->errorBegin                = "{$lang->executionCommon}的开始时间不能小于所属项目的开始时间%s。";
-$lang->execution->errorEnd                  = "{$lang->executionCommon}的结束时间不能大于所属项目的结束时间%s。";
+$lang->execution->errorEnd                  = "{$lang->executionCommon}的截止时间不能大于所属项目的结束时间%s。";
 $lang->execution->accessDenied              = "您无权访问该{$lang->executionCommon}！";
 $lang->execution->tips                      = '提示';
 $lang->execution->afterInfo                 = "{$lang->executionCommon}添加成功，您现在可以进行以下操作：";

module/execution/lang/zh-tw.php

@@ -29,7 +29,7 @@ $lang->execution->closedDate      = '關閉日期';
 $lang->execution->canceledBy      = '由誰取消';
 $lang->execution->canceledDate    = '取消日期';
 $lang->execution->begin           = '開始日期';
-$lang->execution->end             = '結束日期';
+$lang->execution->end             = '截止日期';
 $lang->execution->dateRange       = '起始日期';
 $lang->execution->realBegan       = '實際開始';
 $lang->execution->realEnd         = '實際結束';
@@ -317,7 +317,7 @@ $lang->execution->notAllowRemoveProducts    = "該{$lang->productCommon}中的{$
 $lang->execution->errorNoLinkedProducts     = "該{$lang->executionCommon}沒有關聯的{$lang->productCommon}，系統將轉到{$lang->productCommon}關聯頁面";
 $lang->execution->errorSameProducts         = "{$lang->executionCommon}不能關聯多個相同的{$lang->productCommon}。";
 $lang->execution->errorBegin                = "{$lang->executionCommon}的開始時間不能小於所屬項目的開始時間%s。";
-$lang->execution->errorEnd                  = "{$lang->executionCommon}的結束時間不能大於所屬項目的結束時間%s。";
+$lang->execution->errorEnd                  = "{$lang->executionCommon}的截止時間不能大於所屬項目的結束時間%s。";
 $lang->execution->accessDenied              = "您無權訪問該{$lang->executionCommon}！";
 $lang->execution->tips                      = '提示';
 $lang->execution->afterInfo                 = "{$lang->executionCommon}添加成功，您現在可以進行以下操作：";