v2.9.0 style& css

v2.9.0 style& css

maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties

@@ -315,6 +315,8 @@ apps.credentials=\u79d8\u94a5
 apps.adapter.name=\u540D\u79F0
 apps.adapter.adapter=\u9002\u914D\u5668
 apps.adapter.protocol=\u534F\u8BAE
+
+apps.select.tip=\u8BF7\u9009\u62E9\u5E94\u7528\u7CFB\u7EDF
 #formbased
 apps.formbased.info=\u8868\u5355\u8ba4\u8bc1
 apps.formbased.redirectUri=\u8ba4\u8bc1\u5730\u5740

maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties

@@ -320,6 +320,7 @@ apps.adapter.name=name
 apps.adapter.adapter=adapter
 apps.adapter.protocol=protocol
 
+apps.select.tip=Please Select Application System
 #formbased
 apps.formbased.info=formbased Info
 apps.formbased.redirectUri=redirectUri

maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties

@@ -318,6 +318,8 @@ apps.adapter.name=\u540D\u79F0
 apps.adapter.adapter=\u9002\u914D\u5668
 apps.adapter.protocol=\u534F\u8BAE
 
+apps.select.tip=\u8BF7\u9009\u62E9\u5E94\u7528\u7CFB\u7EDF
+
 #formbased
 apps.formbased.info=\u8868\u5355\u8ba4\u8bc1
 apps.formbased.redirectUri=\u8ba4\u8bc1\u5730\u5740

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adaptersList.ftl

@@ -72,44 +72,46 @@
 		 			</td>
 		 		</tr>
 		 	</table>
-		
+		 	
+    		<div id="advanced_search">
+                <form id="advanced_search_form">
+                    
+                </form>
+            </div>
+            
+            <table  data-url="<@base/>/apps/adapters/grid"
+                    id="datagrid"
+                        data-toggle="table"
+                        data-classes="table table-bordered table-hover table-striped"
+                        data-click-to-select="true"
+                        data-pagination="true"
+                        data-total-field="records"
+                        data-page-list="[10, 25, 50, 100]"
+                        data-search="false"
+                        data-locale="zh-CN"
+                        data-query-params="dataGridQueryParams"
+                        data-query-params-type="pageSize"
+                        data-side-pagination="server">
+                <thead>
+                    <tr>
+                        <th data-checkbox="true"></th>
+                        <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                        <th data-field="name"><@locale code="apps.adapter.name"/></th>
+                        <th data-field="protocol" ><@locale code="apps.adapter.protocol"/></th>
+                        <th data-field="sortIndex"><@locale code="common.text.sortindex"/></th>
+                        <th data-field="description"><@locale code="common.text.description"/></th>
+                        <th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
+                        <th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
+                        <th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
+                        <th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
+            
+                    </tr>
+                </thead>
+            </table>
 		 		
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
-		<table  data-url="<@base/>/apps/adapters/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="name"><@locale code="apps.adapter.name"/></th>
-				<th data-field="protocol" ><@locale code="apps.adapter.protocol"/></th>
-				<th data-field="sortIndex"><@locale code="common.text.sortindex"/></th>
-				<th data-field="description"><@locale code="common.text.description"/></th>
-				<th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
-				<th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
-				<th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
-				<th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
-	
-			</tr>
-		</thead>
-	</table>
+ 	
 	
 	
 </div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appsList.ftl

@@ -114,7 +114,7 @@
 			<div class="col-12 grid-margin">
 				<div class="card">
 					<div class="card-body">
-		
+		    <div id="tool_box">
 			<table  class="table table-bordered">
  				<tr>
 		 			<td width="120px"><@locale code="apps.name"/>:</td>
@@ -148,61 +148,67 @@
 		 			</td>
 		 		</tr>
 		 	</table>
