js fix

maxkey-web-manage/src/main/resources/static/css/base.css

@@ -448,4 +448,106 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 }
 
 
+/*switch_tab*/
+.switch_tab{
+	list-style: none;
+	border: 0;
+	cellspacing:0;
+}
+
+.switch_tab_class{
+	float:left;
+	height:36px;
+	text-align: center;
+	display: inline-block;
+}
+
+.switch_tab_class a{
+	text-decoration: none;
+	display: inline-block;
+	height: 14px;
+	color: #333;
+	font-size: 14px;
+	font-weight: bold;
+	padding: 8px 0;
+	vertical-align: central;
+}
+
+.switch_tab_current{
+	background-color: #8bc8de;
+	border-right: 1px solid #e3e3e3;
+	border-bottom: 1px solid #e3e3e3;
+}
+
+/*maxkey login*/
+
+#tableform{
+	border: 1px solid #e9eeed;
+	cellspacing:0;
+}
+
+.login_form_table{
+	width:358px;
+	border:0;
+}
+#j_username,#j_password,#tfa_j_username,#tfa_j_password,#currentTime{
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#j_captcha{
+	width	:70%;
+	font-size: 14px;
+	font-weight: bold;
+	float: left; 
+}
+
+#tfa_j_otp_captcha{
+	width	:100px;
+	/*width	:230px;*/
+	font-size: 14px;
+	font-weight: bold;	
+}
+
+#tfa_j_otp_captcha_button{
+	width	:130px;
+	height: 34px;
+	font-size: 14px;
+	font-weight: bold;	
+}
+
+#j_captchaimg{
+	width:70px;
+	height: 33px;
+	vertical-align: top;
+}
+
+#switch_commonLogin,#switch_tfaLogin{
+	width	:49%;
+}
+
+#div_tfaLogin{
+	display: none;
+}
+
+.login_button{
+	width:80%;
+}
+#register{
+	font-size: 14px;
+	font-weight: bold;
+	height: 33px;
+	color: white;
+	background-color: #4D4E54;
+}
+#register a{
+	font-weight: bold;
+	color: white;
+}
+
+.login_error_message{
+	height:37px;
+	background-color: #FFE5E5;
+	font-weight: bold;
+}
 

maxkey-web-manage/src/main/resources/static/css/login.css

@@ -1,69 +0,0 @@
-#tableform{
-	border: 1px solid #e9eeed;
-	cellspacing:0;
-}
-
-.login_form_table{
-	width:358px;
-	border:0;
-}
-#j_username,#j_password,#tfa_j_username,#tfa_j_password,#currentTime{
-	font-size: 14px;
-	font-weight: bold;
-}
-
-#j_captcha{
-	width	:70%;
-	font-size: 14px;
-	font-weight: bold;
-	float: left; 
-}
-
-#tfa_j_otp_captcha{
-	width	:100px;
-	/*width	:230px;*/
-	font-size: 14px;
-	font-weight: bold;	
-}
-
-#tfa_j_otp_captcha_button{
-	width	:130px;
-	height: 34px;
-	font-size: 14px;
-	font-weight: bold;	
-}
-
-#j_captchaimg{
-	width:70px;
-	height: 33px;
-	vertical-align: top;
-}
-
-#switch_commonLogin,#switch_tfaLogin{
-	width	:49%;
-}
-
-#div_tfaLogin{
-	display: none;
-}
-
-.login_button{
-	width:80%;
-}
-#register{
-	font-size: 14px;
-	font-weight: bold;
-	height: 33px;
-	color: white;
-	background-color: #4D4E54;
-}
-#register a{
-	font-weight: bold;
-	color: white;
-}
-
-.login_error_message{
-	height:37px;
-	background-color: #FFE5E5;
-	font-weight: bold;
-}

maxkey-web-manage/src/main/resources/static/jquery/locale/common.en.js

