Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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

src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp

@@ -211,7 +211,11 @@ $(document).ready(function(){
 									</td>
 									
 									<td>
-									<c:if test="${fn:startsWith(log.ftpUrl, 'ftp')}">
+										<a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fn:substring(log.ftpUrl,0,42) }
+										</a>
+									<%-- <c:if test="${fn:startsWith(log.ftpUrl, 'ftp')}">
 										<a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											${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) }
 										</a>
-									</c:if>	
+									</c:if> --%>	
 									</td>
 									
 									<td>

src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp

@@ -172,7 +172,7 @@
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
 								
-								<th>URL</th>
+								 <th>  URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> 
 								<th><spring:message code="req_hdr_key"/></th>
 								<th><spring:message code="req_hdr_file"/></th>
 								<th><spring:message code="req_body_key"/></th>
@@ -226,12 +226,13 @@
 									</td>
 									
 									<td>
-										<c:if test="${fn:startsWith(log.url, 'http')}">
+										${log.url}
+										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
 													${log.url}
 												</c:if>
 												<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
 													http://${log.url}
-												</c:if>
+												</c:if> --%>
 									</td>
 									<td>${log.reqHdrKey }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -151,7 +151,7 @@
 								<th><spring:message code="cfg_id"/></th>
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
-								<th>URL</th>
+								<th> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code="server_ip"/></th>
@@ -186,12 +186,13 @@
 										</c:forEach>
 									</td>
 									<td>
-										<c:if test="${fn:startsWith(log.url, 'http')}">
+									${log.url}
+										<%-- <c:if test="${fn:startsWith(log.url, 'http')}">
 											${log.url}
 										</c:if>
 										<c:if test="${!fn:startsWith(log.url, 'http') and !empty log.url}">
 											http://${log.url}
-										</c:if>
+										</c:if> --%>
 									</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto }</td>

src/main/webapp/static/global/css/page.css

@@ -83,3 +83,10 @@
 	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;
+}

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");