-		
+		 	
+            <div id="advanced_search">
+                <form id="advanced_search_form">
+                    <table  class="datatable">
+                        <tr>
+                            <td width="120px"><@locale code="apps.protocol"/></td>
+                            <td width="374px">
+                                <select name="protocol" class="form-control">
+                                    <option value=""  selected>Select</option>
+                                    <option value="OAuth_v2.0"><@locale code="apps.protocol.oauth2.0" /></option>
+                                    <option value="SAML_v2.0"><@locale code="apps.protocol.saml2.0" /></option>
+                                    <option value="CAS"><@locale code="apps.protocol.cas" /></option>
+                                    <option value="JWT"><@locale code="apps.protocol.jwt" /></option>
+                                    <option value="Token_Based"><@locale code="apps.protocol.tokenbased" /></option>
+                                    <option value="Extend_API"><@locale code="apps.protocol.extendapi" /></option>
+                                    <option value="Form_Based"><@locale code="apps.protocol.formbased" /></option>
+                                </select>
+                            </td>
+                            <td width="120px"><@locale code="apps.vendor"/></td>
+                            <td width="374px">
+                                <input   id="vendor" name="vendor" class="form-control" type="text"  value="">
+                        </tr>
+                    </table>
+                </form>
+            </div>
+            
+		    </div>
+		    
+		    
+		   <table  data-url="<@base/>/apps/grid"
+                id="datagrid"
+                    data-toggle="table"
+                    data-classes="table table-bordered table-hover table-striped"
+                    data-click-to-select="true"
+                    data-pagination="true"
+                    data-total-field="records"
+                    data-page-list="[10, 25, 50, 100]"
+                    data-search="false"
+                    data-locale="zh-CN"
+                    data-query-params="dataGridQueryParams"
+                    data-query-params-type="pageSize"
+                    data-side-pagination="server">
+            <thead>
+                <tr>
+                    <th data-checkbox="true"></th>
+                    <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                    <th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
+                    <th data-field="name"><@locale code="apps.name"/></th>
+                    <th data-field="protocol"><@locale code="apps.protocol"/></th>
+                    <th data-field="category"><@locale code="apps.category"/></th>
+                    <th data-field="vendor"><@locale code="apps.vendor"/></th>
+                    <th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
+        
+                </tr>
+            </thead>
+        </table> 
 		 		
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		<table  class="datatable">
-	 			<tr>
-		 			<td width="120px"><@locale code="apps.protocol"/></td>
-		 			<td width="374px">
-		 				<select name="protocol" class="form-control">
-		 					<option value=""  selected>Select</option>
-		 					<option value="OAuth_v2.0"><@locale code="apps.protocol.oauth2.0" /></option>
-		 					<option value="SAML_v2.0"><@locale code="apps.protocol.saml2.0" /></option>
-		 					<option value="CAS"><@locale code="apps.protocol.cas" /></option>
-		 					<option value="JWT"><@locale code="apps.protocol.jwt" /></option>
-		 					<option value="Token_Based"><@locale code="apps.protocol.tokenbased" /></option>
-		 					<option value="Extend_API"><@locale code="apps.protocol.extendapi" /></option>
-		 					<option value="Form_Based"><@locale code="apps.protocol.formbased" /></option>
-		 				</select>
-		 			</td>
-		 			<td width="120px"><@locale code="apps.vendor"/></td>
-		 			<td width="374px">
-		 				<input   id="vendor" name="vendor" class="form-control" type="text"  value="">
-	 			</tr>
-	 		</table>
-	 	</form>
- 	</div>
-		<table  data-url="<@base/>/apps/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
-				<th data-field="name"><@locale code="apps.name"/></th>
-				<th data-field="protocol"><@locale code="apps.protocol"/></th>
-				<th data-field="category"><@locale code="apps.category"/></th>
-				<th data-field="vendor"><@locale code="apps.vendor"/></th>
-				<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
-	
-			</tr>
-		</thead>
-	</table>
+
+		
 	
 	
 </div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupapp/groupAppsList.ftl

@@ -63,7 +63,7 @@
 						<div class="card">
 							<div class="card-body">
 	<div id="tool_box">