@@ -0,0 +1,32 @@
+$(function () {
+	$.platform = $.platform || {};
+	$.platform.messages = $.platform.messages || {};
+	$.extend($.platform.messages, {
+		window:	{
+			title		:	'Window'
+		},
+		alert:	{
+			title		:	'Information',
+			closeText	:	'Close'
+		},
+		conform:{
+			title		:	'Conform',
+			yes			:	'YES',
+			no			:	'NO'
+		},
+		select:{
+			alertText	: 	'Please select the record'
+		},
+		del:{
+			conformText	: 	'Are you sure you want to delete?'
+		},
+		grid:{
+			loadtext	:	'Data loading ...',
+			loadnodata	:	'No matching data found'
+		},
+		submit:{
+			conformText	:	'Are you sure you want to do this?',
+			errorText	:	'Failed to perform operation'
+		}
+	});
+});

maxkey-web-manage/src/main/resources/static/jquery/locale/common.en_US.js

@@ -0,0 +1,32 @@
+$(function () {
+	$.platform = $.platform || {};
+	$.platform.messages = $.platform.messages || {};
+	$.extend($.platform.messages, {
+		window:	{
+			title		:	'Window'
+		},
+		alert:	{
+			title		:	'Information',
+			closeText	:	'Close'
+		},
+		conform:{
+			title		:	'Conform',
+			yes			:	'YES',
+			no			:	'NO'
+		},
+		select:{
+			alertText	: 	'Please select the record'
+		},
+		del:{
+			conformText	: 	'Are you sure you want to delete?'
+		},
+		grid:{
+			loadtext	:	'Data loading ...',
+			loadnodata	:	'No matching data found'
+		},
+		submit:{
+			conformText	:	'Are you sure you want to do this?',
+			errorText	:	'Failed to perform operation'
+		}
+	});
+});

maxkey-web-manage/src/main/resources/static/jquery/locale/common.zh.js

@@ -0,0 +1,32 @@
+$(function () {
+	$.platform = $.platform || {};
+	$.platform.messages = $.platform.messages || {};
+	$.extend($.platform.messages, {
+		window:	{
+			title		:	'窗口'
+		},
+		alert:	{
+			title		:	'提示信息',
+			closeText	:	'关闭'
+		},
+		conform:{
+			title		:	'确认提示',
+			yes			:	'确定',
+			no			:	'关闭'
+		},
+		select:{
+			alertText	: 	'请选择您要操作的数据'
+		},
+		del:{
+			conformText	: 	'您确定要删除吗?'
+		},
+		grid:{
+			loadtext	:	'正在加载...',
+			loadnodata	:	'没有查询到符合数据'
+		},
+		submit:{
+			conformText	:	'您确定要进行此项操作吗?',
+			errorText	:	'执行操作失败'
+		}
+	});
+});

maxkey-web-manage/src/main/resources/static/jquery/platform.common.js

