From 67fdedccf4b819dc88de61946715c1247e5813f0 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 5 Feb 2022 17:05:38 +0800
Subject: [PATCH] UI optimize

---
 .../views/forgotpassword/findpwd.ftl          |  2 +-
 .../templates/views/register/register.ftl     |  6 ++--
 .../views/safe/changeAppLoginPasswod.ftl      | 10 +++----
 .../templates/views/safe/changePassword.ftl   | 10 +++----
 .../templates/views/safe/setting.ftl          | 12 ++++----
 .../templates/views/safe/timeBased.ftl        | 14 ++++-----
 .../views/social/socialSignOnProvider.ftl     |  4 +--
 .../accountsstrategy/accountsStrategyAdd.ftl  |  2 +-
 .../accountsstrategy/accountsStrategyList.ftl |  2 +-
 .../templates/views/apps/appAddCommon.ftl     | 24 ++++++++-------
 .../templates/views/apps/appUpdateCommon.ftl  | 26 ++++++++++-------
 .../templates/views/apps/extendapi/appAdd.ftl | 18 +++++-------
 .../views/apps/extendapi/appUpdate.ftl        | 12 ++++----
 .../templates/views/apps/formbased/appAdd.ftl | 29 +++++++++----------
 .../views/apps/formbased/appUpdate.ftl        | 18 ++++++------
 .../templates/views/apps/oauth20/appAdd.ftl   | 14 ++++-----
 .../templates/views/apps/saml20/appAdd.ftl    |  8 ++---
 .../templates/views/apps/selectAppsList.ftl   |  5 ++++
 .../views/groupapp/addGroupAppsList.ftl       |  6 +++-
 .../views/groupapp/groupAppsList.ftl          |  4 +--
 .../templates/views/groups/groupsList.ftl     |  8 ++---
 .../views/groupuser/groupUsersList.ftl        |  4 +--
 .../templates/views/layout/sidenav.ftl        |  6 ++--
 .../main/resources/templates/views/login.ftl  |  1 +
 .../views/permissions/permissionsList.ftl     |  2 +-
 .../views/resources/resourcesList.ftl         |  6 ++--
 .../views/roleusers/roleUsersList.ftl         |  4 +--
 .../views/smsprovider/updateSmsProvider.ftl   | 18 ++++++------
 .../synchronizers/synchronizerUpdate.ftl      |  8 ++---
 .../views/userinfo/changePassword.ftl         | 19 +++++-------
 .../templates/views/userinfo/userAdd.ftl      |  3 ++
 .../templates/views/userinfo/usersList.ftl    |  2 +-
 .../main/resources/static/css/minitable.css   |  1 -
 .../main/resources/static/css_mgt/base.css    | 26 +++++++++++++++--
 34 files changed, 183 insertions(+), 151 deletions(-)

diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl
index 7ae3fd70..7e85942c 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/forgotpassword/findpwd.ftl
@@ -20,7 +20,7 @@
 							<td><input  required="" type="text" id="emailMobile" name="emailMobile" class="form-control"  title="" value=""/></td>
 						</tr>
 						<tr>
-								<td><@locale code="login.text.captcha"/>：</td>
+								<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" class="captcha-image" src="<@base/>/captcha"/></td>
 								
 						</tr>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl
index f024d574..7e4b7c08 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/register/register.ftl
@@ -23,16 +23,16 @@
 							<td><input  required="" type="text" id="emailMobile" name="emailMobile" class="form-control"  title="" value=""/></td>
 						</tr>
 						<tr>
-								<td><@locale code="login.text.captcha"/>：</td>
+								<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" class="captcha-image" src="<@base/>/captcha"/></td>
 								
 						</tr>
 						<tr>
-								<td><@locale code="userinfo.displayName"/>：</td>
+								<td><@locale code="userinfo.displayName"/></td>
 								<td><input required="" class="form-control" type='text' id='displayName'  name='displayName' tabindex="1"/></td>
 						</tr>
 						<tr>
-								<td><@locale code="userinfo.username"/>：</td>
+								<td><@locale code="userinfo.username"/></td>
 								<td><input required="" class="form-control" type='text' id='username'  name='username' tabindex="1"/></td>
 						</tr>
 						<tr>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl
index 9e94d325..adf5c677 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl
@@ -19,34 +19,34 @@
 				<th  colspan="2"><@locale code="login.password.applogin.changepassword" /></th>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.displayName" /> :</th>
+				<th><@locale code="userinfo.displayName" /> </th>
 				<td>
 					<input  class="form-control"  readonly type="text" id="displayName" name="displayName" class="required" title="" value="${model.displayName}"/>
 					
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.username" /> :</th>
+				<th><@locale code="userinfo.username" /> </th>
 				<td>
 					<input  class="form-control"  readonly type="text" id="username" name="username" class="required" title="" value="${model.username}"/>
 					
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="login.password.oldPassword" /> :</th>
+				<th><@locale code="login.password.oldPassword" /> </th>
 				<td>
 					<input  class="form-control"  type="password" id="oldPassword" name="oldPassword" class="required" title="" value=""/>
 
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="login.password.newPassword" />:</th>
+				<th><@locale code="login.password.newPassword" /></th>
 				<td>
 					<input  class="form-control"  type="password" id="newPassword" name="newPassword" class=" required" title="" value=""/>
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="login.password.confirmPassword" />:</th>
+				<th><@locale code="login.password.confirmPassword" /></th>
 				<td nowrap>
 					<input  class="form-control"  type="password" id="confirmPassword" name="confirmPassword" class="{ required: true, equalTo: '#newPassword' }" title="" value=""/>
 				</td>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl
index e1f4ba88..3d3eab87 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl
@@ -19,34 +19,34 @@
 				<th  colspan="2"><@locale code="login.password.changepassword" /></th>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.displayName" /> :</th>
+				<th><@locale code="userinfo.displayName" /> </th>
 				<td>
 					<input  class="form-control"  readonly type="text" id="displayName" name="displayName" class="required" title="" value="${model.displayName}"/>
 					
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.username" /> :</th>
+				<th><@locale code="userinfo.username" /> </th>
 				<td>
 					<input  class="form-control"  readonly type="text" id="username" name="username" class="required" title="" value="${model.username}"/>
 					
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="login.password.oldPassword" /> :</th>
+				<th><@locale code="login.password.oldPassword" /> </th>
 				<td>
 					<input  class="form-control"  type="password" id="oldPassword" name="oldPassword"  title="" value=""  required="" />
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="login.password.newPassword" />:</th>
+				<th><@locale code="login.password.newPassword" /></th>
 				<td>
 					<input  class="form-control"  type="password" id="newPassword" name="newPassword"  title="" value=""  required="" />
 
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="login.password.confirmPassword" />:</th>
+				<th><@locale code="login.password.confirmPassword" /></th>
 				<td nowrap>
 					<input  class="form-control"  type="password" id="confirmPassword" name="confirmPassword"  title="" value=""  required="" />
 				</td>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl
