Merge branch 'master' of https://github.com/easysoft/zentaopms

module/company/css/dynamic.css

@@ -3,3 +3,5 @@
 #featurebar ul.nav > li .chosen-container a.chosen-single div{top:-8px;}
 #featurebar ul.nav > li.active .chosen-container a.chosen-single{font-weight:bold}
 #featurebar ul.nav > li .chosen-container .chosen-drop {min-width: 300px;!important}
+#featurebar .nav > li > .chosen-container-single{top:-1px!important}
+.chosen-container-single .chosen-single div{padding: 6px 22px!important}

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.';

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 = '有些邮箱需要填写单独申请的授权码，具体请到邮箱相关设置查询。';

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>

module/story/view/view.html.php

@@ -53,8 +53,8 @@
         echo "<span class='caret'></span>";
         echo "</button>";
         echo "<ul class='dropdown-menu' id='createCaseActionMenu'>";
-        $misc = common::hasPriv('testcase', 'create') ? " " : "class='disabled'";
-        $link = common::hasPriv('testcase', 'create') ?  $this->createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=0&from=&param=0&storyID=$story->id") : '#';
+        $misc = common::hasPriv('testcase', 'create') ? "data-toggle='modal' data-type='iframe' data-width='95%'" : "class='disabled'";
+        $link = common::hasPriv('testcase', 'create') ?  $this->createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=0&from=&param=0&storyID=$story->id", '', true) : '#';
         echo "<li>" . html::a($link, $lang->testcase->create, '', $misc) . "</li>";
         $misc = common::hasPriv('testcase', 'batchCreate') ? "data-toggle='modal' data-type='iframe' data-width='95%'" : "class='disabled'";
         $link = common::hasPriv('testcase', 'batchCreate') ?  $this->createLink('testcase', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=0&storyID=$story->id", '', true) : '#';

module/testcase/control.php

@@ -220,6 +220,15 @@ class testcase extends control
 
             $this->loadModel('action');
             $this->action->create('case', $caseID, 'Opened');
+
+            /* If link from no head then reload. */
+            if(isonlybody())
+            {
+                $response['locate'] = 'reload';
+                $response['target'] = 'parent';
+                $this->send($response);
+            }
+
             $response['locate'] = $this->createLink('testcase', 'browse', "productID={$_POST['product']}&branch=" . (isset($_POST['branch']) ? $_POST['branch'] : '') . "&browseType=byModule&args={$_POST['module']}");
             $this->send($response);
         }

module/testcase/js/create.js

@@ -153,4 +153,27 @@ $(function()
     $("#preview").modalTrigger({width:960, type:'iframe'});
 
     $('[data-toggle=tooltip]').tooltip();
+
+    /* First unbind ajaxForm for form.*/
+    $("form[data-type='ajax']").unbind('submit');
+    setForm();
+
+    /* Bind ajaxForm for form again. */
+    $.ajaxForm("form[data-type='ajax']", function(response)
+    {
+        if(response.message) alert(response.message);
+        if(response.locate)
+        {
+            if(response.locate == 'reload' && response.target == 'parent')
+            {
+                parent.$.cookie('selfClose', 1);
+                parent.$.closeModal(null, 'this');
+            }
+            else
+            {
+                location.href = response.locate;
+            }
+        }
+        return false;
+    });
 })