Browse Source

UI optimize

MaxKey 3 năm trước cách đây
mục cha
commit
72f1868e4f

+ 5 - 5
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adapterAdd.ftl

@@ -18,19 +18,19 @@
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 		<tbody>
 			<tr>
-				<th><@locale code="common.text.id" /></th>
+				<th><@locale code="common.text.id" /></th>
 				<td nowrap>
 					<input type="text" id="id" name="id" class="form-control" title="" value=""  />
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="apps.adapter.name" /></th>
+				<th><@locale code="apps.adapter.name" /></th>
 				<td nowrap>
 					<input type="text" id="name" name="name" class="form-control" title="" value=""  required="" />
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="apps.adapter.protocol" /></th>
+				<th><@locale code="apps.adapter.protocol" /></th>
 				<td nowrap>
 					<select name="protocol" class="form-control  form-select">
 	 					<option value=""  selected>Select</option>
@@ -45,7 +45,7 @@
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="apps.adapter.adapter" /></th>
+				<th><@locale code="apps.adapter.adapter" /></th>
 				<td nowrap>
 					<input type="text" id="adapter" name="adapter" class="form-control" title="" value=""  required="" />
 				</td>
@@ -57,7 +57,7 @@
 	         	</td>
 	      	</tr>
 			<tr>
-                <th><@locale code="common.text.description" /></th>
+                <th><@locale code="common.text.description" /></th>
                 <td nowrap>
                     <textarea id="description" name="description" class="form-control"  rows="2" cols="20"></textarea>
                 </td>

+ 5 - 5
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/adapterUpdate.ftl

@@ -18,25 +18,25 @@
 	 <table  border="0" cellpadding="0" cellspacing="0" class="table table-bordered">
 		<tbody>
 		<tr>
-			<th><@locale code="common.text.id" /></th>
+			<th><@locale code="common.text.id" /></th>
 			<td nowrap>
 				<input id="id" type="text" readonly name="id"  class="form-control"   value="${model.id}"/>
 			</td>
 		</tr>
 		<tr>
-			<th><@locale code="apps.adapter.name" /></th>
+			<th><@locale code="apps.adapter.name" /></th>
 			<td nowrap>
 				<input type="text" id="name" name="name" class="form-control" title="" value="${model.name!}"  required="" />
 			</td>
 		</tr>
 		<tr>
-				<th><@locale code="apps.adapter.protocol" /></th>
+				<th><@locale code="apps.adapter.protocol" /></th>
 				<td nowrap>
 					<input type="text" readonly id="protocol" name="protocol" class="form-control" title="" value="${model.protocol!}"  required="" />
 				</td>
 		</tr>
 		<tr>
-				<th><@locale code="apps.adapter.adapter" /></th>
+				<th><@locale code="apps.adapter.adapter" /></th>
 				<td nowrap>
 					<input type="text" id="adapter" name="adapter" class="form-control" title="" value="${model.adapter!}"  required="" />
 				</td>
@@ -48,7 +48,7 @@
 	         	</td>
 	      </tr>
 		<tr>
-                <th><@locale code="common.text.description" /></th>
+                <th><@locale code="common.text.description" /></th>
                 <td nowrap>
                 	<textarea id="description" name="description" class="form-control"  rows="2" cols="20">${model.description!}</textarea>
                 </td>

+ 9 - 7
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/adapters/selectAdaptersList.ftl

@@ -26,19 +26,21 @@
 </head>
 <body>
 	<div id="tool_box">
-	 		<table   class="datatable">
+	 		<table   class="table table-bordered">
  				<tr>
-		 			<td width="120px"><@locale code="apps.adapter.name"/>:</td>
-		 			<td width="374px">
+		 			<td width="120px"><@locale code="apps.adapter.name"/></td>
+		 			<td width="300px">
 		 				<form id="basic_search_form">
-				 			<input class="form-control" type="text" name="name" style ="width:150px;float: left;">
-				 			<input class="form-control" type="hidden" name="protocol" style ="width:150px;float: left;" value="${protocol!}">
-				 			<input class="button btn btn-success mr-3"  id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
+		 				     <div class="input-group" style="vertical-align: middle;">  
+				 			    <input class="form-control" type="text" name="name">
+				 			    <input class="form-control" type="hidden" name="protocol" style ="width:150px;float: left;" value="${protocol!}">
+				 			    <input class="button btn btn-primary mr-3"  id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
+				 		     </div>
 				 		</form>
 		 			</td>
 				 	<td colspan="2"> 
 					 	<div id="tool_box_right" style="width: auto;">
-							<input  class="button btn btn-primary mr-3"   id="selectBtn" type="button" value="<@locale code="button.text.select"/>" >
+							<input  class="button btn btn-primary mr-3"   id="selectBtn" type="button" value="<@locale code="button.text.confirm"/>" >
 						</div>
 				 	</td>
 				</tr>

+ 1 - 1
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl

@@ -103,7 +103,7 @@
 			<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-success mr-3 window" style="float: left;" id="selectAdaptersBtn" type="button" 
+			<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"

+ 3 - 3
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl

@@ -14,7 +14,7 @@
          <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-warning mr-2" value="<@locale code="button.text.generate"/>"/>
+            <input id="generateSecret" type="button"  class="button btn btn-danger mr-2" value="<@locale code="button.text.generate"/>"/>
          </td>
       </tr>
       <tr>
@@ -84,7 +84,7 @@
          </td>
          <th><@locale code="apps.extendAttr"/></th>
          <td>
-         	<input class="button btn btn-success mr-3 window" style="float: left;" id="addExtendAttrBtn" type="button" 
+         	<input class="button btn btn-primary mr-3 window" style="float: left;" id="addExtendAttrBtn" type="button" 
          			value="<@locale code="button.text.select"/>" 
 		 		    wurl="<@base/>/apps/forwardAppsExtendAttr/${model.id!}"
 		 		    wwidth="900"
@@ -106,7 +106,7 @@
 			<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!}"/>
 			
-			<input class="button btn btn-success mr-3 window" style="float: left;" id="selectAdaptersBtn" type="button" 
+			<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"