index 911caa09..c4f84acb 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl
@@ -18,21 +18,21 @@
 				<th  colspan="2"><@locale code="userinfo.authnType" /></th>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.displayName" /> :</th>
+				<th><@locale code="userinfo.displayName" /> </th>
 				<td >
 					<input  class="form-control"  readonly type="text" id="displayName" name="displayName" class="required" title="" value="${model.displayName}"/>
 					
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.username" /> :</th>
+				<th><@locale code="userinfo.username" /> </th>
 				<td>
 					<input  class="form-control"  readonly type="text" id="username" name="username" class="required" title="" value="${model.username}"/>
 					
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.authnType" />:</th>
+				<th><@locale code="userinfo.authnType" /></th>
 				<td nowrap>
 					<select  class="form-control form-select"  name="authnType" id="authnType">
 						<option value="1"  <#if 0==model.authnType >selected</#if>  ><@locale code="button.text.select" /></option>
@@ -55,7 +55,7 @@
 				</td>
 			</tr>	
 			<tr>
-				<th><@locale code="userinfo.mobile" /> :</th>
+				<th><@locale code="userinfo.mobile" /> </th>
 				<td>
 					<input   class="form-control" type="text" id="mobile" name="mobile" required title="" value="${model.mobile}"  required="" />
 					<label for="mobile"></label>
@@ -69,7 +69,7 @@
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="userinfo.email" /> :</th>
+				<th><@locale code="userinfo.email" /> </th>
 				<td>
 					<input  class="form-control"  type="text" id="email" name="email" class="required" title="" value="${model.email}"  required="" />
 					<label for="eamil"></label>
@@ -83,7 +83,7 @@
 				</td>
 			</tr>	
 			<tr>
-                <th><@locale code="userinfo.theme" />:</th>
+                <th><@locale code="userinfo.theme" /></th>
                 <td nowrap>
                     <select  class="form-control form-select"  name="theme" id="theme">
                         <option value="default"  <#if "default"==model.theme >selected</#if>  ><@locale code="userinfo.theme.default" /></option>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl
index b9947f5f..dcfd3c91 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl
@@ -21,44 +21,44 @@
 		<div class="col-md-6">
 			<table  class="table table-bordered"   >
 				<tr>
-					<th style="width:30%;"><@locale code="userinfo.displayName" /> :</th>
+					<th style="width:30%;"><@locale code="userinfo.displayName" /> </th>
 					<td>
 						<input readonly type="text" class="required form-control" title="" value="${userInfo.displayName}"/>
 						
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="userinfo.username" /> :</th>
+					<th><@locale code="userinfo.username" /> </th>
 					<td>
 						<input readonly type="text" class="required form-control" title="" value="${userInfo.username}"/>
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="login.totp.sharedSecret" />(BASE32) :</th>
+					<th><@locale code="login.totp.sharedSecret" />(BASE32) </th>
 					<td>
 					<input readonly type="text" class="required form-control" title="" value="${sharedSecret}"/>
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="login.totp.sharedSecret" />(HEX) :</th>
+					<th><@locale code="login.totp.sharedSecret" />(HEX) </th>
 					<td>
 						<input readonly type="text" class="required form-control" title="" value="${hexSharedSecret}"/>
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="login.totp.period" />:</th>
+					<th><@locale code="login.totp.period" /></th>
 					<td>
 						<input readonly type="text" class="required form-control" title="" value="${format.period}"/>
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="login.totp.digits" />:</th>
+					<th><@locale code="login.totp.digits" /></th>
 					<td>
 						<input readonly type="text" class="required form-control" title="" value="${format.digits}"/>
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="login.totp.crypto" />:</th>
+					<th><@locale code="login.totp.crypto" /></th>
 					<td>
 						<input readonly type="text" class="required form-control" title="" value="${format.crypto}"/>
 					</td>
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl
index 1a0ff112..a3e1231a 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl
@@ -11,7 +11,7 @@
     <table data-toggle="table">
       <thead>
         <tr>
-          <th><@locale code="login.social.sortorder" /></th>
+          <!--<th><@locale code="login.social.sortorder" /></th>-->
           <th><@locale code="login.social.icon" /></th>
           <th><@locale code="login.social.provider" /></th>
           <th><@locale code="login.social.bindtime" /></th>
@@ -22,7 +22,7 @@
       <tbody>
       	<#list listSocialSignOnProvider as socialSignOnProvider>
         <tr>
-          <td>${socialSignOnProvider.sortIndex}</td>
+          <!--<td>${socialSignOnProvider.sortIndex}</td>-->
           <td><img src="<@base />/static/${socialSignOnProvider.icon}" title="${socialSignOnProvider.providerName}" width="32px;" height="32px;"/></td>
           <td>${socialSignOnProvider.providerName}</td>
           <td>${socialSignOnProvider.bindTime!}</td>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl
