Sākums Izpētīt Palīdzība
Pierakstīties
dromara
/
MaxKey
spogulis no https://gitee.com/dromara/MaxKey.git
2
0
Atdalīts 0
Faili Problēmas 0 Vikivietne
Pārlūkot izejas kodu

v1.4.0RC

shimingxy 5 gadi atpakaļ
vecāks
484c282f70
revīzija
ab374f4f02
30 mainītis faili ar 72 papildinājumiem un 58 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 1
      maxkey-web-manage/src/main/resources/static/jquery/platform.common.js
  2. 6 6
      maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
  3. 1 1
      maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl
  4. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl
  5. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
  6. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl
  7. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
  8. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
  9. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
  10. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
  11. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
  12. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
  13. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
  14. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
  15. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl
  16. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl
  17. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
  18. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl
  19. 2 1
      maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
  20. 11 11
      maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl
  21. 2 2
      maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
  22. 2 2
      maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl
  23. 1 4
      maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
  24. 1 1
      maxkey-web-manage/src/main/resources/templates/views/login.ftl
  25. 2 2
      maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl
  26. 5 5
      maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl
  27. 4 4
      maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl
  28. 2 1
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
  29. 2 1
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl
  30. 0 1
      maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl

+ 1 - 1
maxkey-web-manage/src/main/resources/static/jquery/platform.common.js
Parādīt failu 

@@ -495,7 +495,7 @@ $(function(){
 
 			return false;
 
 		}
 
 		if(canSubmit) {
 
-			$("#actionForm").submit();//submit
 
+			//$("#actionForm").submit();//submit
 
 		}
 
 	});

+ 6 - 6
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
Parādīt failu 

@@ -12,20 +12,20 @@
 
 </head>
 
 <body>
 
 
-<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/app/accounts/add">
 
+<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/app/accounts/add"  class="needs-validation" novalidate>
 
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 
 		<tbody>
 
 			<tr style="display:none">
 
 				<th><@locale code="userinfo.id" />：</th>
 
 				<td nowrap>
 
-					<input type="text" id="id" name="id" readonly  class="form-control" title="" value="${model.id!}"/>
 
+					<input  required="" type="text" id="id" name="id" readonly  class="form-control" title="" value="${model.id!}"/>
 
 	
 				</td>
 
 			</tr>
 
 			<tr>
 
 				<th><@locale code="userinfo.username" />：</th>
 
 				<td nowrap>
 
-					<input readonly type="text" id="username" name="username"  class="form-control username" title="" value="${model.username!}" style="float:left;width:70%;"  required="" />
 
+					<input  required="" readonly type="text" id="username" name="username"  class="form-control username" title="" value="${model.username!}" style="float:left;width:70%;"  required="" />
 
 					<input class="button btn btn-primary mr-3 window"  type="button"    id="selectUserinfoBtn" value="<@locale code="button.text.select" />"
 
 					 wurl="<@base/>/userinfo/select"
 
 						 		    wwidth="800"
 
@@ -37,14 +37,14 @@
 
 			<tr>
 
 				<th><@locale code="userinfo.displayName" />：</th>
 
 				<td nowrap>
 
-					<input readonly  type="text" id="displayName" name="displayName"  class="form-control displayName"  title="" value="${model.displayName!}" style="width:70%;"  required="" />
 
+					<input  required="" readonly  type="text" id="displayName" name="displayName"  class="form-control displayName"  title="" value="${model.displayName!}" style="width:70%;"  required="" />
 
 			
 				</td>
 
 			</tr>
 
 			<tr>
 
 				<th><@locale code="apps.name" />：</th>
 
 				<td nowrap>
 
-					<input readonly  type="text" id="appName" name="appName"  class="form-control appName" title="" value="${model.appName!}"  style="float:left;width:70%;"  required="" />
 
+					<input  required="" readonly  type="text" id="appName" name="appName"  class="form-control appName" title="" value="${model.appName!}"  style="float:left;width:70%;"  required="" />
 
 					<input class="button btn btn-primary mr-3 window"  type="button"    id="selectAppsubmitBtn" value="<@locale code="button.text.select" />"
 
 					  wurl="<@base/>/apps/select"
 
 						 		    wwidth="800"
 
