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 @@
- @@ -73,7 +73,7 @@
- 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 @@

- MAIL +

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 @@
- @@ -73,7 +73,7 @@
- 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 @@
- @@ -82,7 +82,7 @@
- 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'); }); })