ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-3' into 'dev' 

Fixes for multimon.ejs, lang vars, move/labels

See merge request Shinobi-Systems/Shinobi!101
pushover
Moe 2019-08-28 15:02:37 +00:00
parent d117ba00f9 deaa788d04
commit ee3d1d21b3
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
languages/en_CA.json
View File

@ -957,5 +957,7 @@
"Alert Sound Delay":"Alert Sound Delay",
"powerVideoEventLimit":"You have set a high event limit. Are you sure you want to make this request?",
"There are no monitors that you can view with this account.":"There are no monitors that you can view with this account.",
"Delete Monitors and Files": "Delete Monitors and Files",
"Select atleast one monitor to delete": "Select atleast one monitor to delete.",
"Use Built-In":"Use Built-In"
}

14
web/libs/js/dash2.multimon.js
View File

@ -17,7 +17,7 @@ $.multimon.e.find('.import_config').click(function(){
var e={};e.e=$(this);e.mid=e.e.parents('[mid]').attr('mid');
$.confirm.e.modal('show');
$.confirm.title.text(lang['Import Monitor Configuration'])
e.html=lang.ImportMultiMonitorConfigurationText+'<div style="margin-top:15px"><div class="form-group"><textarea placeholder="'+lang['Paste JSON here.']+'" class="form-control"></textarea></div><label class="upload_file btn btn-primary btn-block"> Upload File <input class="upload" type=file name="files[]"></label></div>';
e.html=lang.ImportMultiMonitorConfigurationText+'<div style="margin-top:15px"><div class="form-group"><textarea placeholder="'+lang['Paste JSON here.']+'" class="form-control"></textarea></div><label class="upload_file btn btn-primary btn-block">'+lang['Upload File']+'<input class="upload" type=file name="files[]"></label></div>';
$.confirm.body.html(e.html)
$.confirm.e.find('.upload').change(function(e){
var files = e.target.files; // FileList object
@ -28,7 +28,7 @@ $.multimon.e.find('.import_config').click(function(){
}
reader.readAsText(f);
});
$.confirm.click({title:'Import',class:'btn-primary'},function(){
$.confirm.click({title:lang['Import'],class:'btn-primary'},function(){
// setTimeout(function(){
// $.confirm.e.modal('show');
// },1000)
@ -116,7 +116,7 @@ $.multimon.getSelectedMonitors = function(unclean){
$.multimon.e.find('.delete').click(function(){
var arr=$.multimon.getSelectedMonitors(true);
if(arr.length===0){
$.ccio.init('note',{title:'No Monitors Selected',text:'Select atleast one monitor to delete.',type:'error'});
$.ccio.init('note',{title:lang['No Monitors Selected'],text:lang['Select atleast one monitor to delete'],type:'error'});
return
}
$.confirm.e.modal('show');
@ -125,7 +125,7 @@ $.multimon.e.find('.delete').click(function(){
$.confirm.body.html(e.html)
$.confirm.click([
{
title:'Delete Monitors',
title:lang['Delete']+' '+lang['Monitors'],
class:'btn-danger',
callback:function(){
$.each(arr,function(n,v){
@ -136,7 +136,7 @@ $.multimon.e.find('.delete').click(function(){
}
},
{
title:'Delete Monitors and Files',
title:lang['Delete Monitors and Files'],
class:'btn-danger',
callback:function(){
$.each(arr,function(n,v){
@ -152,7 +152,7 @@ $.multimon.e.find('.delete').click(function(){
// var arr=$.multimon.getSelectedMonitors();
// var arrObject={}
// if(arr.length===0){
// $.ccio.init('note',{title:'No Monitors Selected',text:'Select atleast one monitor to delete.',type:'error'});
// $.ccio.init('note',{title:lang['No Monitors Selected'],text:lang['Select atleast one monitor to delete'],type:'error'});
// return
// }
// $.multimonedit.selectedList = arr;
@ -162,7 +162,7 @@ $.multimon.e.find('.save_config').click(function(){
var e={};e.e=$(this);
var arr=$.multimon.getSelectedMonitors();
if(arr.length===0){
$.ccio.init('note',{title:'No Monitors Selected',text:'Select atleast one monitor to delete.',type:'error'});
$.ccio.init('note',{title:lang['No Monitors Selected'],text:lang['Select atleast one monitor to delete'],type:'error'});
return
}
e.dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(arr));

6
web/pages/blocks/multimon.ejs
View File

@ -13,10 +13,10 @@
<thead>
<tr>
<th><div class="checkbox"><input id="multimon_select_all" type="checkbox"><label for="multimon_select_all"></label></div></th>
<th>&nbsp;</th>
<th><%-lang['Name']%></th>
<th><%-lang['Mode']%></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
<th><%-lang['Stream']%></th>
<th>&nbsp;</th>
</tr>
</thead>
@ -25,7 +25,7 @@
</table>
</form>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-default pull-left" data-dismiss="modal"><%-lang.Close%></button>
<div>
<a class="btn btn-danger delete"><%-lang['Delete']%></a>
<a class="btn btn-primary save_config"><%-lang['Export']%></a>