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:
leijun
2018-09-18 18:19:14 +08:00
parent 53d83710b0 40b96346bd
commit 6ace42c208
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1154,4 +1154,10 @@ p2p_proto=P2P Protocol
p2p_file_id=File Marking
p2p_keyword=Emule Search Keyword
APP_PAYLOAD=App PayLoad Feature
APP_DNS=App Dns Feature
APP_DNS=App Dns Feature
mm_speaker_recognization_reject=Speaker Recognization Reject
mm_speaker_recognization_monit=Speaker Recognization Monitoring
mm_logo_detection_monit=Logo Detection Monitoring
mm_logo_detection_reject=Logo Detection Reject
mm_face_recognization_monit=Face Recognization Monitoring
mm_face_recognization_reject=Face Recognization Reject

12
src/main/resources/messages/message_ru.properties
View File

@@ -459,14 +459,14 @@ save_sort=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0421\u043E\u0
menu=\u041C\u0435\u043D\u044E
parent_menu=\u0420\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u0441\u043A\u043E\u0435 \u041C\u0435\u043D\u044E
aim=\u0426\u0435\u043B\u044C
click_menu_turn=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 <EFBFBD>\u041C\u0435\u043D\u044E<EFBFBD>, \u0447\u0442\u043E\u0431\u044B \u043F\u0435\u0440\u0435\u0439\u0442\u0438 \u043D\u0430 \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
click_menu_turn=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 \uFFFD\u041C\u0435\u043D\u044E\uFFFD, \u0447\u0442\u043E\u0431\u044B \u043F\u0435\u0440\u0435\u0439\u0442\u0438 \u043D\u0430 \u044D\u0442\u0443 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
link_window_info=\u041E\u0442\u043A\u0440\u044B\u0442\u043E\u0435 \u043E\u043A\u043D\u043E \u0447\u0435\u0440\u0435\u0437 URL-\u0430\u0434\u0440\u0435\u0441\u0443, \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \: mainFrame
is_top_menu=\u041C\u0435\u043D\u044E \u0412\u0435\u0440\u0445\u043D\u0435\u0433\u043E \u0423\u0440\u043E\u0432\u043D\u044F
icon=\u0418\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435
is_top_menu_info=\u042F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043B\u0438 \u044D\u0442\u043E \u043C\u0435\u043D\u044E \u0432\u0435\u0440\u0445\u043D\u0438\u043C \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u043C \u043C\u0435\u043D\u044E
sort_info=\u041F\u043E\u0440\u044F\u0434\u043E\u043A \u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0438 \u043F\u043E \u0432\u043E\u0437\u0440\u0430\u0441\u0442\u0430\u043D\u0438\u044E.
is_show_sysmenu=\u041E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044F \u043B\u0438 \u044D\u0442\u043E \u043C\u0435\u043D\u044E \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u043C \u043C\u0435\u043D\u044E
control_permission_info=\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043F\u043E\u043B\u043D\u043E\u043C\u043E\u0447\u0438\u044F, \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0432 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0435\u0440\u0435, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: @RequiresPermissions (<EFBFBD>\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u044F<EFBFBD>)
control_permission_info=\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043F\u043E\u043B\u043D\u043E\u043C\u043E\u0447\u0438\u044F, \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u0432 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u043B\u0435\u0440\u0435, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: @RequiresPermissions (\uFFFD\u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u044F \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u044F\uFFFD)
role_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0420\u043E\u043B\u044F
data_range=\u0414\u0438\u0430\u043F\u043E\u0437\u043E\u043D \u0414\u0430\u043D\u043D\u044B\u0445
allot=\u0420\u0430\u0437\u0434\u0430\u0432\u0430\u0442\u044C
@@ -1158,4 +1158,10 @@ p2p_proto=P2P Protocol
p2p_file_id=File Marking
p2p_keyword=Emule Search Keyword
APP_PAYLOAD=App PayLoad Feature
APP_DNS=App Dns Feature
APP_DNS=App Dns Feature
mm_speaker_recognization_reject=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u963B\u65AD
mm_speaker_recognization_monit=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u76D1\u6D4B
mm_logo_detection_monit=\u53F0\u6807\u8BC6\u522B\u76D1\u6D4B
mm_logo_detection_reject=\u53F0\u6807\u8BC6\u522B\u963B\u65AD
mm_face_recognization_monit=\u4EBA\u8138\u8BC6\u522B\u76D1\u6D4B
mm_face_recognization_reject=\u4EBA\u8138\u8BC6\u522B\u963B\u65AD

8
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1152,4 +1152,10 @@ p2p_proto=P2P\u534F\u8BAE
p2p_file_id=\u6587\u4EF6\u6807\u8BC6
p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD
APP_PAYLOAD=APP\u8F7D\u8377\u7279
APP_DNS=APP DNS
APP_DNS=APP DNS
mm_speaker_recognization_reject=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u963B\u65AD
mm_speaker_recognization_monit=\u8BF4\u8BDD\u4EBA\u8BC6\u522B\u76D1\u6D4B
mm_logo_detection_monit=\u53F0\u6807\u8BC6\u522B\u76D1\u6D4B
mm_logo_detection_reject=\u53F0\u6807\u8BC6\u522B\u963B\u65AD
mm_face_recognization_monit=\u4EBA\u8138\u8BC6\u522B\u76D1\u6D4B
mm_face_recognization_reject=\u4EBA\u8138\u8BC6\u522B\u963B\u65AD

8
src/main/webapp/static/global/scripts/jeesite.js
View File

@@ -383,9 +383,9 @@ function customColumnClick(){
return true;
}
}
if($(this).hasClass("cfgDesc")){
/*if($(this).hasClass("cfgDesc")){
return true;
}
}*/
var checked = ($(this).is(":visible") ? "checked='checked'":"");
var ckbox_html = "<input type='checkbox' "+checked+" value='"+colIndex+"'/>";
html+="<div class='col-md-6'><label>"+ckbox_html+" "+$(this).html()+"</label></div>";
@@ -410,9 +410,7 @@ function customColumnInit() {
//选中则显示
showColumn(indexCol);
}else {
if($(".table tr th[class='cfgDesc']").index()!=indexCol){
hideColumn(indexCol);
}
hideColumn(indexCol);
}
})
}else {