Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/webapp/static/global/scripts/jeesite.js

@@ -106,7 +106,7 @@ function showTip(mess, type, timeout, lazytime){
 // 显示加载框
 function loading(mess){
 	if (mess == undefined || mess == ""){
-		mess = "正在提交，请稍等...";
+		mess = "OnLoading...";
 	}
 	resetTip();
 	top.$.jBox.tip(mess,'loading',{opacity:0});
@@ -114,7 +114,7 @@ function loading(mess){
 
 // 警告对话框
 function alertx(mess, closed){
-	top.$.jBox.info(mess, '提示', {closed:function(){
+	top.$.jBox.info(mess, 'Waring', {closed:function(){
 		if (typeof closed == 'function') {
 			closed();
 		}
@@ -124,7 +124,7 @@ function alertx(mess, closed){
 
 // 确认对话框
 function confirmx(mess, href, closed){
-	top.$.jBox.confirm(mess,'系统提示',function(v,h,f){
+	top.$.jBox.confirm(mess,'System Prompt',function(v,h,f){
 		if(v=='ok'){
 			if (typeof href == 'function') {
 				href();
@@ -147,7 +147,7 @@ function promptx(title, lable, href, closed){
 	top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + "：<input type='text' id='txt' name='txt'/></div>", {
 			title: title, submit: function (v, h, f){
 	    if (f.txt == '') {
-	        top.$.jBox.tip("请输入" + lable + "。", 'error');
+	        top.$.jBox.tip("Please input" + lable + "。", 'error');
 	        return false;
 	    }
 		if (typeof href == 'function') {