-	 		<table   class="datatable">
+	 		<table   class="table table-bordered">
  				<tr>
 		 			<td width="120px"><@locale code="group.name"/>:</td>
 		 			<td  width="450px">
@@ -80,7 +80,7 @@
 						
 				 		</form>
 		 			</td>
-				 	<td colspan="2"> <div id="tool_box_right"  style="width:400px">
+				 	<td colspan="2"> <div id="tool_box_right" >
 				 		<input class="button btn btn-success mr-3" id="addGroupAppsBtn" type="button" value="<@locale code="button.text.add.member"/>">
 						<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>"
 							wurl="<@base/>/groupPrivileges/delete" />

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groups/groupsList.ftl

@@ -41,7 +41,7 @@
 			<div class="col-12 grid-margin">
 				<div class="card">
 					<div class="card-body">
-		
+		<div id="tool_box">    
 			<table  class="table table-bordered">
  				<tr>
 		 			<td width="120px"><@locale code="group.name"/>:</td>
@@ -73,43 +73,45 @@
 		 			</td>
 		 		</tr>
 		 	</table>
-		
-		 		
+		      <div id="advanced_search">
+                <form id="advanced_search_form">
+                    
+                </form>
+            </div>
+		 </div>		
+		 
+		 <table  data-url="<@base/>/groups/grid"
+                id="datagrid"
+                    data-toggle="table"
+                    data-classes="table table-bordered table-hover table-striped"
+                    data-click-to-select="true"
+                    data-pagination="true"
+                    data-total-field="records"
+                    data-page-list="[10, 25, 50, 100]"
+                    data-search="false"
+                    data-locale="zh-CN"
+                    data-query-params="dataGridQueryParams"
+                    data-query-params-type="pageSize"
+                    data-side-pagination="server">
+            <thead>
+                <tr>
+                    <th data-checkbox="true"></th>
+                    <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                    <th data-field="name"><@locale code="group.name"/></th>
+                    <th data-field="dynamic"  data-formatter="dynamicFormatter"><@locale code="group.dynamic"/></th>
+                    <th data-field="description"><@locale code="common.text.description"/></th>
+                    <th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
+                    <th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
+                    <th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
+                    <th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
+        
+                </tr>
+            </thead>
+        </table>
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
-		<table  data-url="<@base/>/groups/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="name"><@locale code="group.name"/></th>
-				<th data-field="dynamic"  data-formatter="dynamicFormatter"><@locale code="group.dynamic"/></th>
-				<th data-field="description"><@locale code="common.text.description"/></th>
-				<th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
-				<th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
-				<th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
-				<th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
-	
-			</tr>
-		</thead>
-	</table>
+
+		
 	
 	
 </div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/groupuser/groupUsersList.ftl

@@ -70,7 +70,7 @@
 					<div class="card-body">
 
 	<div id="tool_box">
-	 		<table   class="datatable">
+	 		<table   class="table table-bordered">
  				<tr>
 		 			<td width="120px"><@locale code="group.name"/>:</td>
 		 			<td width="450px">
@@ -87,7 +87,7 @@
 				 		
 				 		</form>
 		 			</td>
-				 	<td colspan="2"> <div id="tool_box_right"  style="width:400px">
+				 	<td colspan="2"> <div id="tool_box_right" >
 				 		
 						<input class="button btn btn-success mr-3"  id="insertGroupUserBtn" type="button" value="<@locale code="button.text.add.member"/>">
 						<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>"

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/notices/noticesList.ftl

@@ -72,43 +72,43 @@
 		 			</td>
 		 		</tr>
 		 	</table>
