From 645531be8355ed12d52ff5b71254cca7e1ea2152 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 17 Jan 2019 09:59:30 +0600
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87/asn?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/basics/asnGroupList.jsp     | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
index a6f6975f5..fff95f80e 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
@@ -143,7 +143,7 @@
 								
 								<div class="pull-left">
 								
-									<div class="input-group">
+									<%-- <div class="input-group">
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
@@ -157,8 +157,38 @@
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
                                   
-                                    </div> 
-								</div>
+                                    </div>  --%>
+                                    <div class="input-group">
+	                                	<div class="input-group-btn">
+											<span class="form-control" ><spring:message code="organization"/></span>
+	                                   	</div>
+										<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
+	                          		</div>
+									</div>
+									<div class="pull-left">
+									    <div class="input-group">
+		                                	<div class="input-group-btn">
+												<span class="form-control" ><spring:message code="asn_no"/></span>
+		                                   	</div>
+											<input name="asnId" id="asnId" type="text" class="form-control input-medium" value="${cfg.asnId}" />
+		                          		</div>
+									</div>
+									<div class="pull-left">
+									    <div class="input-group">
+		                                	<div class="input-group-btn">
+												<span class="form-control" ><spring:message code="country"/></span>
+		                                   	</div>
+											<input name="country" id="country" type="text" class="form-control input-medium" value="${cfg.country}" />
+		                          		</div>
+									</div>
+									<div class="pull-left">
+									    <div class="input-group">
+		                                	<div class="input-group-btn">
+												<span class="form-control" ><spring:message code="detail"/></span>
+		                                   	</div>
+											<input name="detail" id="detail" type="text" class="form-control input-medium" value="${cfg.detail}" />
+		                          		</div>
+									</div>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
@@ -230,9 +260,9 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th class="sort-column r.organization"><spring:message code="organization"/></th>
-									<th class="sort-column r.country"><spring:message code="country"/></th>
-									<th class="sort-column r.detail"><spring:message code="detail"/></th>
 									<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
+									<th class="sort-column r.country"><spring:message code="country"/></th>
+									<th class="sort-column r.detail"><spring:message code="detail"/></th>									
 									<th class="sort-column r.is_used"><spring:message code="is_issued"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="creator"/></th>
@@ -248,22 +278,22 @@
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.organization}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.organization,20)}
+											${fns:abbr(cfg.organization,50)}
 										</a>
 									</td>
+									<td>${cfg.asnId}</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.country}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.country,20)}
+											${fns:abbr(cfg.country,50)}
 										</a>
 									</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.detail}"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.detail,20)}
+											${fns:abbr(cfg.detail,50)}
 										</a>
 									</td>
-									<td>${cfg.asnId}</td>
 									<td>
 										<c:if test="${cfg.isUsed==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isUsed==1}"><spring:message code="yes"/></c:if>