index be3afd73..e0e91e23 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl
@@ -186,7 +186,7 @@ function showOrgsTree() {
                         <input class="button btn btn-primary mr-3 window" style="float: left;" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" 
                                 wurl="<@base/>/apps/select"
                                 wwidth="700"
-                                wheight="540"
+                                wheight="560"
                                 target="window">
                     </div>
                 </td>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl
index e8ea7a31..4684e488 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl
@@ -68,7 +68,7 @@
 		 					 <input class="button btn btn-primary mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
 						 		    wurl="<@base/>/accountsstrategy/forwardAdd"
 						 		    wwidth="800"
-						 		    wheight="560"
+						 		    wheight="580"
 					 		    	target="window">	    	
 					 		    	
 					 	<input class="button btn btn-primary mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl
index 87155fb7..b86d6171 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl
@@ -14,7 +14,7 @@
          <th><@locale code="apps.secret"/></th>
          <td>
          	<span id="secret_text"  style="width:100%;font-weight: bold;">${model.secret!}</span>
-            <input type="hidden"class="form-control"  id="secret" name="secret"  title="" value="${model.secret!}"/>
+            <input type="hidden" class="form-control"  id="secret" name="secret"  title="" value="${model.secret!}"/>
          </td>
       </tr>
        <tr>
@@ -99,16 +99,18 @@
 		</td>
 		<th><@locale code="apps.adapter" /></th>
 		<td >
-			<input type="hidden" class="form-control"   id="adapterId" name="adapterId"  title="" value=""/>
-			<input type="text"  class="form-control"    id="adapterName" name="adapterName"  title="" value="" style="width: 80%;float: left;"/>
-			<input type="hidden" class="form-control"   id="adapter" name="adapter"  title="" value=""/>
-			
-			<input class="button btn btn-primary mr-3 window" style="float: left;" id="selectAdaptersBtn" type="button" 
-         			value="<@locale code="button.text.select"/>" 
-		 		    wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}"
-		 		    wwidth="750"
-		 		    wheight="600"
-	 		    	target="window">
+		      <div class="input-group">
+    			<input type="hidden" class="form-control"   id="adapterId" name="adapterId"      value=""/>
+    			<input type="text"   class="form-control"   id="adapterName" name="adapterName"  value="" />
+    			<input type="hidden" class="form-control"   id="adapter" name="adapter"          value=""/>
+    			
+    			<input class="button btn btn-primary mr-3 window"  id="selectAdaptersBtn" type="button" 
+             			value="<@locale code="button.text.select"/>" 
+    		 		    wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}"
+    		 		    wwidth="750"
+    		 		    wheight="600"
+    	 		    	target="window">
+    	 	</div>
 		</td>
 	</tr>
 	<tr>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl
index e841f55d..221aee70 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl
@@ -13,8 +13,10 @@
          </td>
          <th style="width:15%;"><@locale code="apps.secret"/></th>
          <td style="width:35%;">
-         	<input type="text" id="secret" readonly style="width:80%;float: left;font-weight: bold;" class="form-control" name="secret"  title="" value="${model.secret!}"/>
-            <input id="generateSecret" type="button"  class="button btn btn-danger mr-2" value="<@locale code="button.text.generate"/>"/>
+            <div class="input-group">
+         	      <input type="text" id="secret" readonly style="font-weight: bold;" class="form-control" name="secret"  title="" value="${model.secret!}"/>
+                  <input id="generateSecret" type="button"  class="button btn btn-danger mr-2" value="<@locale code="button.text.generate"/>"/>
+            </div>
          </td>
       </tr>
       <tr>
@@ -102,16 +104,18 @@
 		</td>
 		<th><@locale code="apps.adapter" /></th>
 		<td>
-			<input type="hidden" class="form-control"   id="adapterId" name="adapterId"  title="" value="${model.adapterId!}"/>
-			<input type="text" class="form-control"     id="adapterName" name="adapterName"  title="" value="${model.adapterName!}"  style="width: 80%;float: left;"/>
-			<input type="hidden" class="form-control"   id="adapter" name="adapter"  title="" value="${model.adapter!}"/>
+		      <div class="input-group">
+			     <input type="hidden" class="form-control"   id="adapterId" name="adapterId"  title="" value="${model.adapterId!}"/>
+			     <input type="text" class="form-control"     id="adapterName" name="adapterName"  title="" value="${model.adapterName!}"  />
+			     <input type="hidden" class="form-control"   id="adapter" name="adapter"  title="" value="${model.adapter!}"/>
 			
-			<input class="button btn btn-primary mr-3 window" style="float: left;" id="selectAdaptersBtn" type="button" 
-         			value="<@locale code="button.text.select"/>" 
-		 		    wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}"
-		 		    wwidth="750"
-		 		    wheight="600"
-	 		    	target="window">
+    			 <input class="button btn btn-primary mr-3 window"  id="selectAdaptersBtn" type="button" 
+             			value="<@locale code="button.text.select"/>" 
+    		 		    wurl="<@base/>/apps/adapters/selectAdaptersList?protocol=${model.protocol!}"
+    		 		    wwidth="750"
+    		 		    wheight="600"
+    	 		    	target="window">
+    	 	 </div>
 		</td>
 	</tr>
 	 <tr>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
