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

module/common/lang/en.php

@@ -57,6 +57,7 @@ $lang->switchDisplay= 'Toggle Show';
 $lang->switchHelp   = 'Toggle Help';
 $lang->addFiles     = 'Add Files';
 $lang->files        = 'Files ';
+$lang->timeout      = 'Timed out, please check the network, or retry!';
 $lang->unfold       = '+';
 $lang->fold         = '-';
 

module/common/lang/zh-cn.php

@@ -57,6 +57,7 @@ $lang->switchDisplay= '切换显示';
 $lang->switchHelp   = '切换帮助';
 $lang->addFiles     = '上传了附件 ';
 $lang->files        = '附件 ';
+$lang->timeout      = '连接超时，请检查网络环境，或重试！';
 $lang->unfold       = '+';
 $lang->fold         = '-';
 

module/common/view/form.html.php

@@ -1,4 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
+<?php js::set('timeout', $this->lang->timeout)?>
 <?php
 js::import($jsRoot . 'jquery/form/min.js');
 js::import($jsRoot . 'jquery/form/zentao.js');

www/js/jquery/form/zentao.js

@@ -85,6 +85,7 @@ $.extend(
             error:function(jqXHR, textStatus, errorThrown)
             {
                 $.enableForm(formID);
+                if(textStatus == 'timeout' || textStatus == 'error') return alert(timeout);
                 alert(jqXHR.responseText + textStatus + errorThrown);
             }
         };