@@ -73,7 +73,7 @@
 
 					<input id="status" type="hidden" name="status"  value="1"/>
 
 					<input type="hidden" id="uid" name="uid" class="uid" title="" value="${model.uid!}"/>
 
 					<input type="hidden" id="appId" name="appId" class="appId" title="" value="${model.appId!}"/>
 
-			   		<input class="button btn btn-primary mr-3"  type="button"    id="submitBtn" value="<@locale code="button.text.save" />"/>
 
+			   		<input class="button btn btn-primary mr-3"  type="submit"    id="submitBtn" value="<@locale code="button.text.save" />"/>
 
 					<input class="button btn btn-secondary mr-3"  type="button"    id="closeBtn" value="<@locale code="button.text.cancel" /> "/>	
 					
 				</td>

+ 1 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl
Parādīt failu 

@@ -58,7 +58,7 @@ $(function(){
 
 </head>
 
 <body>	
 <form id="actionForm"  method="post" type="label" autoclose="true"  
-			action="<@base/>/apps/updateExtendAttr">		 
+			action="<@base/>/apps/updateExtendAttr"  class="needs-validation" novalidate>		 
     <!-- content -->    
   	<!--table-->
 
 	<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl
Parādīt failu 

@@ -29,7 +29,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/basic/add"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
   	      	<table width="960"  class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
Parādīt failu 

@@ -39,7 +39,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/basic/update"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
   	      	<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl
Parādīt failu 

@@ -29,7 +29,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/cas/add"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
   	      	<table width="960"  class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
Parādīt failu 

@@ -39,7 +39,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/cas/update"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
   	      	<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
Parādīt failu 

@@ -68,7 +68,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/desktop/add"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table width="960"  class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
Parādīt failu 

@@ -75,7 +75,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/desktop/update"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
Parādīt failu 

@@ -35,7 +35,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
    action="<@base/>/apps/extendapi/add"  
    forward="<@base/>/apps/list"
 
-   enctype="multipart/form-data">
 
+   enctype="multipart/form-data"
 
+   class="needs-validation" novalidate>
 
    <!-- content -->    
    <!--table-->
 
 			<table  class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
Parādīt failu 

@@ -39,7 +39,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
    action="<@base/>/apps/extendapi/update"  
    forward="<@base/>/apps/list"
 
-   enctype="multipart/form-data">
 
+   enctype="multipart/form-data"
 
+   class="needs-validation" novalidate>
 
    <!-- content -->    
    <!--table-->
 
 			<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
Parādīt failu 

@@ -34,7 +34,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/formbased/add"
 
 			forward="<@base/>/apps/list"  
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table  class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
Parādīt failu 

@@ -39,7 +39,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/formbased/update"
 
 			forward="<@base/>/apps/list"  
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
Parādīt failu 

@@ -20,7 +20,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/oauth20/add"
 
 			forward="<@base/>/apps/list"  
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table width="960"   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl
Parādīt failu 

@@ -29,7 +29,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/oauth20/update"
 
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table width="960px"   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl
Parādīt failu 

@@ -21,7 +21,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/saml20/add"
 
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table   class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
Parādīt failu 

@@ -34,7 +34,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/saml20/update"
 
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
 			<table width="960"  class="table table-bordered" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl
Parādīt failu 

@@ -35,7 +35,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/tokenbased/add"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
   	      	<table width="960"  class="table table-bordered"  >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
Parādīt failu 

@@ -42,7 +42,8 @@ $(function(){
 
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
 			action="<@base/>/apps/tokenbased/update"  
 			forward="<@base/>/apps/list"
 
-			enctype="multipart/form-data">		 
+			enctype="multipart/form-data"
 
+			class="needs-validation" novalidate>		 
   	        <!-- content -->    
   	      	<!--table-->
 
   	      	<table width="960"  class="table table-bordered" >

+ 11 - 11
maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl
Parādīt failu 

@@ -63,14 +63,14 @@
 
 						<h4 class="card-title"><@locale code="login.passwordpolicy"/></h4>
 
 					</div>
 
 					<div class="card-body">
 
-								<form  method="post" type="label" validate="true" action="<@base/>/config/passwordpolicy/update" id="actionForm" >
 
+								<form  method="post" type="label" validate="true" action="<@base/>/config/passwordpolicy/update" id="actionForm"   class="needs-validation" novalidate>
 
 									<div class="row">
 
 										<div class="col-md-6">
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.minlength" />：</label>
 
 												<div class="col-sm-9">
 
 													<input id="id" name="id" type="hidden" value="${model.id!}"/>
 
-						   							<input  class="form-control" type="text" id="minLength" name="minLength"  value="${model.minLength!}" />
 
+						   							<input  required="" class="form-control" type="text" id="minLength" name="minLength"  value="${model.minLength!}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -78,7 +78,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.maxlength" />：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="maxLength" name="maxLength" value="${model.maxLength!}" />
 
+													<input required=""  class="form-control" type="text" id="maxLength" name="maxLength" value="${model.maxLength!}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -88,7 +88,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.lowercase" />：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="lowerCase" name="lowerCase"  value="${model.lowerCase!}" />
 
+													<input  required="" class="form-control" type="text" id="lowerCase" name="lowerCase"  value="${model.lowerCase!}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -96,7 +96,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.uppercase" />：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="upperCase" name="upperCase" value="${model.upperCase!}" />
 
+													<input  required="" class="form-control" type="text" id="upperCase" name="upperCase" value="${model.upperCase!}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -106,7 +106,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.digits" />：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="digits" name="digits" value="${model.digits!}"/>
 
+													<input  required="" class="form-control" type="text" id="digits" name="digits" value="${model.digits!}"/>
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -114,7 +114,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3"><@locale code="login.passwordpolicy.specialchar" />：</label>
 
 												<div class="col-sm-9">
 
-													<input   class="form-control" type="text" id="specialChar" name="specialChar"  value="${model.specialChar!}" />
 
+													<input  required=""  class="form-control" type="text" id="specialChar" name="specialChar"  value="${model.specialChar!}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -124,7 +124,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.attempts" />：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="attempts" name="attempts" value="${model.attempts}" />
 
+													<input  required="" class="form-control" type="text" id="attempts" name="attempts" value="${model.attempts}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -132,7 +132,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.duration" />(Unit:Hour)：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="duration" name="duration" value="${model.duration!}"/>
 
+													<input  required="" class="form-control" type="text" id="duration" name="duration" value="${model.duration!}"/>
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -142,7 +142,7 @@
 
 											<div class="form-group row">
 
 												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.expiration" />(Unit:Day)：</label>
 
 												<div class="col-sm-9">
 
-													<input  class="form-control" type="text" id="expiration" name="expiration"  value="${model.expiration!}" />
 
+													<input  required="" class="form-control" type="text" id="expiration" name="expiration"  value="${model.expiration!}" />
 
 												</div>
 
 											</div>
 
 										</div>
 
@@ -163,7 +163,7 @@
 
 										<div class="col-md-12">
 
 											<div class="form-group m-b-20">
 
 												<label   style="float: left;" for="simplePasswords"><@locale code="login.passwordpolicy.simplepasswords" />：</label>
 
-												<textarea id="simplePasswords" name="simplePasswords"  class="form-control" >${model.simplePasswords!}</textarea>
 
+												<textarea  required="" id="simplePasswords" name="simplePasswords"  class="form-control" >${model.simplePasswords!}</textarea>
 
 											</div>
 
 										</div>
 
 									</div>

+ 2 - 2
maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
Parādīt failu 

@@ -11,7 +11,7 @@
 
 </style>
 
 </head>
 
 <body>
 
-<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/groups/add">
 
+<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/groups/add"  class="needs-validation" novalidate>
 
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 
 		<tbody>
 
 			<tr>
 
@@ -24,7 +24,7 @@
 
 				<td nowrap colspan="2" class="center">
 
 					<input id="_method" type="hidden" name="_method"  value="post"/>
 
 					<input  id="status" type="hidden" name="status"  value="1"/>
 
-		    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="button" value="<@locale code="button.text.save" />">
 
+		    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="submit" value="<@locale code="button.text.save" />">
 
 	  				<input class="button btn btn-secondary mr-3"  id="closeBtn"   type="button" value="<@locale code="button.text.cancel" />"> 
 				</td>
 
 			</tr>

+ 2 - 2
maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl
Parādīt failu 

@@ -11,7 +11,7 @@
 
 </style>
 
 </head>
 
 <body>
 
-<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/groups/update">
 
+<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/groups/update"  class="needs-validation" novalidate>
 
 	 <table  border="0" cellpadding="0" cellspacing="0" class="table table-bordered">
 
 		<tbody>
 
 		<tr style="display:none1">
 
@@ -30,7 +30,7 @@
 
 			<td nowrap colspan="2"  class="center">
 
 				<input id="_method" type="hidden" name="_method"  value="post"/>
 
 				<input id="status" type="hidden" name="status"  value="1"/>
 
-	    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="button" value="<@locale code="button.text.save" />">
 
+	    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="submit" value="<@locale code="button.text.save" />">
 
   				<input class="button btn btn-secondary mr-3"  id="closeBtn"   type="button" value="<@locale code="button.text.cancel" />">	 
 			</td>
 
 		</tr>

+ 1 - 4
maxkey-web-manage/src/main/resources/templates/views/layout/common.cssjs.ftl
Parādīt failu 

@@ -1,7 +1,6 @@
 
 	<#-- javascript js begin  -->
 
 	<#-- jquery base -->
 
 	<script src ="<@base />/static/jquery/jquery-3.5.0.min.js"  type="text/javascript"></script>
 
-    <script src ="<@base />/static/jquery/jquery-3.5.0.min.map"  type="text/javascript"></script>
 
 	<script src ="<@base />/static/jquery/popper.min.js" type="text/javascript" ></script>
 
 	<#-- bootstrap-4.4.1 -->
 
     <link   href="<@base />/static/bootstrap-4.4.1/css/bootstrap.min.css" type="text/css" rel="stylesheet" />
 
@@ -31,9 +30,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>
 
-	<#-- validation -->
 
-	<script src ="<@base />/static/jquery/jquery-validation-1.11.1/jquery.validate.min.js" type="text/javascript" ></script>
 
-	<script src ="<@base />/static/jquery/jquery-validation-1.11.1/localization/messages_<@locale />.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" />

+ 1 - 1
maxkey-web-manage/src/main/resources/templates/views/login.ftl
Parādīt failu 

@@ -26,7 +26,7 @@
 
 							</h4>
 
 						</div>
 
 						<div class="card-body">
 
-							<form class="form-horizontal m-t-20" id="loginForm" name="loginForm" action="<@base />/logon.do" method="post">
 
+							<form class="form-horizontal m-t-20 needs-validation" id="loginForm" name="loginForm" action="<@base />/logon.do" method="post"  novalidate>
 
 								<div class="form-group">
 
 									<span class="input-group-addon"><i class="fa fa-user"></i></span>
 
 									<input id='j_username' name='username' value="admin" class="form-control" type="text" required="" placeholder="<@locale code="login.text.username"/>">

+ 2 - 2
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl
Parādīt failu 

@@ -20,7 +20,7 @@ $(function () {
 
 
 </head>
 
 <body> 
-     <form  id="actionForm" action='<@base/>/orgs/add' method="post">
 
+     <form  id="actionForm" action='<@base/>/orgs/add' method="post" class="needs-validation" novalidate>
 
      	<table  class="datatable" style="width:600px" >
 
      		<tr>
 
      			<td>
 
@@ -134,7 +134,7 @@ $(function () {
 
      		</td></tr>
 
      		<tr><td nowrap class="center">
 
                         
-                          <input id="submitBtn" class="button btn btn-primary mr-3"      type="button"   style="width:100px"  value="<@locale code="button.text.save" />"/>
 
+                          <input id="submitBtn" class="button btn btn-primary mr-3"      type="submit"   style="width:100px"  value="<@locale code="button.text.save" />"/>
 
                        
      		</td></tr>
 
      	</table>

+ 5 - 5
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl
Parādīt failu 

@@ -19,7 +19,7 @@ $(function () {
 
 
 </head>
 
 <body> 
-     <form  id="actionForm" action='<@base/>/orgs/update' method="post">
 
+     <form  id="actionForm" action='<@base/>/orgs/update' method="post" class="needs-validation" novalidate>
 
      	<table  class="datatable" style="width:600px" >
 
      		<tr>
 
      			<td>
 
@@ -46,15 +46,15 @@ $(function () {
 
            </tr>
 
            <tr >
 
               <td > <@locale code="org.id" />：</td>
 
-              <td><input type="text" id="id" name="id"    class="form-control" value="${model.id!}"/></td>
 
+              <td><input type="text" id="id" name="id"  required=""    class="form-control" value="${model.id!}"/></td>
 
            </tr>
 
            <tr>
 
               <td > <@locale code="org.name" />：</td>
 
-              <td><input type="text"  id="name" name="name"    class="form-control" value="${model.name!}"/></td>
 
+              <td><input type="text"  id="name" name="name"  required=""    class="form-control" value="${model.name!}"/></td>
 
            </tr>
 
            <tr>
 
               <td > <@locale code="org.fullname" />：</td>
 
-              <td><input type="text"  id="fullName" name="fullName"    class="form-control" value="${model.fullName!}"/></td>
 
+              <td><input type="text"  id="fullName" name="fullName"  required=""    class="form-control" value="${model.fullName!}"/></td>
 
            </tr>
 
             <tr >
 
               <td > <@locale code="org.xpath" /> ：
 
@@ -133,7 +133,7 @@ $(function () {
 
      		</td></tr>
 
      		<tr><td nowrap class="center">
 
                           
-                          <input id="submitBtn" class="button btn btn-primary mr-3"     type="button"   style="width:100px"  value="<@locale code="button.text.save" />"/>
 
+                          <input id="submitBtn" class="button btn btn-primary mr-3"     type="submit"   style="width:100px"  value="<@locale code="button.text.save" />"/>
 
                        
      		</td></tr>
 
      	</table>

+ 4 - 4
maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl
Parādīt failu 

@@ -12,7 +12,7 @@
 
 </head>
 
 <body>
 
 
-<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/userinfo/changePassword"> 
+<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/userinfo/changePassword"  class="needs-validation" novalidate> 
 
 	  <table   class="table table-bordered" >
 
 			<tbody>
 
@@ -34,19 +34,19 @@
 
 			<tr>
 
 				<th><@locale code="login.password.newPassword" />:</th>
 
 				<td>
 
-					<input type="password" id="password" name="password"  class="form-control"  title="" value=""/>
 
+					<input type="password" id="password" name="password"  required=""  class="form-control"  title="" value=""/>
 
 				</td>
 
 			</tr>
 
 			<tr>
 
 				<th><@locale code="login.password.confirmPassword" />:</th>
 
 				<td nowrap>
 
-					<input type="password" id="confirmPassword" name="confirmPassword"  class="form-control"  title="" value=""/>
 
+					<input type="password" id="confirmPassword" name="confirmPassword"  required=""  class="form-control"  title="" value=""/>
 
 				</td>
 
 			</tr>
 
 			<tr>
 
 				<td colspan="2"  class="center">
 
 					<input id="_method" type="hidden" name="_method"  value="post"/>
 
-		    		<input class="button btn btn-primary mr-3"  style="width:100px"  type="button"    id="submitBtn" value="<@locale code="button.text.save" />"/>
 
+		    		<input class="button btn btn-primary mr-3"  style="width:100px"  type="submit"    id="submitBtn" value="<@locale code="button.text.save" />"/>
 
 					
 				</td>
 
 			</tr>

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
Parādīt failu 

@@ -30,7 +30,8 @@
 
 	type="alert"  
 	action="<@base/>/userinfo/add" 
 	autoclose="true" 
-	enctype="multipart/form-data">
 
+	enctype="multipart/form-data"
 
+	class="needs-validation" novalidate>
 
 	 <div class="" style="width:100%;">
 
 		<div class="top">
 
 			<ul class="switch_tab"  style="width:100%" >

+ 2 - 1
maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl
Parādīt failu 

@@ -26,7 +26,8 @@
 
 	type="alert"  
 	action="<@base/>/userinfo/update" 
 	autoclose="true" 
-	enctype="multipart/form-data">
 
+	enctype="multipart/form-data"
 
+	class="needs-validation" novalidate>
 
 	 <div class="" style="width:100%;">
 
 		<div class="top">
 
 			<ul class="switch_tab"  style="width:100%" >

+ 0 - 1
maxkey-web-maxkey/src/main/resources/templates/views/layout/common.cssjs.ftl
Parādīt failu 

@@ -1,7 +1,6 @@
 
 	<#-- javascript js begin  -->
 
 	<#-- jquery base -->
 
 	<script	src ="<@base />/static/jquery/jquery-3.5.0.min.js"	type="text/javascript"></script>
 
-	<script src ="<@base />/static/jquery/jquery-3.5.0.min.map"  type="text/javascript"></script>
 
 	<script src ="<@base />/static/jquery/popper.min.js" type="text/javascript" ></script>
 
 	<#-- bootstrap-4.4.1 -->
 
 	<link 	href="<@base />/static/bootstrap-4.4.1/css/bootstrap.min.css" type="text/css" rel="stylesheet" />