Merge branches 'zentaopms_9.8' and 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into origin/zentaopms_9.8

module/build/css/view.css

@@ -1,3 +1,10 @@
+#stories .action{display:none;}
+#bugs .action{display:none;}
+tbody tr td:first-child input{display:none;}
+tfoot tr td .table-actions .btn{display:none;}
+
+#titlebar .actions{display:none}
+.row-table .col-side{display:none;}
 .tabs {position:relative;}
 
 .tabs .nav-tabs{border-bottom:none;}

module/build/view/view.html.php

@@ -15,15 +15,6 @@
 <?php js::set('confirmUnlinkBug', $lang->build->confirmUnlinkBug)?>
 <?php js::set('flow', $this->config->global->flow)?>
 <?php if(isonlybody()):?>
-<style>
-#stories .action{display:none;}
-#bugs .action{display:none;}
-tbody tr td:last-child a{display:none;}
-tbody tr td:first-child input{display:none;}
-tfoot tr td .table-actions .btn{display:none;}
-#titlebar .actions{display:none}
-.row-table .col-side{display:none;}
-</style>
 <?php endif;?>
 <div id='titlebar'>
   <div class='heading'>

module/mail/control.php

@@ -56,26 +56,21 @@ class mail extends control
      * @access public
      * @return void
      */
-    public function detect($type = 'smtp')
+    public function detect()
     {
-        if($_POST or $type == 'gmail')
+        if($_POST)
         {
             set_time_limit(30);
-            if($type != 'gmail')
-            {
-                $error = '';
-                if($this->post->fromAddress == false) $error = sprintf($this->lang->error->notempty, $this->lang->mail->fromAddress);
-                if(!validater::checkEmail($this->post->fromAddress)) $error .= '\n' . sprintf($this->lang->error->email, $this->lang->mail->fromAddress);
+            $error = '';
+            if($this->post->fromAddress == false) $error = sprintf($this->lang->error->notempty, $this->lang->mail->fromAddress);
+            if(!validater::checkEmail($this->post->fromAddress)) $error .= '\n' . sprintf($this->lang->error->email, $this->lang->mail->fromAddress);
 
-                if($error) die(js::alert($error));
-            }
-            if($type == 'gmail' and empty($_POST['fromAddress'])) $_POST['fromAddress'] = '@gmail.com';
+            if($error) die(js::alert($error));
 
             echo "<script>setTimeout(function(){parent.location.href='" . inlink('edit') . "'}, 10000)</script>";
             $mailConfig = $this->mail->autoDetect($this->post->fromAddress);
             $mailConfig->fromAddress = $this->post->fromAddress;
             $mailConfig->domain      = common::getSysURL();
-            if($type == 'gmail') $mailConfig->fromAddress = '';
             $this->session->set('mailConfig',  $mailConfig);
 
             die(js::locate(inlink('edit'), 'parent'));

module/mail/view/index.html.php

@@ -24,9 +24,6 @@
         <?php if($this->app->getClientLang() != 'en'  and common::hasPriv('mail', 'ztCloud')):?>
         <?php echo html::a(inlink('ztCloud'), $lang->mail->ztCloud, '', "class='btn btn-sm w-120px'")?>
         <?php endif;?>
-        <?php if($this->app->getClientLang() == 'en'):?>
-        <?php echo html::a(inlink('detect', 'type=gmail'), $lang->mail->gmail, '', "class='btn btn-sm w-120px'")?>
-        <?php endif;?>
         <?php if(common::hasPriv('mail', 'detect')):?>
         <?php echo html::a(inlink('detect'), $lang->mail->smtp, '', "class='btn btn-sm w-120px'")?>
         <?php endif;?>

module/project/view/testtask.html.php

@@ -76,6 +76,9 @@
   <tfoot>
     <tr>
       <td colspan='9'>
+      <?php if(empty($task)):?>
+        <div class='pull-right'><?php echo $lang->pager->noRecord;?></div>
+      <?php else:?> 
         <div class='table-actions clearfix'>
           <?php
           echo html::selectButton();
@@ -85,6 +88,7 @@
           echo html::commonButton($lang->testreport->common, $misc);
           ?>
         </div>
+      <?php endif;?> 
       </td>
     </tr>
   </tfoot>