From 10dd90c9740f9027cf34212ec773ef2a83bd3326 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Mon, 6 Aug 2018 17:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=88=97=E5=90=8D=E3=80=81=E5=88=97=E5=AE=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties     | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp    | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp  | 4 ++--
 src/main/webapp/static/global/scripts/common.js       | 1 -
 src/main/webapp/static/pages/scripts/pageLogs.js      | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index da2678ad8..38ab64b37 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -669,7 +669,7 @@ val_direction=Direction should be 0(bidirectional) or 1(unidirectional)
 
 #===========log begin=============
 log=Log
-cfg_id=Configuration Id
+cfg_id=Config Id
 found_time=Found Time
 recv_time=Receive Time
 protocol_type=Protocol
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 66bb7ca2e..b890e0d6a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -64,7 +64,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="begin_date"/></span>
 											</div>
-											<input id="beginDate" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="startTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
@@ -73,7 +73,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="end_date"/></span>
 											</div>
-											<input id="beginDate" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="endTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index 0c9bf33a7..2a2fa778f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -31,7 +31,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-		MAIL
+		<spring:message code="mail_control"/>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 0aff593b9..4b2fde596 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -64,7 +64,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="begin_date"/></span>
 											</div>
-											<input id="beginDate" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="startTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
@@ -73,7 +73,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="end_date"/></span>
 											</div>
-											<input id="beginDate" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="endTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index f968cb3eb..ff8fae1b0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -73,7 +73,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="begin_date"/></span>
 											</div>
-											<input id="beginDate" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="startTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
@@ -82,7 +82,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="end_date"/></span>
 											</div>
-											<input id="beginDate" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="endTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index f8278b611..88107c572 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -393,7 +393,6 @@ window.onload=function(){
 	var igHeight = $("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").height();
 	$("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").bind("DOMNodeInserted",function(e) {
 		var newIgHeight = $("#searchForm").find(".col-md-12").eq(0).height();
-		alert(newIgHeight)
 		$("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").find(".input-group-btn").css("padding-bottom", (newIgHeight-igHeight)+"px");
 	});
 	
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index 277519ccb..9a173ab32 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -9,7 +9,7 @@ $(document).ready(function() {
 		var finalStyle = this.currentStyle ? this.currentStyle : document.defaultView.getComputedStyle(this , null);
 		var fontSize = (finalStyle.fontSize).replace("px","");
 			
-		var px = getPixelsCount($(this).text(),fontSize)+55;
+		var px = getPixelsCount($(this).text(),fontSize)+32;
 		this.setAttribute('width',px+'px');
 	});
 })