From c6d79ccd4b5ebaacdbb1dcdac312091549942549 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 22 Nov 2016 15:56:30 +0800
Subject: [PATCH]  * finish task #2753 and code task #2719.

---
 module/mail/lang/en.php        |  8 ++++++--
 module/mail/lang/zh-cn.php     |  4 ++++
 module/mail/view/edit.html.php | 20 +++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index 2508e0daaa..3ca09b5210 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -80,5 +80,9 @@ $lang->mail->sendCloudHelp  = <<<EOD
 <p>2、accessKey和secretKey可以到登陆后的"设置"页面查看。Email人地址和名称也在"设置"页面设置。</p>
 <p>3、Email时，Notice SendCloudContact里面的昵称要跟Email一致，否则无法成功Email。可以到[<a href='%s'>同步Contact</a>]页面，将ZenTaoUser同步到SendCloudContact中</p>
 EOD;
-$lang->mail->sendCloudSuccess = '操作成功';
-$lang->mail->closeSendCloud   = '关闭发送';
+$lang->mail->sendCloudSuccess = 'Success';
+$lang->mail->closeSendCloud   = 'Close sendcloud';
+$lang->mail->addressWhiteList = 'Please add the email to the whilte list on email server to avoid be treated as spam';
+
+$lang->mail->placeholder = new stdclass();
+$lang->mail->placeholder->password = 'Some mail needs to fill in the auth code, specific to the mailbox related settings query.';
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index 81ba400aba..00b08f6769 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -82,3 +82,7 @@ $lang->mail->sendCloudHelp  = <<<EOD
 EOD;
 $lang->mail->sendCloudSuccess = '操作成功';
 $lang->mail->closeSendCloud   = '关闭SendCloud';
+$lang->mail->addressWhiteList = '为防止邮件被屏蔽，请在邮件服务器里面将发信邮箱设为白名单';
+
+$lang->mail->placeholder = new stdclass();
+$lang->mail->placeholder->password = '有些邮箱需要填写单独申请的授权码，具体请到邮箱相关设置查询。';
diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php
index 18e3248bde..2fccaa63df 100755
--- a/module/mail/view/edit.html.php
+++ b/module/mail/view/edit.html.php
@@ -11,7 +11,7 @@
  */
 include '../../common/view/header.html.php';
 ?>
-<div class='container mw-700px'>
+<div class='container mw-800px'>
   <div id='titlebar'>
     <div class='heading'>
       <span class='prefix'><?php echo html::icon($lang->icons['mail']);?></span>
@@ -22,8 +22,9 @@ include '../../common/view/header.html.php';
   <form class='form-condensed' method='post' action='<?php echo inlink('save');?>' id='dataform'>
     <table class='table table-form'>
       <tr>
-        <th class='rowhead w-120px'><?php echo $lang->mail->turnon; ?></th>
-        <td><?php echo html::radio('turnon', $lang->mail->turnonList, 1);?></td>
+        <th class='rowhead w-110px'><?php echo $lang->mail->turnon; ?></th>
+        <td class='w-p25-f'><?php echo html::radio('turnon', $lang->mail->turnonList, 1);?></td>
+        <td></td>
       </tr>
       <?php if(!empty($config->global->cron)):?>
       <tr>
@@ -34,33 +35,34 @@ include '../../common/view/header.html.php';
       <tr>
         <th><?php echo $lang->mail->fromAddress; ?></th>
         <td><?php echo html::input('fromAddress', $mailConfig->fromAddress, "class='form-control'");?></td>
+        <td><?php echo $lang->mail->addressWhiteList?></td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->fromName; ?></th>
-        <td>
+        <td colspan='2'>
           <div class='required required-wrapper'></div>
           <?php echo html::input('fromName', $mailConfig->fromName, "class='form-control'");?>
         </td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->host; ?></th>
-        <td><?php echo html::input('host', $mailConfig->host, "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('host', $mailConfig->host, "class='form-control'");?></td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->port; ?></th>
-        <td><?php echo html::input('port', $mailConfig->port, "class='form-control'");?></td>
+        <td colspan='2'><?php echo html::input('port', $mailConfig->port, "class='form-control'");?></td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->auth; ?></th>
-        <td><?php echo html::radio('auth', $lang->mail->authList, $mailConfig->auth, 'onchange=setAuth(this.value)'); ?></td>
+        <td colspan='2'><?php echo html::radio('auth', $lang->mail->authList, $mailConfig->auth, 'onchange=setAuth(this.value)'); ?></td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->username; ?></th>
-        <td><?php echo html::input('username', $mailConfig->username, "class='form-control'") ?></td>
+        <td colspan='2'><?php echo html::input('username', $mailConfig->username, "class='form-control' autocomplete='off'") ?></td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->password; ?></th>
-        <td><?php echo html::password('password', $mailConfig->password, 'class="form-control" autocomplete="off"') ?></td>
+        <td colspan='2'><?php echo html::password('password', $mailConfig->password, "class='form-control' autocomplete='off' placeholder='{$lang->mail->placeholder->password}'") ?></td>
       </tr>
       <tr>
         <th><?php echo $lang->mail->secure; ?></th>