From 200e97d5b87d6368b573702293d34a86d48ba906 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 22 Feb 2023 09:55:00 +0800
Subject: [PATCH] * Code for finish task #85414.

---
 module/execution/css/create.css       | 1 +
 module/execution/js/create.js         | 2 ++
 module/execution/lang/de.php          | 1 +
 module/execution/lang/en.php          | 1 +
 module/execution/lang/fr.php          | 1 +
 module/execution/lang/zh-cn.php       | 1 +
 module/execution/view/create.html.php | 5 ++++-
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 8a387053df..8ba2c65184 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -39,3 +39,4 @@
 .productsBox .required + .text-danger.help-text {position: relative; left: 10px;}
 .productsBox > #productNameLabel {padding-top: 8px;}
 .productsBox div[id^='branch'].chosen-disabled {pointer-events: none;}
+.methodTip icon:before {margin-bottom: 5px;}
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 750bdae6b0..56ac637410 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -153,6 +153,8 @@ $(function()
     {
         $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled');
     }
+
+    $('[data-toggle="popover"]').popover();
 });
 
 function showLifeTimeTips()
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index d6c506033d..18aca85146 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -151,6 +151,7 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.';
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Aktivieren';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 995e4f9d53..6988621fe7 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -151,6 +151,7 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.';
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Activate';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index ac5351d360..f1a5947449 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -151,6 +151,7 @@ $lang->execution->left     = 'Left';
 $lang->execution->copyTeamTip        = "copy Project/project team members";
 $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』';
 $lang->execution->errorHours         = 'Hours/Day cannot be greater than『24』';
+$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.';
 
 $lang->execution->start    = 'Démarrer';
 $lang->execution->activate = 'Activer';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index a83b65dc25..136a6450b9 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -151,6 +151,7 @@ $lang->execution->left     = '剩余';
 $lang->execution->copyTeamTip         = "可以选择复制项目或{$lang->execution->common}团队的成员";
 $lang->execution->daysGreaterProject  = '可用工日不能大于执行的可用工日『%s』';
 $lang->execution->errorHours          = '可用工时/天不能大于『24』';
+$lang->execution->agileplusMethodTip  = '融合敏捷项目创建执行时，支持迭代和看板两种管理方法。';
 
 $lang->execution->start    = "开始";
 $lang->execution->activate = "激活";
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index cb134dfd7e..f8e6f80772 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -66,7 +66,10 @@
         <tr>
           <th><?php echo $lang->execution->method;?></th>
           <td class="col-main"><?php echo html::select("type", $lang->execution->typeList, $type, "class='form-control chosen' required onchange='setType(this.value)'");?></td>
-          <td colspan='2'></td>
+          <td class='methodTip'>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->execution->agileplusMethodTip;?>"></icon>
+          </td>
+          <td></td>
         </tr>
         <?php endif;?>
         <tr>