-		
+        	<div id="advanced_search">
+                <form id="advanced_search_form">
+                    
+                </form>
+            </div>
+                <table  data-url="<@base/>/notices/grid"
+                    id="datagrid"
+                        data-toggle="table"
+                        data-classes="table table-bordered table-hover table-striped"
+                        data-click-to-select="true"
+                        data-pagination="true"
+                        data-total-field="records"
+                        data-page-list="[10, 25, 50, 100]"
+                        data-search="false"
+                        data-locale="zh-CN"
+                        data-query-params="dataGridQueryParams"
+                        data-query-params-type="pageSize"
+                        data-side-pagination="server">
+                <thead>
+                    <tr>
+                        <th data-checkbox="true"></th>
+                        <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                        <th data-field="title"><@locale code="notices.title"/></th>
+                        <th data-field="modifiedDate" data-visible="true"><@locale code="common.text.modifieddate"/></th>
+                        <th data-field="description"><@locale code="common.text.description"/></th>
+                        <th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
+                        <th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
+                        <th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
+                        <th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
+            
+                    </tr>
+                </thead>
+            </table>	
 		 		
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
-		<table  data-url="<@base/>/notices/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="title"><@locale code="notices.title"/></th>
-				<th data-field="modifiedDate" data-visible="true"><@locale code="common.text.modifieddate"/></th>
-				<th data-field="description"><@locale code="common.text.description"/></th>
-				<th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
-				<th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
-				<th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
-				<th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
-	
-			</tr>
-		</thead>
-	</table>
+ 	
 	
 	
 </div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/orgs/orgsList.ftl