@@ -13,6 +13,48 @@ function dataGridQueryParams(params) {
 
  //jquery begin
 $(function(){
+	$.datetimepicker.setLocale(webLocale.substring(0, 2));
+	$(".datetimepicker").datetimepicker({format:'Y-m-d H:i'});
+	$(".datepicker").datetimepicker({timepicker:false,format:'Y-m-d'});
+	$(".timepicker").datetimepicker({datepicker:false,format:'H:i',step:10});
+	
+	$(".multipleselect").multipleSelect({}); 
+			
+	//on captcha image click ,new a captcha code
+	$('.captcha-image').click(function () {//
+		$(this).attr("src", webContextPath + "/captcha?"+(new Date()).getTime()); 
+	});
+	/*side-nav-menu*/
+	 $(".sidenav-fold-toggler").on("click",function(e) {
+    	   $(".app").toggleClass("side-nav-folded");
+           e.preventDefault();
+     });
+     
+     $('.side-nav-menu').each(function(){
+           var href = $(this).attr('href');
+           if(window.location.href.indexOf(href) > 0){
+                $(this).parents("li").addClass("mm-active");
+                
+           }
+     });
+	/** switch_tab*/
+	$(".switch_tab_class").on("click",function(){
+		if($(".switch_tab_current").attr("id")==(this.id)){
+			return;
+		}
+		
+		$(".switch_tab .switch_tab_class").removeClass("switch_tab_current");
+		$(this).addClass("switch_tab_current");
+		$(".switch_tab li").each(function(){
+		    $("#"+$(this).attr("value")).hide();
+		});
+		
+		$("#"+$(this).attr("value")).show();
+		if (typeof(switchTab) == "function"){
+			switchTab($(this).attr("value"));//user define after switch Tab
+		}
+	});
+	
 	//document forward
 	$.forward=function(config){
 		if(config.target){

maxkey-web-manage/src/main/resources/static/jquery/switchtab/switchtab.css

@@ -1,30 +0,0 @@
-
-.switch_tab{
-	list-style: none;
-	border: 0;
-	cellspacing:0;
-}
-
-.switch_tab_class{
-	float:left;
-	height:36px;
-	text-align: center;
-	display: inline-block;
-}
-
-.switch_tab_class a{
-	text-decoration: none;
-	display: inline-block;
-	height: 14px;
-	color: #333;
-	font-size: 14px;
-	font-weight: bold;
-	padding: 8px 0;
-	vertical-align: central;
-}
-
-.switch_tab_current{
-	background-color: #8bc8de;
-	border-right: 1px solid #e3e3e3;
-	border-bottom: 1px solid #e3e3e3;
-}

maxkey-web-manage/src/main/resources/static/jquery/switchtab/switchtab.js

@@ -1,22 +0,0 @@
-/*
- * switch_tab
- */
- //jquery begin
-$(function(){
-	$(".switch_tab_class").on("click",function(){
-		if($(".switch_tab_current").attr("id")==(this.id)){
-			return;
-		}
-		
-		$(".switch_tab .switch_tab_class").removeClass("switch_tab_current");
-		$(this).addClass("switch_tab_current");
-		$(".switch_tab li").each(function(){
-		    $("#"+$(this).attr("value")).hide();
-		});
-		
-		$("#"+$(this).attr("value")).show();
-		if (typeof(switchTab) == "function"){
-			switchTab($(this).attr("value"));//user define after switch Tab
-		}
-	});
-});//jquery end

maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl

@@ -1,4 +1,5 @@
 	<#-- javascript js begin  -->
+	<script type="text/javascript">var webContextPath = "<@base />";var webLocale = '<@locale/>';</script>
 	<#-- jquery base -->
 	<script src ="<@base />/static/jquery/jquery-3.5.0.min.js"  type="text/javascript"></script>
 	<script src ="<@base />/static/jquery/popper.min.js" type="text/javascript" ></script>
@@ -31,10 +32,7 @@
 	<script src ="<@base />/static/jquery/jquery.blockUI.js" type="text/javascript" ></script>
 	<#-- serializeObject -->
 	<script src ="<@base />/static/jquery/jquery.serialize-object.min.js" type="text/javascript" ></script>
-	
 	<script src ="<@base />/static/jquery/jsonformatter.js" type="text/javascript" ></script>
-	<script src ="<@base />/static/jquery/switchtab/switchtab.js" type="text/javascript" ></script>
-	<link 	href="<@base />/static/jquery/switchtab/switchtab.css" type="text/css" rel="stylesheet" />
 	<#-- metisMenu-v3.0.4 -->
 	<link   href="<@base />/static/jquery/metisMenu-v3.0.6/css/mm-vertical.css"  rel="stylesheet" >
 	<link   href="<@base />/static/jquery/metisMenu-v3.0.6/metisMenu.min.css"  rel="stylesheet" >
@@ -44,69 +42,11 @@
 	<script type="text/javascript" src="<@base />/static/jquery/multiple-select-1.5.2/multiple-select.min.js"></script>
 	<script type="text/javascript" src="<@base />/static/jquery/multiple-select-1.5.2/locale/multiple-select-<@locale/>.js"></script>
 	<link rel="stylesheet" href="<@base />/static/jquery/multiple-select-1.5.2/multiple-select.css" type="text/css"/>
-	
-	<#-- common script start -->
-	<script type="text/javascript">
-		$(function () {
-			 $(".sidenav-fold-toggler").on("click",function(e) {
-	        	   $(".app").toggleClass("side-nav-folded");
-                   e.preventDefault();
-	         });
-	         
-	         $('.side-nav-menu').each(function(){
-                   var href = $(this).attr('href');
-                   if(window.location.href.indexOf(href) > 0){
-                        $(this).parents("li").addClass("mm-active");
-                        
-                   }
-             });
-	         
-	        $.datetimepicker.setLocale('<@locale/>'.substring(0, 2));
-			$(".datetimepicker").datetimepicker({format:'Y-m-d H:i'});
-			$(".datepicker").datetimepicker({timepicker:false,format:'Y-m-d'});
-			$(".timepicker").datetimepicker({datepicker:false,format:'H:i',step:10});
-			
-			$(".multipleselect").multipleSelect({}); 
-			
-			$.platform = $.platform || {};
-			$.platform.messages = $.platform.messages || {};
-			$.extend($.platform.messages, {
-				window:	{
-					title		:	'<@locale code="common.window.title" />'
-				},
-				alert:	{
-					title		:	'<@locale code="common.alert.title" />',
-					closeText	:	'<@locale code="common.alert.closeText" />'
-				},
-				conform:{
-					title		:	'<@locale code="common.conform.title" />',
-					yes			:	'<@locale code="common.conform.yes" />',
-					no			:	'<@locale code="common.conform.no" />'
-				},
-				select:{
-					alertText	: 	'<@locale code="common.select.hintText" />'
-				},
-				del:{
-					conformText	: 	'<@locale code="common.delete.hintText" />'
-				},
-				grid:{
-					loadtext	:	'<@locale code="common.grid.loadtext" />',
-					loadnodata	:	'<@locale code="common.grid.loadnodata" />'
-				},
-				submit:{
-					conformText	:	'<@locale code="common.submit.hintText" />',
-					errorText	:	'<@locale code="common.submit.errorText" />'
-				}
-			});
-		});
-	</script>
-	<#-- common script end -->
 	<#-- platform common script -->	
+	<script src ="<@base />/static/jquery/locale/common.<@locale/>.js" type="text/javascript" ></script>
 	<script src ="<@base />/static/jquery/platform.common.js" type="text/javascript" ></script>
 	<#-- common js end  -->
 	<#-- common css begin -->
 	<#-- if browser is not msie 6.0,follow styles over ie 6.0 style -->
 	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/base.css"/>
-	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/menu.css"/>
-	<link type="text/css" rel="stylesheet" href="<@base />/static/css/login.css"/>
 	<#-- common css end -->

maxkey-web-manage/src/main/resources/templates/views/login.ftl

@@ -3,15 +3,6 @@
 <head>
 	<#include  "layout/header.ftl"/>
 	<#include  "layout/common.cssjs.ftl"/>
-	<script type="text/javascript"> 
-	$(function(){
-		<#if true==isCaptcha>
-			$('#j_captchaimg').click(function () {//
-		           $(this).attr("src", "<@base />/captcha?"+(new Date()).getTime()); 
-			}); 
-		 </#if>
-	});
-	</script>
 </head>
 <body >
 <#include  "layout/nologintop.ftl"/>
@@ -51,7 +42,7 @@
                                             <span class="input-group-text fa fa-refresh"></span>
                                         </div>
                                         <input id="j_captcha" name="captcha" class="form-control" value="" type="text" required="" placeholder="<@locale code="login.text.captcha"/>"> 
-                                        <img id="j_captchaimg" src="<@base/>/captcha" />
+                                        <img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha" />
                                     </span>
 									
 								</div>

maxkey-web-maxkey/src/main/resources/static/css/base.css

@@ -249,4 +249,112 @@ body{
 	color: #fff;
 }
 
+/*switch_tab*/
 
+.switch_tab{
+	list-style: none;
+	border: 0;
+	cellspacing:0;
+}
+
+.switch_tab_class{
+	float:left;
+	height:36px;
+	text-align: center;
+	display: inline-block;
+}
+
+.switch_tab_class a{
+	text-decoration: none;
+	display: inline-block;
+	height: 14px;
+	color: #333;
+	font-size: 14px;
+	font-weight: bold;
+	padding: 8px 0;
+	vertical-align: central;
+}
+
+.switch_tab_current{
+	background-color: #f3f6f7;;
+	border-right: 1px solid #e3e3e3;
+	border-bottom: 1px solid #e3e3e3;
+}
+
+/* logins */
+
+#tableform{
+	border: 1px solid #e9eeed;
+	cellspacing:0;
+}
+
+.login_form_table{
+	width:358px;
+}
+
+.login_form_table td, .login_form_table th {
+    padding: .2rem;
+    vertical-align: top;
+    border-top: 1px solid #dee2e6;
+}
+
+#j_username,#j_password,#tfa_j_username,#tfa_j_password,#currentTime{
+	width	:250px;
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#j_captcha{
+	width	:160px;
+	font-size: 14px;
+	font-weight: bold;
+}
+
+#tfa_j_otp_captcha{
+	width	:120px;
+	/*width	:230px;*/
+	font-size: 14px;
+	font-weight: bold;	
+}
+
+#tfa_j_otp_captcha_button{
+	width	:130px;
+	height: 34px;
+	font-size: 14px;
+	font-weight: bold;	
+}
+
+#j_captchaimg{
+	width:70px;
+	height: 33px;
+	vertical-align: top;
+}
+
+#switch_commonLogin,#switch_tfaLogin{
+	width	:49%;
+}
+
+#div_tfaLogin{
+	display: none;
+}
+
+.login_button{
+	width:80%;
+}
+#register{
+	font-size: 14px;
+	font-weight: bold;
+	height: 33px;
+	color: white;
+	background-color: #4D4E54;
+}
+#register a{
+	font-weight: bold;
+	color: white;
+}
+
+.login_error_message{
+	height:37px;
+	background-color: #FFE5E5;
+	font-weight: bold;
+}

