Merge branch 'sprint/master_zhouxudong_56908' into 'master'

Sprint/master zhouxudong 56908

See merge request easycorp/zentaopms!3890

module/execution/lang/en.php

@@ -51,7 +51,7 @@ $lang->execution->canceledBy          = 'CanceledBy';
 $lang->execution->canceledDate        = 'CanceledDate';
 $lang->execution->begin               = 'Planned Begin';
 $lang->execution->end                 = 'Planned End';
-$lang->execution->dateRange           = 'Duration';
+$lang->execution->dateRange           = 'Plan Duration';
 $lang->execution->realBeganAB         = 'Actual Begin';
 $lang->execution->realEndAB           = 'Actual End';
 $lang->execution->realBegan           = 'Actual Begin';

module/program/control.php

@@ -429,7 +429,7 @@ class program extends control
         if($productCount) return print(js::alert($this->lang->program->hasProduct));
 
         $program = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch();
-        if($confirm == 'no') return print(js::confirm($this->lang->program->confirmDelete, $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
+        if($confirm == 'no') return print(js::confirm(sprintf($this->lang->program->confirmDelete, $program->name), $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
 
         $this->dao->update(TABLE_PROGRAM)->set('deleted')->eq(1)->where('id')->eq($programID)->exec();
         $this->loadModel('action')->create('program', $programID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
@@ -543,7 +543,7 @@ class program extends control
     {
         if($confirm == 'no')
         {
-            return print(js::confirm($this->lang->program->confirmDelete, $this->inlink('unlinkStakeholder', "stakeholderID=$stakeholderID&programID=$programID&confirm=yes")));
+            return print(js::confirm($this->lang->program->unlinkStakeholder, $this->inlink('unlinkStakeholder', "stakeholderID=$stakeholderID&programID=$programID&confirm=yes")));
         }
         else
         {

module/program/lang/en.php

@@ -106,7 +106,8 @@ $lang->program->endLetterChild     = "Child latest end: %s, parent end date >
 $lang->program->closeErrorMessage  = 'There are subprograms or projects that are not closed';
 $lang->program->hasChildren        = 'The program has a child program or the project exists and can not be deleted.';
 $lang->program->hasProduct         = 'The program has products exist and can not be deleted.';
-$lang->program->confirmDelete      = "Do you want to delete it?";
+$lang->program->confirmDelete      = 'Do you want to delete the \"%s\" Program?';
+$lang->program->unlinkStakeholder  = 'Do you want to remove the Stakeholder?';
 $lang->program->readjustTime       = 'Change the program begin&end date.';
 $lang->program->accessDenied       = 'You have no access to the program.';
 $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.';

module/program/lang/zh-cn.php

@@ -106,7 +106,8 @@ $lang->program->endLetterChild     = "子项目的最大完成日期：%s，父
 $lang->program->closeErrorMessage  = '存在子项目集或项目为未关闭状态';
 $lang->program->hasChildren        = '该项目集有子项目集或项目存在，不能删除。';
 $lang->program->hasProduct         = '该项目集有产品存在，不能删除。';
-$lang->program->confirmDelete      = "您确定要删除吗？";
+$lang->program->confirmDelete      = '您确定要删除\“%s\”项目集吗？';
+$lang->program->unlinkStakeholder  = '您确定要移除干系人吗？';
 $lang->program->readjustTime       = '重新调整项目集起止时间';
 $lang->program->accessDenied       = '你无权访问该项目集';
 $lang->program->beyondParentBudget = '已超出所属项目集的剩余预算';

module/project/lang/en.php

@@ -119,7 +119,7 @@ $lang->project->estimate           = 'Estimates';
 $lang->project->consume            = 'Cost';
 $lang->project->surplus            = 'Left';
 $lang->project->progress           = 'Progress';
-$lang->project->dateRange          = 'Duration';
+$lang->project->dateRange          = 'Plan Duration';
 $lang->project->to                 = ' to ';
 $lang->project->realBeganAB        = 'Actual Begin';
 $lang->project->realEndAB          = 'Actual End';

module/project/lang/zh-cn.php

@@ -119,7 +119,7 @@ $lang->project->estimate           = '预计';
 $lang->project->consume            = '消耗';
 $lang->project->surplus            = '剩余';
 $lang->project->progress           = '进度';
-$lang->project->dateRange          = '起止日期';
+$lang->project->dateRange          = '计划起止日期';
 $lang->project->to                 = '至';
 $lang->project->realBeganAB        = '实际开始';
 $lang->project->realEndAB          = '实际完成';

module/project/view/create.html.php

@@ -41,7 +41,7 @@
     <form class='form-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
         <tr>
-          <th class='w-120px'><?php echo $lang->project->parent;?></th>
+          <th class='w-130px'><?php echo $lang->project->parent;?></th>
           <?php $disabled = $this->app->tab == 'product' ? 'disabled' : '';?>
           <td><?php echo html::select('parent', $programList, $programID, "class='form-control chosen' onchange='setParentProgram(this.value)' $disabled");?></td>
           <?php if($disabled) echo html::hidden('parent', $programID);?>

module/project/view/edit.html.php

@@ -37,7 +37,7 @@
       <table class='table table-form'>
         <?php if($project->model != 'kanban'):?>
         <tr>
-          <th><?php echo $lang->project->model;?></th>
+          <th class='w-130px'><?php echo $lang->project->model;?></th>
           <td><?php echo html::select('model', $lang->project->modelList, $model, "class='form-control chosen' required $disableModel");?></td>
         </tr>
         <?php endif;?>

module/project/view/manageproducts.html.php

@@ -71,7 +71,6 @@
       <div class="detail text-center form-actions">
         <?php echo html::hidden("post", 'post');?>
         <?php echo html::submitButton();?>
-        <?php echo html::backButton();?>
       </div>
     </form>
   </div>