@@ -179,7 +179,7 @@ $(function () {
 				 			<input  class="form-control"  name="name" type="text" style ="width:150px;float:left;">
 				 			<input id="pId"  class="form-control"  name="parentId" type="hidden" style ="width:150px;float:left;">
 				 			<input  class="button btn btn-primary mr-3"    id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
-				 			<input  class="button btn btn-secondary"  id="advancedSearchExpandBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">
+				 			<!--<input  class="button btn btn-secondary"  id="advancedSearchExpandBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">-->
 					 	</form>
 				</td>
 				<td colspan="2"> 

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/permissions/permissionsList.ftl

@@ -264,54 +264,55 @@ $('#datagrid').on('click-row.bs.table', function (row, element, field) {
                         </form>
                     </td>
 		 			<td >
-		 				<div id="tool_box_right" style="width:100px;">
+		 				<div id="tool_box_right" >
 					 	     <input class="button btn btn-success mr-3 "  id="savePermBtn" type="button" value="<@locale code="button.text.save"/>"/>
 						</div>
 		 			</td>
 		 		</tr>
 		 	</table>
-		
+		<div id="advanced_search">
+            <form id="advanced_search_form">
+                
+            </form>
+        </div>
+        
+       <table class="datatable"   width="100%" >
+       <tr>
+          <td valign="top"  class="td_1" style="vertical-align: top;width:450px;">
+                <table  data-url="<@base/>/roles/grid"
+                        id="datagrid"
+                            data-toggle="table"
+                            data-classes="table table-bordered table-hover table-striped"
+                            data-click-to-select="true"
+                            data-pagination="true"
+                            data-total-field="records"
+                            data-page-list="[10, 25, 50, 100]"
+                            data-search="false"
+                            data-single-select="true"
+                            data-locale="zh-CN"
+                            data-query-params="dataGridQueryParams"
+                            data-query-params-type="pageSize"
+                            data-side-pagination="server">
+                    <thead>
+                        <tr>
+                            <th data-checkbox="true"></th>
+                            <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                            <th data-field="name"><@locale code="role.name"/></th>
+                            <th data-field="description"><@locale code="common.text.description"/></th>
+                
+                        </tr>
+                    </thead>
+                </table>
+          </td>
+          <td  valign="top"  class="td_1" style="vertical-align: top;">
+            <div id="resourcesTree" class="ztree"><b><@locale code="apps.select.tip"/></b></div>
+         </td>
+           </tr>
+        </table>
 		 		
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
- 	 <table class="datatable"   width="100%" >
-   <tr>
-      <td valign="top"  class="td_1" style="vertical-align: top;width:450px;">
-            <table  data-url="<@base/>/roles/grid"
-                    id="datagrid"
-                        data-toggle="table"
-                        data-classes="table table-bordered table-hover table-striped"
-                        data-click-to-select="true"
-                        data-pagination="true"
-                        data-total-field="records"
-                        data-page-list="[10, 25, 50, 100]"
-                        data-search="false"
-                        data-single-select="true"
-                        data-locale="zh-CN"
-                        data-query-params="dataGridQueryParams"
-                        data-query-params-type="pageSize"
-                        data-side-pagination="server">
-                <thead>
-                    <tr>
-                        <th data-checkbox="true"></th>
-                        <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-                        <th data-field="name"><@locale code="role.name"/></th>
-                        <th data-field="description"><@locale code="common.text.description"/></th>
-            
-                    </tr>
-                </thead>
-            </table>
-      </td>
-      <td  valign="top"  class="td_1" style="vertical-align: top;">
-        <div id="resourcesTree" class="ztree"></div>
-	 </td>
-       </tr>
-    </table>
+ 	
 	
 </div>
 					</div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/resources/resourcesList.ftl

@@ -188,7 +188,7 @@ $(function () {
 					 	</form>
 		 			</td>
 		 			<td colspan="2">
-		 				<div id="tool_box_right" style="width:350px;">
+		 				<div id="tool_box_right" >
 		 					 <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
 						 		    wurl="<@base/>/resources/forwardAdd"
 						 		    wwidth="500"
@@ -207,51 +207,51 @@ $(function () {
 		 			</td>
 		 		</tr>
 		 	</table>
-		
+	   
+            <div id="advanced_search">
+                <form id="advanced_search_form">
+                    
+                </form>
+            </div>
+             <table class="datatable"   width="100%" >
+           <tr>
+              <td valign="top"  class="td_1" style="vertical-align: top;width:400px;">
+                <div id="resourcesTree" class="ztree"><b><@locale code="apps.select.tip"/></b></div>
+                 
+              </td>
+              <td  valign="top"  class="td_1" style="vertical-align: top;">
+                <table  data-url="<@base/>/resources/grid"
+                    id="datagrid"
+                        data-toggle="table"
+                        data-classes="table table-bordered table-hover table-striped"
+                        data-click-to-select="true"
+                        data-pagination="true"
+                        data-total-field="records"
+                        data-page-list="[10, 25, 50, 100]"
+                        data-search="false"
+                        data-locale="zh-CN"
+                        data-query-params="dataGridQueryParams"
+                        data-query-params-type="pageSize"
+                        data-side-pagination="server">
+                <thead>
+                    <tr>
+                        <th data-checkbox="true"></th>
+                        <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                        <th data-field="appName"><@locale code="apps.name"/></th>
+                        <th data-field="name"><@locale code="resource.name"/></th>
+                        <th data-field="resourceType"><@locale code="resource.resourceType"/></th>
+                        <th data-field="sortIndex"><@locale code="common.text.sortindex"/></th>
+                        <th data-field="resourceAction"><@locale code="resource.resourceAction"/></th>
+                        <th data-field="description"><@locale code="common.text.description"/></th>
+                    </tr>
+                </thead>
+            </table>
+             </td>
+               </tr>
+            </table>	
 		 		
  	</div>
- 	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
- 	 <table class="datatable"   width="100%" >
-   <tr>
-      <td valign="top"  class="td_1" style="vertical-align: top;width:400px;">
-        <div id="resourcesTree" class="ztree"></div>
-         
-      </td>
-      <td  valign="top"  class="td_1" style="vertical-align: top;">
-		<table  data-url="<@base/>/resources/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="appName"><@locale code="apps.name"/></th>
-				<th data-field="name"><@locale code="resource.name"/></th>
-				<th data-field="resourceType"><@locale code="resource.resourceType"/></th>
-				<th data-field="sortIndex"><@locale code="common.text.sortindex"/></th>
-				<th data-field="resourceAction"><@locale code="resource.resourceAction"/></th>
-				<th data-field="description"><@locale code="common.text.description"/></th>
-			</tr>
-		</thead>
-	</table>
-	 </td>
-       </tr>
-    </table>
+ 
 	
 </div>
 					</div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roles/rolesList.ftl

@@ -73,42 +73,42 @@
 		 		</tr>
 		 	</table>
 		
-		 		
+		 <div id="advanced_search">
+            <form id="advanced_search_form">
+                
+            </form>
+        </div>
+            <table  data-url="<@base/>/roles/grid"
+                id="datagrid"
+                    data-toggle="table"
+                    data-classes="table table-bordered table-hover table-striped"
+                    data-click-to-select="true"
+                    data-pagination="true"
+                    data-total-field="records"
+                    data-page-list="[10, 25, 50, 100]"
+                    data-search="false"
+                    data-locale="zh-CN"
+                    data-query-params="dataGridQueryParams"
+                    data-query-params-type="pageSize"
+                    data-side-pagination="server">
+            <thead>
+                <tr>
+                    <th data-checkbox="true"></th>
+                    <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                    <th data-field="name"><@locale code="role.name"/></th>
+                    <th data-field="dynamic"  data-formatter="dynamicFormatter"><@locale code="group.dynamic"/></th>
+                    <th data-field="description"><@locale code="common.text.description"/></th>
+                    <th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
+                    <th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
+                    <th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
+                    <th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
+        
+                </tr>
+            </thead>
+        </table>		
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
-		<table  data-url="<@base/>/roles/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="name"><@locale code="role.name"/></th>
-				<th data-field="dynamic"  data-formatter="dynamicFormatter"><@locale code="group.dynamic"/></th>
-				<th data-field="description"><@locale code="common.text.description"/></th>
-				<th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
-				<th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
-				<th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
-				<th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
-	
-			</tr>
-		</thead>
-	</table>
+ 	
 	
 	
 </div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/roleusers/roleUsersList.ftl

@@ -70,7 +70,7 @@
 					<div class="card-body">
 
 	<div id="tool_box">
-	 		<table   class="datatable">
+	 		<table   class="table table-bordered">
  				<tr>
 		 			<td width="120px"><@locale code="role.name"/>:</td>
 		 			<td width="450px">
@@ -87,7 +87,7 @@
 				 		
 				 		</form>
 		 			</td>
-				 	<td colspan="2"> <div id="tool_box_right"  style="width:400px">
+				 	<td colspan="2"> <div id="tool_box_right"  >
 				 		
 						<input class="button btn btn-success mr-3"  id="insertGroupUserBtn" type="button" value="<@locale code="button.text.add.member"/>">
 						<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete.member"/>"

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/synchronizers/synchronizersList.ftl

@@ -68,41 +68,41 @@
 		 		</tr>
 		 	</table>
 		
-		 		
+		 	<div id="advanced_search">
+                <form id="advanced_search_form">
+                    
+                </form>
+            </div>
+            <table  data-url="<@base/>/synchronizers/grid"
+                    id="datagrid"
+                        data-toggle="table"
+                        data-classes="table table-bordered table-hover table-striped"
+                        data-click-to-select="true"
+                        data-pagination="true"
+                        data-total-field="records"
+                        data-page-list="[10, 25, 50, 100]"
+                        data-search="false"
+                        data-locale="zh-CN"
+                        data-query-params="dataGridQueryParams"
+                        data-query-params-type="pageSize"
+                        data-side-pagination="server">
+                <thead>
+                    <tr>
+                        <th data-checkbox="true"></th>
+                        <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
+                        <th data-field="name"><@locale code="synchronizers.name"/></th>
+                        <th data-field="description"><@locale code="common.text.description"/></th>
+                        <th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
+                        <th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
+                        <th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
+                        <th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
+            
+                    </tr>
+                </thead>
+            </table>	
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
-	 		
-	 	</form>
- 	</div>
-		<table  data-url="<@base/>/synchronizers/grid"
-			id="datagrid"
-				data-toggle="table"
-				data-classes="table table-bordered table-hover table-striped"
-				data-click-to-select="true"
-				data-pagination="true"
-				data-total-field="records"
-				data-page-list="[10, 25, 50, 100]"
-				data-search="false"
-				data-locale="zh-CN"
-				data-query-params="dataGridQueryParams"
-				data-query-params-type="pageSize"
-				data-side-pagination="server">
-		<thead>
-			<tr>
-				<th data-checkbox="true"></th>
-				<th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-				<th data-field="name"><@locale code="synchronizers.name"/></th>
-				<th data-field="description"><@locale code="common.text.description"/></th>
-				<th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
-				<th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
-				<th data-field="modifiedBy"   data-visible="false"><@locale code="common.text.modifiedby"/></th>
-				<th data-field="modifiedDate" data-visible="false"><@locale code="common.text.modifieddate"/></th>
-	
-			</tr>
-		</thead>
-	</table>
+ 	
 	
 	
 </div>

maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/usersList.ftl

@@ -205,66 +205,76 @@ $(function () {
 				<td  width="375px">
 					<form id="basic_search_form">
 						<input  class="form-control"   id="departmentId"  name="departmentId" type="hidden">
-				 			<input  class="form-control"  name="username" type="text" style ="width:150px;float:left;">
-				 			
-				 			
-				 			<input  class="button btn btn-primary mr-3"    id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
-				 			<input  class="button btn btn-secondary"  id="advancedSearchExpandBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">
-					 	</form>
+				 			<input  class="form-control"  name="username" type="text" >
+				 			</form>
 				</td>
 				<td colspan="2"> 
 					 <div id="tool_box_right">    
-						 <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
-						 		    wurl="<@base/>/userinfo/forwardAdd"
-						 		    wwidth="960"
-						 		    wheight="620"
-					 		    	target="window">	    	
-					 		    	
-					 	<input class="button btn btn-info mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
-					 				wurl="<@base/>/userinfo/forwardUpdate"
-					 				wwidth="960"
-						 		    wheight="620"
-					 		    	target="window"> 
-					 	<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
-					 				wurl="<@base/>/userinfo/delete" />
-					 	<input  class="button btn btn-secondary"  id="moreBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">	    	
-					 </div>
-					 <div id="tool_box_right_more" style="display:none;">
-					 	<input class="button btn btn-warning mr-3 window" id="changepwdBtn" type="button"
-						 value="<@locale code="login.password.changepassword"/>" 
-						 		    wurl="<@base/>/userinfo/forwardChangePassword/" wwidth="600px" wheight="250px" ref="datagrid"/>
-						
-						 <input class="button btn btn-info mr-3 window" id="userAdjointBtn" type="button" 
-						 		value="<@locale code="button.text.adjunct"/>"  ref="datagrid"
-						 		    wurl="<@base/>/useradjoint/list" wwidth="900px" wheight="600px" />
-						 <input  id="adjunctUserIdRef" 		type="hidden" />     		    
-						 <input class="button btn btn-success mr-3 window" id="usersImportBtn" type="button" 
-						 		value="<@locale code="button.text.import"/>" 
-						 		    wurl="<@base/>/userinfo/import" wwidth="400px" wheight="250px" />
+						 <input  class="button btn mr-3 btn-primary"    id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
+                         <input  class="button btn mr-3 btn-secondary"  id="advancedSearchExpandBtn" type="button" size="50"  value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>"  collapseValue="<@locale code="button.text.collapsesearch"/>">
+                        
 					</div>
 				</td>
 			</tr>
 		</table>
- 		
 		
+		<div id="advanced_search">
+            <form id="advanced_search_form">
+                <table    class="table table-bordered">
+                    <tr>
+                        <td width="120px"><@locale code="userinfo.displayName"/></td>
+                        <td width="360px">
+                            <input  class="form-control"  name="displayName" type="text" >
+                        </td>
+                        <td width="120px"><@locale code="userinfo.employeeNumber"/></td>
+                        <td width="360px">
+                            <input class="form-control"  type="text" id="employeeNumber" name="employeeNumber"  title="" value=""/>
+                            </td>
+                 </tr>
+                </table>
+            </form>
+        </div>
  	</div>
  	
- 	<div id="advanced_search">
- 		<form id="advanced_search_form">
- 			<table    class="table table-bordered">
-	 			<tr>
-	 				<td width="120px"><@locale code="userinfo.displayName"/></td>
-		 			<td width="360px">
-		 				<input  class="form-control"  name="displayName" type="text" >
-		 			</td>
-		 			<td width="120px"><@locale code="userinfo.employeeNumber"/></td>
-		 			<td width="360px">
-						<input class="form-control"  type="text" id="employeeNumber" name="employeeNumber"  title="" value=""/>
-			 			</td>
-			 </tr>
-			</table>
- 		</form>
- 	</div>
+ 	
+ 	
+ 	<div  class="toolbox">
+        <table   class="table table-bordered">
+            <tr>
+                <td > 
+                     <div class="buttonList">    
+                         <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
+                                    wurl="<@base/>/userinfo/forwardAdd"
+                                    wwidth="960"
+                                    wheight="620"
+                                    target="window">            
+                                    
+                        <input class="button btn btn-info mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
+                                    wurl="<@base/>/userinfo/forwardUpdate"
+                                    wwidth="960"
+                                    wheight="620"
+                                    target="window"> 
+                        <input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
+                                    wurl="<@base/>/userinfo/delete" />
+                      
+                        <input class="button btn btn-warning mr-3 window" id="changepwdBtn" type="button"
+                         value="<@locale code="login.password.changepassword"/>" 
+                                    wurl="<@base/>/userinfo/forwardChangePassword/" wwidth="600px" wheight="250px" ref="datagrid"/>
+                        
+                         <input class="button btn btn-info mr-3 window" id="userAdjointBtn" type="button" 
+                                value="<@locale code="button.text.adjunct"/>"  ref="datagrid"
+                                    wurl="<@base/>/useradjoint/list" wwidth="900px" wheight="600px" />
+                         <input  id="adjunctUserIdRef"      type="hidden" />                
+                         <input class="button btn btn-success mr-3 window" id="usersImportBtn" type="button" 
+                                value="<@locale code="button.text.import"/>" 
+                                    wurl="<@base/>/userinfo/import" wwidth="400px" wheight="250px" />
+                   </div>
+                </td>
+            </tr>
+        </table>
+        
+        
+    </div>
  	     <!-- content -->  
  <table class="datatable"   width="100%" >
    <tr>

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

@@ -27,6 +27,10 @@ body{
     -o-transition: all .2s ease;
     -ms-transition: all .2s ease;
 }
+
+
+
+
 .swlink {
     text-indent: -9999px;
     height: 0;
@@ -299,6 +303,17 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 	border: 1px solid #e5e5e5;
 }
 
+
+#tool_box  .table td, .table th {
+    vertical-align: middle;
+    padding: .40rem;
+}
+
+.toolbox  .table td, .table th {
+    vertical-align: middle;
+    padding: .40rem;
+}
+
 #tool_box_left {
 	padding-left: 10px;
 	float: left;
@@ -309,16 +324,11 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 }
 
 #tool_box_right {
-	height:46px;
 	text-align: right;
-	padding-right: 10px;
-	width:484px;
 }
 #tool_box_right_more{
-	height:46px;
 	text-align: right;
 	padding-right: 10px;
-	width:484px;
 }
 
 #advanced_search {
@@ -330,6 +340,9 @@ header .header-container .nav-left>li, .header .header-container .nav-right>li {
 	display: none;
 }
 
+.buttonList{
+	float: right;
+}
 #logout{
 	width: 45px;
   	background: #c00 ;

maxkey-webs/maxkey-web-resources/src/main/resources/static/zTree-v3.5.40/css/zTreeStyle/zTreeStyle.css

@@ -9,7 +9,7 @@ website:	http://code.google.com/p/jquerytree/
 -------------------------------------*/
 
 .ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
-.ztree {margin:0; padding:5px; color:#333}
+.ztree {margin:0; padding:5px;min-height: 505px; min-width: 250px; color:#333;border:1px solid rgba(0,0,0,.125);}
 .ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
 .ztree li ul{ margin:0; padding:0 0 0 18px}
 .ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}