maxkey-web-maxkey/src/main/resources/static/css/login.css

@@ -1,75 +0,0 @@
-#tableform{
-	border: 1px solid #e9eeed;
-	cellspacing:0;
-}
-
-.login_form_table{
-	width:358px;
-}
-
-.login_form_table td, .login_form_table th {
-    padding: .2rem;
-    vertical-align: top;
-    border-top: 1px solid #dee2e6;
-}
-
-#j_username,#j_password,#tfa_j_username,#tfa_j_password,#currentTime{
-	width	:250px;
-	font-size: 14px;
-	font-weight: bold;
-}
-
-#j_captcha{
-	width	:160px;
-	font-size: 14px;
-	font-weight: bold;
-}
-
-#tfa_j_otp_captcha{
-	width	:120px;
-	/*width	:230px;*/
-	font-size: 14px;
-	font-weight: bold;	
-}
-
-#tfa_j_otp_captcha_button{
-	width	:130px;
-	height: 34px;
-	font-size: 14px;
-	font-weight: bold;	
-}
-
-#j_captchaimg{
-	width:70px;
-	height: 33px;
-	vertical-align: top;
-}
-
-#switch_commonLogin,#switch_tfaLogin{
-	width	:49%;
-}
-
-#div_tfaLogin{
-	display: none;
-}
-
-.login_button{
-	width:80%;
-}
-#register{
-	font-size: 14px;
-	font-weight: bold;
-	height: 33px;
-	color: white;
-	background-color: #4D4E54;
-}
-#register a{
-	font-weight: bold;
-	color: white;
-}
-
-.login_error_message{
-	height:37px;
-	background-color: #FFE5E5;
-	font-weight: bold;
-}

