From 1a69db26c4da7c9d70d787c0b1a9b18bb17f7fc3 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Thu, 8 Mar 2018 10:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=A4=B1=E6=95=88=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/login.jsp          | 6 +++---
 src/main/webapp/static/global/scripts/jeesite.js | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index b569fea3e..0e9fbd2f2 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -109,7 +109,7 @@
         <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
         <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
 		<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
-        
+        <script src="${pageContext.request.contextPath}/static/global/scripts/jeesite.js" type="text/javascript"></script>
         <!-- END CORE PLUGINS -->
         <!-- BEGIN THEME GLOBAL SCRIPTS -->
         <script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
@@ -139,8 +139,8 @@
                 
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
         		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			alert("<spring:message code='login_timeout'/>");
-        			top.location = "${pageContext.request.contextPath }";
+        			alertx("<spring:message code='login_timeout'/>");
+        			window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
         		}
                 
                 
diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js
index 98e04853b..c110933af 100644
--- a/src/main/webapp/static/global/scripts/jeesite.js
+++ b/src/main/webapp/static/global/scripts/jeesite.js
@@ -111,7 +111,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});
@@ -119,7 +119,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();
 		}
@@ -129,7 +129,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();
@@ -152,7 +152,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') {