gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
duandongmei
2018-08-07 10:13:35 +08:00
parent 0f4793cbfc 10dd90c974
commit 13cfb88fdd
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/messages/message_en.properties
View File

@@ -669,7 +669,7 @@ val_direction=Direction should be 0(bidirectional) or 1(unidirectional)
#===========log begin============= #===========log begin=============
log=Log log=Log
cfg_id=Configuration Id cfg_id=Config Id
found_time=Found Time found_time=Found Time
recv_time=Receive Time recv_time=Receive Time
protocol_type=Protocol protocol_type=Protocol

4
src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
View File

@@ -64,7 +64,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="begin_date"/></span> <span class="selectpicker form-control"><spring:message code="begin_date"/></span>
</div> </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});"/> value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div> </div>
</div> </div>
@@ -73,7 +73,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="end_date"/></span> <span class="selectpicker form-control"><spring:message code="end_date"/></span>
</div> </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});"/> value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div> </div>
</div> </div>

2
src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
View File

@@ -31,7 +31,7 @@
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
MAIL <spring:message code="mail_control"/>
<small><spring:message code="date_list"/></small> <small><spring:message code="date_list"/></small>
</h3> </h3>
<h5 class="page-header"></h5> <h5 class="page-header"></h5>

4
src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
View File

@@ -64,7 +64,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="begin_date"/></span> <span class="selectpicker form-control"><spring:message code="begin_date"/></span>
</div> </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});"/> value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div> </div>
</div> </div>
@@ -73,7 +73,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="end_date"/></span> <span class="selectpicker form-control"><spring:message code="end_date"/></span>
</div> </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});"/> value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div> </div>
</div> </div>

4
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -73,7 +73,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="begin_date"/></span> <span class="selectpicker form-control"><spring:message code="begin_date"/></span>
</div> </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});"/> value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div> </div>
</div> </div>
@@ -82,7 +82,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control"><spring:message code="end_date"/></span> <span class="selectpicker form-control"><spring:message code="end_date"/></span>
</div> </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});"/> value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
</div> </div>
</div> </div>

2
src/main/webapp/static/pages/scripts/pageLogs.js
View File

@@ -9,7 +9,7 @@ $(document).ready(function() {
var finalStyle = this.currentStyle ? this.currentStyle : document.defaultView.getComputedStyle(this , null); var finalStyle = this.currentStyle ? this.currentStyle : document.defaultView.getComputedStyle(this , null);
var fontSize = (finalStyle.fontSize).replace("px",""); 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'); this.setAttribute('width',px+'px');
}); });
}) })