maxkey-web-maxkey/src/main/resources/static/jquery/locale/common.en.js

@@ -0,0 +1,32 @@
+$(function () {
+	$.platform = $.platform || {};
+	$.platform.messages = $.platform.messages || {};
+	$.extend($.platform.messages, {
+		window:	{
+			title		:	'Window'
+		},
+		alert:	{
+			title		:	'Information',
+			closeText	:	'Close'
+		},
+		conform:{
+			title		:	'Conform',
+			yes			:	'YES',
+			no			:	'NO'
+		},
+		select:{
+			alertText	: 	'Please select the record'
+		},
+		del:{
+			conformText	: 	'Are you sure you want to delete?'
+		},
+		grid:{
+			loadtext	:	'Data loading ...',
+			loadnodata	:	'No matching data found'
+		},
+		submit:{
+			conformText	:	'Are you sure you want to do this?',
+			errorText	:	'Failed to perform operation'
+		}
+	});
+});

maxkey-web-maxkey/src/main/resources/static/jquery/locale/common.en_US.js

@@ -0,0 +1,32 @@
+$(function () {
+	$.platform = $.platform || {};
+	$.platform.messages = $.platform.messages || {};
+	$.extend($.platform.messages, {
+		window:	{
+			title		:	'Window'
+		},
+		alert:	{
+			title		:	'Information',
+			closeText	:	'Close'
+		},
+		conform:{
+			title		:	'Conform',
+			yes			:	'YES',
+			no			:	'NO'
+		},
+		select:{
+			alertText	: 	'Please select the record'
+		},
+		del:{
+			conformText	: 	'Are you sure you want to delete?'
+		},
+		grid:{
+			loadtext	:	'Data loading ...',
+			loadnodata	:	'No matching data found'
+		},
+		submit:{
+			conformText	:	'Are you sure you want to do this?',
+			errorText	:	'Failed to perform operation'
+		}
+	});
+});

