From 8f84b7b6e9a8940e95fe89de4f0b0ec3152f9a5c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Mon, 24 Dec 2018 22:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 3 ++-
 src/main/resources/messages/message_ru.properties    | 3 ++-
 src/main/resources/messages/message_zh_CN.properties | 3 ++-
 src/main/webapp/WEB-INF/views/home.jsp               | 2 +-
 src/main/webapp/static/global/scripts/jeesite.js     | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index a34e19c0d..abf94ac92 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1414,4 +1414,5 @@ do_blacklist=Blacklist Option
 l3_header_error=Only four attribute values are allowed to be entered at most
 IP_HEADER=IP Header
 ICMP_HEADER=ICMP Header
-offset_expression=Offset Expression
\ No newline at end of file
+offset_expression=Offset Expression
+cfg_custom=Custom Columns
\ 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 d1e8fdf07..90655e93d 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1418,4 +1418,5 @@ do_blacklist=Blacklist Option
 l3_header_error=Only four attribute values are allowed to be entered at most
 IP_HEADER=IP Header
 ICMP_HEADER=ICMP Header
-offset_expression=Offset Expression
\ No newline at end of file
+offset_expression=Offset Expression
+cfg_custom=\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u0421\u0442\u043E\u043B\u0431\u0446\u044B
\ 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 d78d81acc..e75e2c5e2 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1414,4 +1414,5 @@ do_blacklist=Blacklist Option
 l3_header_error=Only four attribute values are allowed to be entered at most
 IP_HEADER=IP Header
 ICMP_HEADER=ICMP Header
-offset_expression=Offset Expression
\ No newline at end of file
+offset_expression=Offset Expression
+cfg_custom=Custom Columns
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 8d0336c8b..2a4c6448f 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -342,7 +342,7 @@ background:#3d3d3d;
 			</div>
 			<!-- END MEGA MENU -->
 
-
+			<input type="hidden"  id="tb_custom" value="<spring:message code='cfg_custom'/>"/>
 			<!-- BEGIN TOP NAVIGATION MENU -->
 			<div class="top-menu">
 				<ul class="nav navbar-nav pull-right">
diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js
index 40dbd0118..1ae873ff2 100644
--- a/src/main/webapp/static/global/scripts/jeesite.js
+++ b/src/main/webapp/static/global/scripts/jeesite.js
@@ -397,8 +397,8 @@ function customColumnClick(){
 		html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
 	})
 	html +="</div>";
-	
-	top.$.jBox(html,{title:"<i class='fa fa-wrench'></i> Custom Columns",showIcon:false,opacity:0.3,submit:submit});
+	var  cus=$("#tb_custom",parent.document).val();
+	top.$.jBox(html,{title:"<i class='fa fa-wrench'></i>"+cus ,showIcon:false,opacity:0.3,submit:submit});
 	
 }