From ef17ab7f01543c2d8cd0b0e9e0570cdb8a12cbf5 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 8 Jul 2019 17:16:20 +0800
Subject: [PATCH]  * finish task #5992.

---
 module/custom/lang/en.php            |  2 ++
 module/custom/lang/zh-cn.php         |  2 ++
 module/custom/view/required.html.php | 10 ++++++----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index f60e86ea85..7688452786 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -97,6 +97,7 @@ $lang->custom->notice->invalidNumberKey     = 'The key should be =< 255.';
 $lang->custom->notice->invalidStringKey     = 'The key should be a combination of lowercase letters, numbers or underlines.';
 $lang->custom->notice->cannotSetTimezone    = 'date_default_timezone_set does not exist or is disabled. Timezone cannot be set.';
 $lang->custom->notice->noClosedBlock        = 'You have no blocks that are closed permanently.';
+$lang->custom->notice->required             = 'The selected field is required.';
 
 $lang->custom->notice->indexPage['product'] = "ZenTao 8.2+ has Product Home. Do you want to go to Product Home?";
 $lang->custom->notice->indexPage['project'] = "ZenTao 8.2+ has Project Home. Do you want to go to Project Home?";
@@ -135,6 +136,7 @@ $lang->custom->workingList['onlyTask']  = 'Task Management';
 
 $lang->custom->menuTip  = 'Click to show/hide the menu. Drag to switch display order.';
 $lang->custom->saveFail = 'Failed to save!';
+$lang->custom->page     = ' Page';
 
 $lang->custom->scoreStatus[0] = 'Off';
 $lang->custom->scoreStatus[1] = 'On';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index f840afed4e..bbb46256ed 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -96,6 +96,7 @@ $lang->custom->notice->invalidNumberKey            = '键值应为不大于255
 $lang->custom->notice->invalidStringKey            = '键值应当为小写英文字母、数字或下划线的组合';
 $lang->custom->notice->cannotSetTimezone           = 'date_default_timezone_set方法不存在或禁用，不能设置时区。';
 $lang->custom->notice->noClosedBlock               = '没有永久关闭的区块';
+$lang->custom->notice->required                    = '页面提交时，选中的字段必填';
 
 $lang->custom->notice->indexPage['product']        = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
 $lang->custom->notice->indexPage['project']        = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
@@ -134,6 +135,7 @@ $lang->custom->workingList['onlyTask']  = '任务管理工具';
 
 $lang->custom->menuTip  = '点击显示或隐藏导航条目，拖拽来更改显示顺序。';
 $lang->custom->saveFail = '保存失败！';
+$lang->custom->page     = '页面';
 
 $lang->custom->scoreStatus[0] = '关闭';
 $lang->custom->scoreStatus[1] = '开启';
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index 0f0ccef0c5..e8467469bc 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -33,7 +33,8 @@
         </div>
       </div>
       <table class='table table-form mw-800px'>
-        <?php $colWidth = $app->getClientLang() == 'en' ? 'w-200px' : 'w-100px';?>
+        <?php $colWidth = $app->getClientLang() == 'en' ? 'w-250px' : 'w-120px';?>
+        <?php $i = 0;?>
         <?php foreach($requiredFields as $method => $requiredField):?>
         <tr>
           <th class='<?php echo $colWidth;?>'>
@@ -49,15 +50,16 @@
               $fields = $this->custom->getFormFields('testcase', $method);
               $method = 'createCase';
           }
-          echo $lang->$moduleName->$method;
+          echo $lang->$moduleName->$method . $lang->custom->page;
           ?>
           </th>
-          <td><?php echo html::select("requiredFields[{$method}][]", $fields, $requiredField, "class='form-control chosen' multiple");?></td>
+          <td><?php echo html::select("requiredFields[{$method}][]", $fields, $requiredField, "class='form-control chosen' multiple " . ($i == 0 ? "data-placeholder='{$lang->custom->notice->required}'" : ''));?></td>
           <td></td>
         </tr>
+        <?php $i++;?>
         <?php endforeach;?>
         <tr>
-          <td colspan='2' class='text-center form-actions'>
+          <td colspan='3' class='text-center form-actions'>
           <?php echo html::submitButton();?>
           <?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
           </td>