maxkey-web-maxkey/src/main/resources/static/jquery/locale/common.zh.js

@@ -0,0 +1,32 @@
+$(function () {
+	$.platform = $.platform || {};
+	$.platform.messages = $.platform.messages || {};
+	$.extend($.platform.messages, {
+		window:	{
+			title		:	'窗口'
+		},
+		alert:	{
+			title		:	'提示信息',
+			closeText	:	'关闭'
+		},
+		conform:{
+			title		:	'确认提示',
+			yes			:	'确定',
+			no			:	'关闭'
+		},
+		select:{
+			alertText	: 	'请选择您要操作的数据'
+		},
+		del:{
+			conformText	: 	'您确定要删除吗?'
+		},
+		grid:{
+			loadtext	:	'正在加载...',
+			loadnodata	:	'没有查询到符合数据'
+		},
+		submit:{
+			conformText	:	'您确定要进行此项操作吗?',
+			errorText	:	'执行操作失败'
+		}
+	});
+});

maxkey-web-maxkey/src/main/resources/static/jquery/platform.common.js

@@ -20,7 +20,33 @@ function dataGridQueryParams(params) {
 
  //jquery begin
 $(function(){
-
+	//on captcha image click ,new a captcha code
+	$('.captcha-image').click(function () {//
+		$(this).attr("src", webContextPath + "/captcha?"+(new Date()).getTime()); 
+	});
+	
+	$.datetimepicker.setLocale(webLocale.substring(0, 2));
+	$(".datetimepicker").datetimepicker({format:'Y-m-d H:i'});
+	$(".datepicker").datetimepicker({timepicker:false,format:'Y-m-d'});
+	$(".timepicker").datetimepicker({datepicker:false,format:'H:i',step:10});
+	
+	//switch_tab
+	$(".switch_tab_class").on("click",function(){
+		if($(".switch_tab_current").attr("id")==(this.id)){
+			return;
+		}
+		
+		$(".switch_tab .switch_tab_class").removeClass("switch_tab_current");
+		$(this).addClass("switch_tab_current");
+		$(".switch_tab li").each(function(){
+		    $("#"+$(this).attr("value")).hide();
+		});
+		
+		$("#"+$(this).attr("value")).show();
+		if (typeof(switchTab) == "function"){
+			switchTab($(this).attr("value"));//user define after switch Tab
+		}
+	});
 	//document forward
 	$.forward=function(config){
 		if(config.url){//to url

maxkey-web-maxkey/src/main/resources/static/jquery/switchtab/switchtab.css

@@ -1,30 +0,0 @@
-
-.switch_tab{
-	list-style: none;
-	border: 0;
-	cellspacing:0;
-}
-
-.switch_tab_class{
-	float:left;
-	height:36px;
-	text-align: center;
-	display: inline-block;
-}
-
-.switch_tab_class a{
-	text-decoration: none;
-	display: inline-block;
-	height: 14px;
-	color: #333;
-	font-size: 14px;
-	font-weight: bold;
-	padding: 8px 0;
-	vertical-align: central;
-}
-
-.switch_tab_current{
-	background-color: #f3f6f7;;
-	border-right: 1px solid #e3e3e3;
-	border-bottom: 1px solid #e3e3e3;
-}

maxkey-web-maxkey/src/main/resources/static/jquery/switchtab/switchtab.js

@@ -1,22 +0,0 @@
-/*
- * switch_tab
- */
- //jquery begin
-$(function(){
-	$(".switch_tab_class").on("click",function(){
-		if($(".switch_tab_current").attr("id")==(this.id)){
-			return;
-		}
-		
-		$(".switch_tab .switch_tab_class").removeClass("switch_tab_current");
-		$(this).addClass("switch_tab_current");
-		$(".switch_tab li").each(function(){
-		    $("#"+$(this).attr("value")).hide();
-		});
-		
-		$("#"+$(this).attr("value")).show();
-		if (typeof(switchTab) == "function"){
-			switchTab($(this).attr("value"));//user define after switch Tab
-		}
-	});
-});//jquery end

maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl

@@ -4,14 +4,6 @@
 
 <#include  "../layout/header.ftl">
 <#include  "../layout/common.cssjs.ftl">
-<script type="text/javascript"> 
-$(function(){
-
-	$('#j_captchaimg').click(function () {//
-           $(this).attr("src", "<@base />/captcha"); 
-	}); 
-});
-</script>
 </head>
 <body  >
 <div id="top">
@@ -29,7 +21,7 @@ $(function(){
 						</tr>
 						<tr>
 								<td><@locale code="login.text.captcha"/>：</td>
-								<td><input  required="" class="form-control"  type='text' id="j_captcha" name="captcha"  tabindex="3"  value="" style="float: left;"/><img id="j_captchaimg" src="<@base/>/captcha"/></td>
+								<td><input  required="" class="form-control"  type='text' id="j_captcha" name="captcha"  tabindex="3"  value="" style="float: left;"/><img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/></td>
 								
 						</tr>
 						<tr>

maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl

@@ -1,4 +1,5 @@
 	<#-- javascript js begin  -->
+	<script type="text/javascript">var webContextPath = "<@base />";var webLocale = '<@locale/>';</script>
 	<#-- jquery base -->
 	<script	src ="<@base />/static/jquery/jquery-3.5.0.min.js"	type="text/javascript"></script>
 	<script src ="<@base />/static/jquery/popper.min.js" type="text/javascript" ></script>
@@ -34,53 +35,12 @@
 	<script src ="<@base />/static/jquery/jquery.serialize-object.min.js" type="text/javascript" ></script>
 	<#-- validation -->
 	<script src ="<@base />/static/jquery/jsonformatter.js" type="text/javascript" ></script>
-	<script src ="<@base />/static/jquery/switchtab/switchtab.js" type="text/javascript" ></script>
-	<link 	href="<@base />/static/jquery/switchtab/switchtab.css" type="text/css" rel="stylesheet" />
-	<#-- common script start -->
-	<script type="text/javascript">
-		$(function () {
-			$(".datetimepicker").datetimepicker({format:'Y-m-d H:i',lang:'<@locale/>'.substring(0, 2)});
-			$(".datepicker").datetimepicker({timepicker:false,format:'Y-m-d',lang:'<@locale/>'.substring(0, 2)});
-			
-			$.platform = $.platform || {};
-			$.platform.messages = $.platform.messages || {};
-			$.extend($.platform.messages, {
-				window:	{
-					title		:	'<@locale code="common.window.title" />'
-				},
-				alert:	{
-					title		:	'<@locale code="common.alert.title" />',
-					closeText	:	'<@locale code="common.alert.closeText" />'
-				},
-				conform:{
-					title		:	'<@locale code="common.conform.title" />',
-					yes			:	'<@locale code="common.conform.yes" />',
-					no			:	'<@locale code="common.conform.no" />'
-				},
-				select:{
-					alertText	: 	'<@locale code="common.select.hintText" />'
-				},
-				del:{
-					conformText	: 	'<@locale code="common.delete.hintText" />'
-				},
-				grid:{
-					loadtext	:	'<@locale code="common.grid.loadtext" />',
-					loadnodata	:	'<@locale code="common.grid.loadnodata" />'
-				},
-				submit:{
-					conformText	:	'<@locale code="common.submit.hintText" />',
-					errorText	:	'<@locale code="common.submit.errorText" />'
-				}
-			});
-		});
-	</script>
-	<#-- common script end -->
 	<#-- platform common script -->	
+	<script src ="<@base />/static/jquery/locale/common.<@locale/>.js" type="text/javascript" ></script>
 	<script src ="<@base />/static/jquery/platform.common.js" type="text/javascript" ></script>
 	<#-- common js end  -->
 	<#-- common css begin -->
 	<#-- if browser is not msie 6.0,follow styles over ie 6.0 style -->
-	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/base.css"/>
 	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/menu_<@theme/>.css"/>
-	<link type="text/css" rel="stylesheet" href="<@base />/static/css/login.css"/>
+	<link type="text/css" rel="stylesheet"  href="<@base />/static/css/base.css"/>
 	<#-- common css end -->

maxkey-web-maxkey/src/main/resources/templates/views/login.ftl

@@ -128,12 +128,6 @@
 		<#if true==isMfa && "TOPT"==otpType>
 		setInterval("currentTime()", 1000);
 		</#if>
-		<#--on captcha image click ,new a captcha code-->
-		<#if true==isCaptcha>
-		$('#j_captchaimg').click(function () {//
-	           $(this).attr("src", "<@base />/captcha?"+(new Date()).getTime()); 
-		}); 
-		</#if>
 	
 		<#--submit loginForme-->
 		$("#loginSubmit").on("click",function(){
@@ -242,7 +236,7 @@
 											<td>
 												<div  class="wrapper">
 		                                        	<i class="fa fa-lock fa-2"></i>
-													<input required="" class="form-control"  type='text' id="j_captcha" name="captcha"  tabindex="3"  value="" style="float: left;"/><img id="j_captchaimg" src="<@base/>/captcha"/>
+													<input required="" class="form-control "  type='text' id="j_captcha" name="captcha"  tabindex="3"  value="" style="float: left;"/><img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/>
 												</div >
 											</td>
 											

maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl

@@ -4,13 +4,6 @@
 
 <#include  "../layout/header.ftl">
 <#include  "../layout/common.cssjs.ftl">
-<script type="text/javascript"> 
-$(function(){
-	$('#j_captchaimg').click(function () {//
-           $(this).attr("src", "<@base />/captcha"); 
-	}); 
-});
-</script>
 </head>
 <body  >
 <div id="top">
@@ -31,7 +24,7 @@ $(function(){
 						</tr>
 						<tr>
 								<td><@locale code="login.text.captcha"/>：</td>
-								<td><input  required="" class="form-control"  type='text' id="j_captcha" name="captcha"  tabindex="3"  value="" style="float: left;"/><img id="j_captchaimg" src="<@base/>/captcha"/></td>
+								<td><input  required="" class="form-control"  type='text' id="j_captcha" name="captcha"  tabindex="3"  value="" style="float: left;"/><img id="j_captchaimg" class="captcha-image" src="<@base/>/captcha"/></td>
 								
 						</tr>
 						<tr>