From f2d6a76c93aa963bdd991dc1c34071084c6c68b7 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 24 Feb 2023 02:07:22 +0000
Subject: [PATCH] * Modify method to management method.

---
 module/execution/css/batchedit.en.css | 2 +-
 module/execution/css/edit.css         | 2 ++
 module/execution/css/edit.en.css      | 1 +
 module/execution/lang/de.php          | 2 +-
 module/execution/lang/en.php          | 2 +-
 module/execution/lang/fr.php          | 2 +-
 module/execution/lang/zh-cn.php       | 2 +-
 module/execution/view/create.html.php | 3 ++-
 module/execution/view/edit.html.php   | 6 +++---
 9 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 module/execution/css/edit.en.css

diff --git a/module/execution/css/batchedit.en.css b/module/execution/css/batchedit.en.css
index d4858d89b7..855a234699 100644
--- a/module/execution/css/batchedit.en.css
+++ b/module/execution/css/batchedit.en.css
@@ -1,4 +1,4 @@
 .c-user {width: 150px !important;}
 .c-date {width: 125px;}
-.c-method {width: 60px;}
+.c-method {width: 145px;}
 .c-type {width: 130px;}
diff --git a/module/execution/css/edit.css b/module/execution/css/edit.css
index 69e41e254b..b02143f914 100644
--- a/module/execution/css/edit.css
+++ b/module/execution/css/edit.css
@@ -9,3 +9,5 @@
 .form-date {min-width: 90px;}
 
 .productsBox div[id^='branch'].chosen-disabled {pointer-events: none;}
+
+#dataform th.c-name, #dataform th.c-projectName, #dataform th.c-method {width: 120px;}
diff --git a/module/execution/css/edit.en.css b/module/execution/css/edit.en.css
new file mode 100644
index 0000000000..89aae150fd
--- /dev/null
+++ b/module/execution/css/edit.en.css
@@ -0,0 +1 @@
+#dataform th.c-method {width: 150px;}
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 67cca7222d..625c8e53b2 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -139,7 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon
 $lang->execution->myTask              = "My Task";
 $lang->execution->list                = "{$lang->executionCommon} List";
 $lang->execution->allProject          = 'All';
-$lang->execution->method              = 'Method';
+$lang->execution->method              = 'Management Method';
 $lang->execution->sameAsParent        = "Same as parent";
 
 /* Fields of zt_team. */
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 9ed5ff84bc..1087a5cce5 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -139,7 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon
 $lang->execution->myTask              = "My Task";
 $lang->execution->list                = 'List';
 $lang->execution->allProject          = 'All';
-$lang->execution->method              = 'Method';
+$lang->execution->method              = 'Management Method';
 $lang->execution->sameAsParent        = "Same as parent";
 
 /* Fields of zt_team. */
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 487d058bec..b542b3ba67 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -139,7 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon
 $lang->execution->myTask              = "My Task";
 $lang->execution->list                = "{$lang->executionCommon} List";
 $lang->execution->allProject          = 'Tous';
-$lang->execution->method              = 'Method';
+$lang->execution->method              = 'Management Method';
 $lang->execution->sameAsParent        = "Same as parent";
 
 /* Fields of zt_team. */
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index ef3be73248..8ab442bf52 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -139,7 +139,7 @@ $lang->execution->kanbanNoLinkProduct = "看板没有关联{$lang->productCommon
 $lang->execution->myTask              = "我的任务";
 $lang->execution->list                = '列表';
 $lang->execution->allProject          = '全部项目';
-$lang->execution->method              = '方法';
+$lang->execution->method              = '管理方法';
 $lang->execution->sameAsParent        = "同父阶段";
 
 /* Fields of zt_team. */
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 429ecf2cb4..dab4ad2d55 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -59,7 +59,8 @@
     <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->execution->projectName;?></th>
+          <?php $width = (strpos($app->getClientLang(), 'zh-') === false and !empty($project->model) and $project->model == 'agileplus') ? 'w-150px' : 'w-120px';?>
+          <th class='<?php echo $width;?>'><?php echo $lang->execution->projectName;?></th>
           <td class="col-main"><?php echo html::select("project", $allProjects, $projectID, "class='form-control chosen' required onchange='refreshPage(this.value)'");?></td>
           <td colspan='2'></td>
         </tr>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 5c89e3a012..18123bcfed 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -33,14 +33,14 @@
         <?php if(isset($project)):?>
         <?php if($project->model == 'scrum'):?>
         <tr>
-          <th class='w-120px'><?php echo $lang->execution->projectName;?></th>
+          <th class='c-projectName'><?php echo $lang->execution->projectName;?></th>
           <td><?php echo html::select('project', $allProjects, $execution->project, "class='form-control chosen' onchange='changeProject(this.value)' required");?></td><td></td>
         </tr>
         <?php elseif($project->model == 'kanban'):?>
         <?php echo html::hidden('project', $project->id);?>
         <?php elseif($project->model == 'agileplus'):?>
         <tr>
-          <th class='w-120px'><?php echo $lang->execution->method;?></th>
+          <th class='c-method'><?php echo $lang->execution->method;?></th>
           <td><?php echo zget($lang->execution->typeList, $execution->type);?></td><td></td>
         </tr>
         <?php elseif($app->tab == 'project' and $project->model == 'waterfallplus'):?>
@@ -51,7 +51,7 @@
         <?php endif;?>
         <?php endif;?>
         <tr>
-          <th class='w-120px'><?php echo $lang->execution->name;?></th>
+          <th class='c-name'><?php echo $lang->execution->name;?></th>
           <td><?php echo html::input('name', $execution->name, "class='form-control' required");?></td><td></td>
         </tr>
         <?php if(isset($config->setCode) and $config->setCode == 1):?>