index d3cfd171..d4b6fc0b 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
@@ -46,17 +46,17 @@ $(function(){
 			   <table  class="table table-bordered" >
 				<tbody>
 				<tr>
-					<th  ><@locale code="apps.principal"/>：</th>
+					<th  ><@locale code="apps.principal"/></th>
 					<td  >
 						<input  class="form-control" type="text" id="principal" name="principal"  title="" value=""  required=""  />
 					</td>
-					<th  ><@locale code="apps.credentials"/>：</th>
+					<th  ><@locale code="apps.credentials"/></th>
 					<td  >
 						<input class="form-control" type="text" id="credentials" name="credentials"  title="" value=""  required=""   />
 					</td>
 				</tr>
 				<tr>
-					<th  style="width:15%;"><@locale code="apps.credential"/>：</th>
+					<th  style="width:15%;"><@locale code="apps.credential"/></th>
 					<td  style="width:35%;">
 						<input type="radio" id="credential-user-defined" name="credential" class="credential" value="3"  checked />
 						<@locale code="apps.credential.user-defined"/>
@@ -64,7 +64,7 @@ $(function(){
 						<@locale code="apps.credential.shared"/>
 						<input type="radio" id="credential-system" name="credential" class="credential"  value="1"  />
 						<@locale code="apps.credential.system"/>
-						<b class="orange">*</b><label for="credential"></label>
+						
 					</td>
 					<th  style="width:15%;"></th>
 					<td  style="width:35%;">
@@ -72,7 +72,7 @@ $(function(){
 					</td>
 				</tr>
 				<tr id="systemconfigure"  style="display:none">
-					<th><@locale code="apps.systemUserAttr"/>：</th>
+					<th><@locale code="apps.systemUserAttr"/></th>
 					<td colspan="3">
 						<select  class="form-control  form-select" id="systemUserAttr" name="systemUserAttr">
 							<option value="uid">
@@ -86,19 +86,17 @@ $(function(){
 							<option value="windowsaccount">
 								<@locale code="userinfo.windowsAccount"/></option>
 						</select>
-						<b class="orange">*</b><label for="systemUserAttr"></label>
 					</td>
 				</tr>
 				<tr id="sharedconfigure"  style="display:none">
-					<th><@locale code="apps.credential.sharedUsername"/>：</th>
+					<th><@locale code="apps.credential.sharedUsername"/></th>
 					<td>
 						<input  class="form-control" type="text" id="sharedUsername" name="sharedUsername" value="" />
-						<b class="orange">*</b><label for="sharedUsername"></label>
+						
 					</td>
-					<th><@locale code="apps.credential.sharedPassword"/>：</th>
+					<th><@locale code="apps.credential.sharedPassword"/></th>
 					<td>
 						<input  class="form-control" type="text" id="sharedPassword" name="sharedPassword" value="" />
-						<b class="orange">*</b><label for="sharedPassword"></label>
 					</td>
 				</tr>
 				</tbody>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
index 754e469f..c6270803 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
@@ -46,19 +46,19 @@ $(function(){
 			   <table  class="table table-bordered" >
 				<tbody>
 				<tr>
-					<th  ><@locale code="apps.principal"/>：</th>
+					<th  ><@locale code="apps.principal"/></th>
 					<td  >
 						<input type="text"  class="form-control"  id="principal" name="principal"  title="" value="${model.principal}"  required=""   />
 						
 					</td>
-					<th  ><@locale code="apps.credentials"/>：</th>
+					<th  ><@locale code="apps.credentials"/></th>
 					<td  >
 						<input type="text" class="form-control"  id="credentials" name="credentials"  title="" value="${model.credentials}"  required=""  />
 						
 					</td>
 				</tr>
 				<tr>
-					<th style="width:15%;"><@locale code="apps.credential"/>：</th>
+					<th style="width:15%;"><@locale code="apps.credential"/></th>
 					<td style="width:35%;">
 						<select id="credential" name="credential"  class="form-control  form-select" >
 							<option value="3"   <#if  3==model.credential >selected</#if> >
@@ -77,7 +77,7 @@ $(function(){
 					</td>
 				</tr>
 				<tr id="systemconfigure"  <#if  1!=model.credential > style="display:none"</#if> >
-					<th><@locale code="apps.systemUserAttr"/>：</th>
+					<th><@locale code="apps.systemUserAttr"/></th>
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr"  class="form-control  form-select" >
 							<option value="uid"   <#if  'uid'==model.systemUserAttr >selected</#if> >
@@ -94,12 +94,12 @@ $(function(){
 					</td>
 				</tr>
 				<tr id="sharedconfigure"  <#if  2!=model.credential > style="display:none"</#if>>
-					<th><@locale code="apps.credential.sharedUsername"/>：</th>
+					<th><@locale code="apps.credential.sharedUsername"/></th>
 					<td>
 						<input type="text" class="form-control"  id="sharedUsername" name="sharedUsername" value="${model.sharedUsername}" />
 						
 					</td>
-					<th><@locale code="apps.credential.sharedPassword"/>：</th>
+					<th><@locale code="apps.credential.sharedPassword"/></th>
 					<td>
 						<input type="text" class="form-control"  id="sharedPassword" name="sharedPassword" value="${model.sharedPassword}" />
 					</td>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl
index 7688eb00..f702daf7 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl
@@ -50,28 +50,26 @@ $(function(){
 					<td colspan=4><h5><@locale code="apps.formbased.info"/></h5></td>
 				</tr>
 				<tr>
-					<th><@locale code="apps.formbased.redirectUri"/>：</th>
+					<th><@locale code="apps.formbased.redirectUri"/></th>
 					<td colspan="3">
 						<input type="text"  class="form-control"  id="redirectUri" name="redirectUri"  title="" value=""  required="" />
-						<b class="orange">*</b><label for="redirectUri"></label>
 					</td>
 					
 				</tr>
 				<tr>
-					<th style="width:15%;"><@locale code="apps.formbased.usernameMapping"/>：</th>
+					<th style="width:15%;"><@locale code="apps.formbased.usernameMapping"/></th>
 					<td style="width:35%;">
 						<input type="text"  class="form-control"  id="usernameMapping" name="usernameMapping"  title="" value="username"  required="" />
-						<b class="orange">*</b><label for="usernameMapping"></label>
 					</td>
-					<th style="width:15%;"><@locale code="apps.formbased.passwordMapping"/>：</th>
+					<th style="width:15%;"><@locale code="apps.formbased.passwordMapping"/></th>
 					<td style="width:35%;">
 						<input type="text"  class="form-control" id="passwordMapping" name="passwordMapping"  title="" value="password"  required=""  />
-						<b class="orange">*</b><label for="passwordMapping"></label>
+
 					</td>
 				</tr>
 				
 				<tr>
-					<th width="140px"><@locale code="apps.credential"/>：</th>
+					<th width="140px"><@locale code="apps.credential"/></th>
 					<td>
 						<input type="radio" id="credential-user-defined" name="credential" class="credential" value="3"  checked />
 						<@locale code="apps.credential.user-defined"/>
@@ -79,21 +77,20 @@ $(function(){
 						<@locale code="apps.credential.shared"/>
 						<input type="radio" id="credential-system" name="credential" class="credential"  value="1"  />
 						<@locale code="apps.credential.system"/>
-						<b class="orange">*</b><label for="credential"></label>
 					</td>
-					<th><@locale code="apps.formbased.passwordAlgorithm"/>：</th>
+					<th><@locale code="apps.formbased.passwordAlgorithm"/></th>
                     <td>
                        <input type="text" class="form-control" id="passwordAlgorithm" name="passwordAlgorithm"  title="" value=""/>
                     </td>
 				</tr>
 				<tr>
-					<th><@locale code="apps.formbased.authorizeView"/>：</th>
+					<th><@locale code="apps.formbased.authorizeView"/></th>
 					<td colspan =3>
 						<input type="text"  class="form-control"  id="authorizeView" name="authorizeView"  title="" value=""/>
 					</td>
 				</tr>
 				<tr id="systemconfigure"  style="display:none">
-					<th><@locale code="apps.systemUserAttr"/>：</th>
+					<th><@locale code="apps.systemUserAttr"/></th>
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr"  class="form-control  form-select" >
 							<option value="userId">
@@ -111,19 +108,19 @@ $(function(){
 					</td>
 				</tr>
 				<tr id="sharedconfigure"  style="display:none">
-					<th><@locale code="apps.credential.sharedUsername"/>：</th>
+					<th><@locale code="apps.credential.sharedUsername"/></th>
 					<td>
 						<input type="text" id="sharedUsername"  class="form-control"  name="sharedUsername" value="" />
-						<b class="orange">*</b><label for="sharedUsername"></label>
+
 					</td>
-					<th><@locale code="apps.credential.sharedPassword"/>：</th>
+					<th><@locale code="apps.credential.sharedPassword"/></th>
 					<td>
 						<input type="text" id="sharedPassword"  class="form-control"  name="sharedPassword" value="" />
-						<b class="orange">*</b><label for="sharedPassword"></label>
+
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="apps.extendAttr"/>：</th>
+					<th><@locale code="apps.extendAttr"/></th>
 					<td colspan="3">
 						<input type="checkbox" id="isExtendAttr" name="isExtendAttr" value="1"/>
 						<@locale code="apps.isExtendAttr"/>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
index 7a7c514c..6f1d7dc3 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
@@ -50,7 +50,7 @@ $(function(){
 					<td colspan=4><h5><@locale code="apps.formbased.info"/></h5></td>
 				</tr>
 				<tr>
-					<th><@locale code="apps.formbased.redirectUri"/>：</th>
+					<th><@locale code="apps.formbased.redirectUri"/></th>
 					<td colspan="3">
 						<input type="text" class="form-control" id="redirectUri" name="redirectUri"  title="" value="${model.redirectUri}"  required=""   />
 					</td>
@@ -58,18 +58,18 @@ $(function(){
 				</tr> 
 				
 				<tr>
-					<th style="width:15%;"><@locale code="apps.formbased.usernameMapping"/>：</th>
+					<th style="width:15%;"><@locale code="apps.formbased.usernameMapping"/></th>
 					<td style="width:35%;">
 						<input type="text" class="form-control" id="usernameMapping" name="usernameMapping"  title="" value="${model.usernameMapping}"  required=""   />
 					</td>
-					<th style="width:15%;"><@locale code="apps.formbased.passwordMapping"/>：</th>
+					<th style="width:15%;"><@locale code="apps.formbased.passwordMapping"/></th>
 					<td style="width:35%;">
 						<input type="text" class="form-control" id="passwordMapping" name="passwordMapping"  title="" value="${model.passwordMapping}"  required=""   />
 	
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="apps.credential"/>：</th>
+					<th><@locale code="apps.credential"/></th>
 					<td >
 						<select id="credential" name="credential"  class="form-control  form-select" >
 							<option value="3"   <#if  3==model.credential >selected</#if> >
@@ -84,19 +84,19 @@ $(function(){
 						</select>	
 						
 					</td>
-					<th><@locale code="apps.formbased.passwordAlgorithm"/>：</th>
+					<th><@locale code="apps.formbased.passwordAlgorithm"/></th>
 					<td>
 					   <input type="text" class="form-control" id="passwordAlgorithm" name="passwordAlgorithm"  title="" value="${model.passwordAlgorithm!}"/>
 					</td>
 				</tr>
 				<tr>
-					<th><@locale code="apps.formbased.authorizeView"/>：</th>
+					<th><@locale code="apps.formbased.authorizeView"/></th>
 					<td colspan =3>
 						<input type="text" class="form-control" id="authorizeView" name="authorizeView"  title="" value="${model.authorizeView!}"/>
 					</td>
 				</tr>
 				<tr id="systemconfigure"  <#if 1!=model.credential> style="display:none"</#if> >
-					<th><@locale code="apps.systemUserAttr"/>：</th>
+					<th><@locale code="apps.systemUserAttr"/></th>
 					<td colspan="3">
 						<select id="systemUserAttr" name="systemUserAttr" class="form-control  form-select">
 							<option value="userId"   <#if 'userId'==model.systemUserAttr>selected</#if> >
@@ -113,12 +113,12 @@ $(function(){
 					</td>
 				</tr>
 				<tr id="sharedconfigure"  <#if 2!=model.credential> style="display:none"</#if>>
-					<th><@locale code="apps.credential.sharedUsername"/>：</th>
+					<th><@locale code="apps.credential.sharedUsername"/></th>
 					<td>
 						<input type="text" class="form-control" id="sharedUsername" name="sharedUsername" value="${model.sharedUsername}" />
 			
 					</td>
-					<th><@locale code="apps.credential.sharedPassword"/>：</th>
+					<th><@locale code="apps.credential.sharedPassword"/></th>
 					<td>
 						<input type="text"  class="form-control" id="sharedPassword" name="sharedPassword" value="${model.sharedPassword}" />
 
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
index cc17cc2f..3de94cdc 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
@@ -71,7 +71,7 @@
 								<td>phone<input type="checkbox" id="scope_phone" name="scope" value="phone"/></td>
 								<td>address<input type="checkbox" id="scope_address" name="scope" value="address"/></td>
 								<td>all<input type="checkbox" id="scope_all" name="scope" value="all"/></td>
-								<td><b class="orange">*</b><label for="scope"></label></td>
+								
 							</tr>
 						</table>
 					</td>
@@ -88,7 +88,7 @@
 								<td>refresh_token<input type="checkbox" id="grantTypes_refresh_token" name="authorizedGrantTypes" value="refresh_token"/></td>
 								<td>id_token<input  type="checkbox" id="grantTypes_id_token" name="authorizedGrantTypes" value="id_token"/></td>
 								<td>token<input type="checkbox" id="grantTypes_token" name="authorizedGrantTypes" value="token"/></td>
-								<td><b class="orange">*</b><label for="authorizedGrantTypes"></label></td>
+								
 							</tr>
 						</table>
 					</td>
@@ -97,19 +97,19 @@
 					<th><@locale code="apps.oauth.registeredRedirectUris" /></th>
 					<td colspan=3>
 						<textarea  class="form-control"  id="registeredRedirectUris" name="registeredRedirectUris" rows="4" cols="60"></textarea>
-						<b class="orange">*</b><label for="registeredRedirectUris"></label>
+						
 					</td>
 				</tr>
 				<tr>
 					<th><@locale code="apps.oauth.accessTokenValiditySeconds" /></th>
 					<td >
-						<input type="text"  class="form-control" id="accessTokenValiditySeconds" name="accessTokenValiditySeconds"  title="" value="180"/>
-						<b class="orange">*</b><label for="accessTokenValiditySeconds"></label>
+						<input type="text"  class="form-control" id="accessTokenValiditySeconds" name="accessTokenValiditySeconds"  title="" value="1800"/>
+						
 					</td>
 					<th><@locale code="apps.oauth.refreshTokenValiditySeconds" /></th>
 					<td>
-						<input type="text" class="form-control"  id="refreshTokenValiditySeconds" name="refreshTokenValiditySeconds"  title="" value="180"/>
-						<b class="orange">*</b><label for="refreshTokenValiditySeconds"></label>
+						<input type="text" class="form-control"  id="refreshTokenValiditySeconds" name="refreshTokenValiditySeconds"  title="" value="1800"/>
+						
 					</td>
 				</tr>
 				<tr>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl
index 8055ee59..720c2981 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/saml20/appAdd.ftl
@@ -116,7 +116,7 @@
 							<option value="entity">entity</option>
 							<option value="custom">user custom persistent </option>
 						</select>
-						<b class="orange">*</b><label for="fileType"></label>
+						
 					</td>
 					<th><@locale code="apps.saml.nameIdConvert" /></th>
 					<td>
@@ -128,7 +128,7 @@
 							<option value="2">
 								<@locale code="apps.saml.nameIdConvert.lowerCase" /></option>
 						</select>
-						<b class="orange">*</b><label for="issuer"></label>
+						
 					</td>
 					
 				</tr>
@@ -143,7 +143,7 @@
 							<option value="Post-PostSimpleSign" >Post-PostSimpleSign</option>
 							<option value="IdpInit-PostSimpleSign" >IdpInit-PostSimpleSign</option>
 						</select>
-						<b class="orange">*</b><label for="binding"></label>
+						
 					</td>
 					<th style="width:15%;"><@locale code="apps.saml.validityInterval" /></th>
 					<td style="width:35%;">
@@ -159,7 +159,7 @@
 							<option value="metadata_file"  selected><@locale code="apps.saml.fileType.metadata.file" /></option>
 							<option value="metadata_url"           ><@locale code="apps.saml.fileType.metadata.url" /></option>
 						</select>
-						<b class="orange">*</b><label for="fileType"></label>
+						
 					</td>
 					<th><@locale code="apps.saml.metaFile" /></th>
 					<td nowrap >
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
index a9ce2849..1cce9694 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
@@ -4,6 +4,11 @@
 	<#include  "../layout/header.ftl"/>
 	<#include  "../layout/common.cssjs.ftl"/>
     <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
+    <style>
+    .bootstrap-table .fixed-table-container .table th, .bootstrap-table .fixed-table-container .table td{
+        padding: .2rem;
+    }
+   </style>
   
 <script type="text/javascript">				
 	function iconFormatter(value, row, index){
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
index 7a84543d..84d9220a 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
@@ -4,7 +4,11 @@
 	<#include  "../layout/header.ftl"/>
 	<#include  "../layout/common.cssjs.ftl"/>
     <link type="text/css" rel="stylesheet"  href="<@base />/static/css/minitable.css"/>
-    
+    <style>
+    .bootstrap-table .fixed-table-container .table th, .bootstrap-table .fixed-table-container .table td{
+        padding: .2rem;
+    }
+   </style>
 <script type="text/javascript">	
 			function afterSubmit(data){
 				//$("#list").trigger('reloadGrid');
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl
index 68ecb06f..09eaf630 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl
@@ -20,7 +20,7 @@
 					url		:	"<@base/>/groupPrivileges/addGroupAppsList/"+$("#groupId").val(),//window url
 					title	:	"New",//title
 					width	:	"700",//width
-					height	:	"500"//height
+					height	:	"560"//height
 				};
 			$.window(settings);//open window
 		});
@@ -76,7 +76,7 @@
 				 			    <input class="window button btn btn-primary mr-3" type="button" value="<@locale code="button.text.select"/>" 
 						 		    wurl="<@base/>/groups/selectGroupsList"
 						 		    wwidth="700"
-						 		    wheight="500"
+						 		    wheight="560"
 					 		    	target="window">
 					 		  	
 				 			    <input class="button btn btn-primary mr-3"   id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl
index deac5154..155fea97 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl
@@ -59,14 +59,14 @@
 		 				<div id="tool_box_right">
 		 					 <input class="button btn btn-primary mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
 						 		    wurl="<@base/>/groups/forwardAdd"
-						 		    wwidth="500"
-						 		    wheight="600"
+						 		    wwidth="550"
+						 		    wheight="620"
 					 		    	target="window">	    	
 					 		    	
 					 	<input class="button btn btn-primary mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
 					 				wurl="<@base/>/groups/forwardUpdate"
-					 				wwidth="500"
-						 		    wheight="600"
+					 				wwidth="550"
+						 		    wheight="620"
 					 		    	target="window"> 
 					 		    	
 					 	<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl
index faca3589..a4327571 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl
@@ -27,7 +27,7 @@
 							url		:	"<@base/>/groupMember/addGroupAppsList/"+$("#groupId").val(),//window url
 							title	:	"New",//title
 							width	:	"700",//width
-							height	:	"500"//height
+							height	:	"560"//height
 						};
 					$.window(settings);//open window
 			
@@ -81,7 +81,7 @@
     				 			<input class="window button btn btn-primary mr-3"  type="button" value="<@locale code="button.text.select"/>" 
     						 		    wurl="<@base/>/groups/selectGroupsList"
     						 		    wwidth="700"
-    						 		    wheight="500"
+    						 		    wheight="560"
     					 		    	target="window">
     					 	     	
 				 			    <input   class="button btn btn-primary mr-3"   id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/sidenav.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/sidenav.ftl
index e463a5e8..f5ed370e 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/sidenav.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/sidenav.ftl
@@ -17,7 +17,7 @@
    	<li>
      	<a class="side-nav-menu" href="<@base />/userinfo/list/">
        		<@locale code="navs.users"/>
-       		<span class="fa fa-fw fa-user fa-lg"></span>
+       		<span class="fa fa-fw fa-user-circle-o fa-lg"></span>
      	</a>
    	</li>
  	<li>
@@ -36,7 +36,7 @@
    	<li>
      	<a class="side-nav-menu has-arrow" href="#">
        		<@locale code="navs.privileges"/>
-       		<span class="fa fa-fw fa-map fa-lg"></span>
+       		<span class="fa fa-fw fa-shield fa-lg"></span>
      	</a>
      	<ul>
      	   <li>
@@ -75,7 +75,7 @@
 	       <li>
              <a class="side-nav-menu" href="<@base />/roles/list/">
                 <@locale code="navs.roles"/>  
-                <span class="fa fa-fw fa-shield"></span>
+                <span class="fa fa-fw fa-id-card"></span>
              </a>
            </li>
            <li>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl
index 4de0e8e1..3bb4c539 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/login.ftl
@@ -30,6 +30,7 @@
 								    <div class="input-group">
                                         <span class="input-group-text fa fa-key d-flex justify-content-center"></span>
                                         <input id='j_password' name='password' class="form-control" type="password" required="" placeholder="<@locale code="login.text.password"/>">
+									    <i class="passwdeye fa fa-eye-slash fa-2" style="left: 270px; color: gainsboro;" refid="j_password" ></i>
 									</div>
 								</div>
 								<#if true==isCaptcha> 
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl
index b7b58424..c30e017b 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl
@@ -260,7 +260,7 @@ $('#datagrid').on('click-row.bs.table', function (row, element, field) {
                                 <input class="button btn btn-primary mr-3 window"  id="selectBtn" type="button" value="<@locale code="button.text.select"/>" 
                                         wurl="<@base/>/apps/select"
                                         wwidth="700"
-                                        wheight="500"
+                                        wheight="560"
                                         target="window">
                             
                                 <input  class="button btn btn-primary mr-3"    id="changTreeBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/resourcesList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/resourcesList.ftl
index c1b1148a..c3532186 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/resourcesList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/resourcesList.ftl
@@ -181,7 +181,7 @@ $(function () {
                                 <input class="button btn btn-primary mr-3 window" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" 
                                         wurl="<@base/>/apps/select"
                                         wwidth="700"
-                                        wheight="500"
+                                        wheight="560"
                                         target="window">
                             
     			 				<input  class="button btn btn-primary mr-3"    id="changTreeBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
@@ -196,13 +196,13 @@ $(function () {
 		 					 <input class="button btn btn-primary mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
 						 		    wurl="<@base/>/resources/forwardAdd"
 						 		    wwidth="500"
-						 		    wheight="550"
+						 		    wheight="570"
 					 		    	target="window"/>	    	
 					 		    	
 					 	<input class="button btn btn-primary mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
 					 				wurl="<@base/>/resources/forwardUpdate"
 					 				wwidth="500"
-						 		    wheight="550"
+						 		    wheight="570"
 					 		    	target="window"/> 
 					 		    	
 					 	<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/roleUsersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/roleUsersList.ftl
index 85c11fbb..87a60d5e 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/roleUsersList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/roleUsersList.ftl
@@ -27,7 +27,7 @@
 							url		:	"<@base/>/rolemembers/addRoleAppsList/"+$("#roleId").val(),//window url
 							title	:	"New",//title
 							width	:	"700",//width
-							height	:	"500"//height
+							height	:	"560"//height
 						};
 					$.window(settings);//open window
 			
@@ -81,7 +81,7 @@
     				 			<input class="window button btn btn-primary mr-3"  type="button" value="<@locale code="button.text.select"/>" 
     						 		    wurl="<@base/>/roles/selectRolesList"
     						 		    wwidth="700"
-    						 		    wheight="500"
+    						 		    wheight="560"
     					 		    	target="window">
     					 	 
 				 			    <input   class="button btn btn-primary mr-3"    id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/smsprovider/updateSmsProvider.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/smsprovider/updateSmsProvider.ftl
index d2bc0618..bd3f3537 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/smsprovider/updateSmsProvider.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/smsprovider/updateSmsProvider.ftl
@@ -43,7 +43,7 @@
 									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.providerName" />：</label>
+												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.providerName" /></label>
 												<div class="col-sm-9">
 													<input id="id" name="id" type="hidden" value="${model.id!}"/>
 						   							<select id="provider" name="provider"  class="form-control form-select">
@@ -57,7 +57,7 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><@locale code="common.text.status" />：</label>
+												<label class="col-sm-3 col-form-label"><@locale code="common.text.status" /></label>
 												<div class="col-sm-9">
 													<select id="status" name="status"  class="form-control  form-select">
                                                         <option value="0" <#if 0==model.status>selected</#if> ><@locale code="common.text.status.disabled" /></option>
@@ -68,7 +68,7 @@
 										</div>
 									</div>
 									<div class="row mb-3">
-                                            <label class="col-sm-2 col-form-label"><@locale code="smsprovider.message" />：</label>
+                                            <label class="col-sm-2 col-form-label"><@locale code="smsprovider.message" /></label>
                                             <div class="col-sm-10">
                                                 <input required=""  class="form-control" type="text" id="message" name="message" value="${model.message!}" />
                                             </div>
@@ -76,7 +76,7 @@
 									<div class="row mb-3">
                                         <div class="col-md-6">
                                             <div class="form-group row">
-                                                <label class="col-sm-3 col-form-label"><@locale code="smsprovider.appkey" />：</label>
+                                                <label class="col-sm-3 col-form-label"><@locale code="smsprovider.appkey" /></label>
                                                 <div class="col-sm-9">
                                                     <input  required="" class="form-control" type="text" id="appKey" name="appKey"  value="${model.appKey!}" />
                                                     
@@ -86,7 +86,7 @@
                                         </div>
                                         <div class="col-md-6">
                                             <div class="form-group row">
-                                                <label class="col-sm-3 col-form-label"><@locale code="smsprovider.appsecret" />：</label>
+                                                <label class="col-sm-3 col-form-label"><@locale code="smsprovider.appsecret" /></label>
                                                 <div class="col-sm-9">
                                                     <input  required="" class="form-control" type="password" id="appSecret" name="appSecret" value="${model.appSecret!}" />
                                                 </div>
@@ -96,7 +96,7 @@
 									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.templateid" />：</label>
+												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.templateid" /></label>
 												<div class="col-sm-9">
 													<input  required="" class="form-control" type="text" id="templateId" name="templateId"  value="${model.templateId!}" />
 												</div>
@@ -104,7 +104,7 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.signname" />：</label>
+												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.signname" /></label>
 												<div class="col-sm-9">
 													<input  required="" class="form-control" type="text" id="signName" name="signName" value="${model.signName!}" />
 												</div>
@@ -114,7 +114,7 @@
 									<div class="row mb-3">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.tencentcloud.smssdkappid" />：</label>
+												<label class="col-sm-3 col-form-label"><@locale code="smsprovider.tencentcloud.smssdkappid" /></label>
 												<div class="col-sm-9">
 													<input   class="form-control" type="text" id="smsSdkAppId" name="smsSdkAppId" value="${model.smsSdkAppId!}"/>
 												</div>
@@ -128,7 +128,7 @@
                                         <div class="col-md-12">
                                             <div class="form-group row">
                                                 <div class="col-sm-2">
-                                                    <label class="col-form-label"><@locale code="common.text.description" />：</label>
+                                                    <label class="col-form-label"><@locale code="common.text.description" /></label>
                                                 </div>
                                                 <div class="col-sm-10">
                                                     <input   class="form-control" type="text" id="description" name="description"  value="${model.description!}" />
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizerUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizerUpdate.ftl
index 3127b2ca..a6a3f333 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizerUpdate.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizerUpdate.ftl
@@ -49,7 +49,7 @@
 		<tr>
 			<th><@locale code="synchronizers.credentials" /></th>
 			<td nowrap>
-				<input type="text" id="credentials" name="credentials" class="form-control" title="" value="${model.credentials!}"  required="" />
+				<input type="password" id="credentials" name="credentials" class="form-control" title="" value="${model.credentials!}"  required="" />
 			</td>
 		</tr>
 	</#if>
@@ -75,7 +75,7 @@
 		<tr>
 			<th><@locale code="synchronizers.credentials" /></th>
 			<td nowrap>
-				<input type="text" id="credentials" name="credentials" class="form-control" title="" value="${model.credentials!}"  required="" />
+				<input type="password" id="credentials" name="credentials" class="form-control" title="" value="${model.credentials!}"  required="" />
 			</td>
 		</tr>
 		<tr>
@@ -101,7 +101,7 @@
 		<tr>
 			<th><@locale code="synchronizers.credentials" /></th>
 			<td nowrap>
-				<input type="text" id="credentials" name="credentials" class="form-control" title="" value="${model.credentials!}"  required="" />
+				<input type="password" id="credentials" name="credentials" class="form-control" title="" value="${model.credentials!}"  required="" />
 			</td>
 		</tr>
 		<tr>
@@ -131,7 +131,7 @@
 		<tr>
 			<th><@locale code="synchronizers.trustStorePassword" /></th>
 			<td nowrap>
-				<input type="text" id="trustStorePassword" name="trustStorePassword" class="form-control" title="" value="${model.trustStorePassword!}"  />
+				<input type="password" id="trustStorePassword" name="trustStorePassword" class="form-control" title="" value="${model.trustStorePassword!}"  />
 			</td>
 		</tr>
 		<tr>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/changePassword.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/changePassword.ftl
index 8c48be80..51b0bec4 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/changePassword.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/changePassword.ftl
@@ -3,18 +3,13 @@
 <head>
 	<#include  "../layout/header.ftl"/>
 	<#include  "../layout/common.cssjs.ftl"/>
-	<style   type="text/css">
-	  .table th, .table td {
-	    padding .2rem;
-	    vertical-align middle;
-	  }
-	</style>
+
 
 	<script type="text/javascript">
 	<!--
 	$(function(){	
 		$("#generateSecret").on("click",function(){
-			$.post("<@base/>/userinfo/randomPassword/", {_method"post",currTime(new Date()).getTime()}, function(data) {
+			$.post("<@base/>/userinfo/randomPassword/", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
 				$("#password").val(data+"");
 				$("#confirmPassword").val(data+"");
 			}); 
@@ -55,10 +50,12 @@
 			<tr>
 				<th><@locale code="login.password.newPassword" /></th>
 				<td>
-				    <div class="input-group mb-3" style="vertical-align middle;">
-					   <input type="password" id="password" name="password"  required=""  class="form-control"  title="" value="" width="80%"/>
-					   <input id="generateSecret" type="button" class="button btn btn-primary mr-3" style="width100px"  value="<@locale code="button.text.generate"/>"/>
-                        <input id="view" type="button" class="button btn btn-primary mr-3" style="width100px"  value="<@locale code="button.text.view"/>"/>
+				    
+				    <div class="input-group" style="vertical-align middle;">
+					   <input type="password" id="password" name="password"  required=""  class="form-control"  title="" value=""/>
+					   <i class="passwdeye fa fa-eye-slash fa-2" style="left: 350px; color: gainsboro;" refid="password" ></i>
+					   <input id="generateSecret" type="button" class="button btn btn-primary mr-3"    value="<@locale code="button.text.generate"/>"/>
+                       
                     </div>
 				</td>
 			</tr>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userAdd.ftl
index 6b11da54..a7e77ca6 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userAdd.ftl
@@ -57,7 +57,10 @@
 		</td>
 		<td style="width:15%;"><@locale code="login.text.password" /></td>
 		<td style="width:35%;">
+		  <div class="input-group" style="vertical-align middle;">
 			<input  class="form-control"  type="password" required="" id="password" name="password"  title="" value=""/>
+			<i class="passwdeye fa fa-eye-slash fa-2" style="left: 290px; color: gainsboro;" refid="password" ></i>
+		  </div>
 		</td>
 	</tr>
 	<tr>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/usersList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/usersList.ftl
index b8138360..5014b8a0 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/usersList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/usersList.ftl
@@ -218,7 +218,7 @@ $(function () {
 					 <div id="tool_box_right">    
 						  <input class="button btn btn-primary mr-3 window" id="changepwdBtn" type="button"
                          value="<@locale code="login.password.changepassword"/>" 
-                                    wurl="<@base/>/userinfo/forwardChangePassword/" wwidth="600px" wheight="260px" ref="datagrid"/>
+                                    wurl="<@base/>/userinfo/forwardChangePassword/" wwidth="600px" wheight="300px" ref="datagrid"/>
                         
                          <input class="button btn btn-primary mr-3 window" id="userAdjointBtn" type="button" 
                                 value="<@locale code="button.text.adjunct"/>"  ref="datagrid"
diff --git a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/minitable.css b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/minitable.css
index d4d97b91..a46f2898 100644
--- a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/minitable.css
+++ b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css/minitable.css
@@ -1,5 +1,4 @@
 .table td, .table th {
-    padding: 0.2rem;
     vertical-align: middle;
 }
 
diff --git a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css
index f9b53f4c..f6bd09ef 100644
--- a/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css
+++ b/maxkey-webs/maxkey-web-resources/src/main/resources/static/css_mgt/base.css
@@ -482,7 +482,7 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 	text-decoration: none;
 	display: inline-block;
 	height: 14px;
-	color: #333;
+	color: black;
 	font-size: 14px;
 	font-weight: bold;
 	padding: 8px 0;
@@ -490,11 +490,15 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 }
 
 .switch_tab_current{
-	background-color: #8bc8de;
+	background-color: #0d6efd;
 	border-right: 1px solid #e3e3e3;
 	border-bottom: 1px solid #e3e3e3;
 }
 
+.switch_tab_current a{
+    color: white;
+}
+
 /*maxkey login*/
 
 #tableform{
@@ -511,6 +515,15 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 	font-weight: bold;
 }
 
+#loginForm .input-group i.fa{ 
+    position: absolute; 
+    top: 5px; 
+    left: 5px; 
+    font-size: 24px; 
+    color: black;
+    z-index: 20;
+}
+
 #j_captcha{
 	width	:60%;
 	font-size: 14px;
@@ -591,4 +604,13 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
   max-width: 330px;
   padding: 15px;
   margin: auto;
+}
+
+.input-group i.fa {
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    font-size: 24px;
+    color: black;
+    z-index: 20;
 }
\ No newline at end of file
-- 
GitLab