diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 4b28d7a58..4877442a2 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -531,7 +531,7 @@ file=File
select_file=Please Select Upload File
sample_file=Sample File
sample_sign=Sample Sign
-off=off
+off=OFF
on=on
click_detail=Please click the "view details" button to send the detailed error message to the system Management clerk. Thank you!
return_lastpage=Return to the last page
@@ -980,7 +980,7 @@ day_of_month_report=Daily Report
month_report=Monthly Report
label_report=Tag Report
attr_type_report=Attribute Report
-lwhh_report=Official Letter Report
+lwhh_report=icial Letter Report
src_ip_report=Src IP Report
dest_ip_report=Dest IP Report
isp_report=Entrance Report
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index 139ab22b2..096aed874 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -211,7 +211,11 @@ $(document).ready(function(){
-
+
+ ${fn:substring(log.ftpUrl,0,42) }
+
+ <%--
${fn:substring(log.ftpUrl,0,20) }
@@ -222,7 +226,7 @@ $(document).ready(function(){
class="tooltips" data-flag="false" data-html="true" data-placement="top">
ftp://${fn:substring(log.ftpUrl,0,20) }
-
+ --%>
|
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 75bc236f0..73b34491d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -172,7 +172,7 @@
| |
|
- URL |
+ URL |
|
|
|
@@ -226,12 +226,13 @@
-
+ ${log.url}
+ <%--
${log.url}
http://${log.url}
-
+ --%>
|
${log.reqHdrKey } |
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 3d09f9605..6c2945aaf 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -151,7 +151,7 @@
| |
|
|
- URL |
+ URL |
|
|
|
@@ -186,12 +186,13 @@
-
+ ${log.url}
+ <%--
${log.url}
http://${log.url}
-
+ --%>
|
${fns:abbr(log.capIp, 42)} |
${log.transProto } |
diff --git a/src/main/webapp/static/global/css/page.css b/src/main/webapp/static/global/css/page.css
index 51f999fca..00a6fe12b 100644
--- a/src/main/webapp/static/global/css/page.css
+++ b/src/main/webapp/static/global/css/page.css
@@ -82,4 +82,11 @@
padding:0;
margin:-3px 0 0 0;
text-align:center;
+}
+.keyword-disinline {
+ width: 1130px;
+ display: block;
+ word-break: break-all;
+ word-wrap: break-word;
+ white-space: normal;
}
\ No newline at end of file
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 3c0e70c5d..670352f50 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,5 +1,4 @@
$(function(){
-
//扩展jquery,增加全局函数
$.ipcommon=function(){
return {};
@@ -465,6 +464,9 @@ $(function(){
})
});
window.onload=function(){
+ $("span[id^=open]").click(function(){
+ $("div[class='content']").find("label:lt(2)").addClass("keyword-disinline");//page.css 关键词换行
+ })
// 配置id的搜索下拉框选择切换
if ($("#searchForm #seltype").val() == 'compileId') {
$("#searchForm #intype").addClass("number");