From 529a934f42fa59c77671f72b42a1e14cc336475c Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Fri, 7 Dec 2018 20:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=B1=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8IP=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties          | 4 +++-
 src/main/resources/messages/message_ru.properties          | 4 +++-
 src/main/resources/messages/message_zh_CN.properties       | 4 +++-
 .../views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp    | 7 ++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index aa652ee6e..c69c3fadd 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1352,4 +1352,6 @@ ip_info=IP Info
 original_dest_ip=Original destination address
 original_dest_port=Original destination port
 translated_dest_ip=Post-translational destination address
-translated_dest_port=Post-translational destination port
\ No newline at end of file
+translated_dest_port=Post-translational destination port
+show_ips=View all IP
+show_available_ips=View available IP
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 0304afb23..fabb6319b 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1353,4 +1353,6 @@ ip_info=IP Info
 original_dest_ip=Original destination address
 original_dest_port=Original destination port
 translated_dest_ip=Post-translational destination address
-translated_dest_port=Post-translational destination port
\ No newline at end of file
+translated_dest_port=Post-translational destination port
+show_ips=View all IP
+show_available_ips=View available IP
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index cbcfdbeb6..a0589bace 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1350,4 +1350,6 @@ ip_info=IP\u5730\u5740\u4FE1\u606F
 original_dest_ip=\u539F\u59CB\u76EE\u7684\u5730\u5740
 original_dest_port=\u539F\u59CB\u76EE\u7684\u7AEF\u53E3
 translated_dest_ip=\u7FFB\u8BD1\u540E\u76EE\u7684\u5730\u5740
-translated_dest_port=\u7FFB\u8BD1\u540E\u76EE\u7684\u7AEF\u53E3
\ No newline at end of file
+translated_dest_port=\u7FFB\u8BD1\u540E\u76EE\u7684\u7AEF\u53E3
+show_ips=\u67E5\u770B\u6240\u6709IP
+show_available_ips=\u67E5\u770B\u53EF\u7528IP
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
index 6fddec6bc..8f3ac2612 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
@@ -413,8 +413,8 @@
 									<td><input type="checkbox" class="i-checks" serviceId="${cfg.serviceId}" id="${cfg.cfgId}" value="${cfg.isAudit}" addressPoolId="${cfg.cfgId }" ></td>
 									<td>${cfg.cfgId }</td>
 									<td>
-										<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"
-											data-original-title="${cfg.addrPoolName}" class="tooltips addrPool" data-flag="false" data-html="true" data-placement="top">
+										<a href="javascript:;" data-original-title="${cfg.addrPoolName}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											${fns:abbr(cfg.addrPoolName,20)}
 										</a>
 									</td>
@@ -452,7 +452,8 @@
 									<td>
 										<!-- <a href="#">新增IP</a>
 										<a href="#">删除IP</a> -->
-										<a href="javascript:;" onclick="getAllIpInfo(this)" addrPoolId="${cfg.cfgId }"><spring:message code="show_detail"/></a>
+										<a href="javascript:;" onclick="getInfo(this)" addrPoolId="${cfg.cfgId }"><spring:message code="show_available_ips"/></a>&nbsp;
+										<a href="javascript:;" onclick="getAllIpInfo(this)" addrPoolId="${cfg.cfgId }"><spring:message code="show_ips"/></a>
 									</td>
 									<td>${cfg.requestName }</td>
 									<td>