github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 02:28:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/800

Browse source 
Conflicts:
	web/js/pages/edit_web.js
This commit is contained in:
Derrick Hammer 2016-10-18 18:30:45 -04:00
commit 1b287ff73e
49 changed files with 830 additions and 620 deletions
Download patch file Download diff file Expand all files Collapse all files

92
web/js/file_manager.js
View file

@ -1525,25 +1525,8 @@ FM.confirmChmod = function() {
var src = selected.find('.source').val();
src = $.parseJSON(src);
var ro = $('input[name="read-by-owner"]').is(':checked') ? 4 : 0;
var wo = $('input[name="write-by-owner"]').is(':checked') ? 2 : 0;
var eo = $('input[name="execute-by-owner"]').is(':checked') ? 1 : 0;
var rg = $('input[name="read-by-group"]').is(':checked') ? 4 : 0;
var wg = $('input[name="write-by-group"]').is(':checked') ? 2 : 0;
var eg = $('input[name="execute-by-group"]').is(':checked') ? 1 : 0;
var re = $('input[name="read-by-others"]').is(':checked') ? 4 : 0;
var we = $('input[name="write-by-others"]').is(':checked') ? 2 : 0;
var ee = $('input[name="execute-by-others"]').is(':checked') ? 1 : 0;
var o = ro+wo+eo;
var g = rg+wg+eg;
var e = re+we+ee;
var permissions = o + "" + g + "" + e + "";
var action = FM.isItemFile(src) ? 'chmod_item' : 'chmod_item';
var permissions = $('.chmod input.chmod-mask').val();
var action = 'chmod_item';
var params = {
dir: FM['TAB_' + tab + '_CURRENT_PATH'] + '/',
@ -1583,24 +1566,7 @@ FM.confirmBulkChmod = function() {
}
});
var ro = $('input[name="read-by-owner"]').is(':checked') ? 4 : 0;
var wo = $('input[name="write-by-owner"]').is(':checked') ? 2 : 0;
var eo = $('input[name="execute-by-owner"]').is(':checked') ? 1 : 0;
var rg = $('input[name="read-by-group"]').is(':checked') ? 4 : 0;
var wg = $('input[name="write-by-group"]').is(':checked') ? 2 : 0;
var eg = $('input[name="execute-by-group"]').is(':checked') ? 1 : 0;
var re = $('input[name="read-by-others"]').is(':checked') ? 4 : 0;
var we = $('input[name="write-by-others"]').is(':checked') ? 2 : 0;
var ee = $('input[name="execute-by-others"]').is(':checked') ? 1 : 0;
var o = ro+wo+eo;
var g = rg+wg+eg;
var e = re+we+ee;
var permissions = o + "" + g + "" + e + "";
var permissions = $('.chmod input.chmod-mask').val();
var action = 'chmod_item';
var tab = FM.getTabLetter(FM.CURRENT_TAB);
@ -1693,6 +1659,29 @@ FM.chmodItems = function() {
tpl.set(':EXECUTE_BY_OTHERS', mode[2] & 1 ? "checked" : "");
FM.popupOpen(tpl.finalize());
$('.chmod input.chmod-mask').val(mode);
$('.chmod input[type=checkbox]').click(function(){
var ro = $('input[name="read-by-owner"]').is(':checked') ? 4 : 0;
var wo = $('input[name="write-by-owner"]').is(':checked') ? 2 : 0;
var eo = $('input[name="execute-by-owner"]').is(':checked') ? 1 : 0;
var rg = $('input[name="read-by-group"]').is(':checked') ? 4 : 0;
var wg = $('input[name="write-by-group"]').is(':checked') ? 2 : 0;
var eg = $('input[name="execute-by-group"]').is(':checked') ? 1 : 0;
var re = $('input[name="read-by-others"]').is(':checked') ? 4 : 0;
var we = $('input[name="write-by-others"]').is(':checked') ? 2 : 0;
var ee = $('input[name="execute-by-others"]').is(':checked') ? 1 : 0;
var o = ro+wo+eo;
var g = rg+wg+eg;
var e = re+we+ee;
var permissions = o + "" + g + "" + e + "";
$('.chmod input.chmod-mask').val(permissions);
});
}
FM.bulkChmod = function() {
@ -1728,6 +1717,28 @@ FM.bulkChmod = function() {
//popup_bulk_copy
FM.popupOpen(tpl.finalize());
$('.chmod input[type=checkbox]').click(function(){
var ro = $('input[name="read-by-owner"]').is(':checked') ? 4 : 0;
var wo = $('input[name="write-by-owner"]').is(':checked') ? 2 : 0;
var eo = $('input[name="execute-by-owner"]').is(':checked') ? 1 : 0;
var rg = $('input[name="read-by-group"]').is(':checked') ? 4 : 0;
var wg = $('input[name="write-by-group"]').is(':checked') ? 2 : 0;
var eg = $('input[name="execute-by-group"]').is(':checked') ? 1 : 0;
var re = $('input[name="read-by-others"]').is(':checked') ? 4 : 0;
var we = $('input[name="write-by-others"]').is(':checked') ? 2 : 0;
var ee = $('input[name="execute-by-others"]').is(':checked') ? 1 : 0;
var o = ro+wo+eo;
var g = rg+wg+eg;
var e = re+we+ee;
var permissions = o + "" + g + "" + e + "";
$('.chmod input.chmod-mask').val(permissions);
});
}
}
@ -2448,10 +2459,10 @@ $(document).ready(function() {
}
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var elm = $(FM.CURRENT_TAB).find('.dir:eq('+FM['CURRENT_'+tab+'_LINE']+')');
if (elm.length == 1) {
var src = $.parseJSON($(elm).find('.source').val());
if (src.type == 'd') {
FM.open(src.full_path, FM.CURRENT_TAB);
}
@ -2647,6 +2658,9 @@ $(document).ready(function() {
$('.shortcuts').hide();
});
});
/*$(document).bind('keydown.tab', function() {

62
web/js/pages/add_mail_acc.js
View file

@ -24,7 +24,6 @@ App.Actions.MAIL_ACC.disable_unlimited = function(elm, source_elm) {
$(source_elm).css('opacity', '0.5');
}
//
App.Actions.MAIL_ACC.toggle_unlimited_feature = function(evt) {
var elm = $(evt.target);
var ref = elm.prev('.vst-input');
@ -93,33 +92,6 @@ randomString = function() {
$('#v_password').text(Array(randomstring.length+1).join('*'));
}
use_hostname = function(domain) {
$('#td_imap_hostname').html(domain);
$('#td_smtp_hostname').html(domain);
}
use_starttls = function() {
$('#td_imap_port').html('143');
$('#td_imap_encryption').html('STARTTLS');
$('#td_smtp_port').html('587');
$('#td_smtp_encryption').html('STARTTLS');
}
use_ssl = function() {
$('#td_imap_port').html('993');
$('#td_imap_encryption').html('SSL');
$('#td_smtp_port').html('465');
$('#td_smtp_encryption').html('SSL');
}
use_no_encryption = function(domain, no_encryption) {
use_hostname(domain);
$('#td_imap_port').html('143');
$('#td_imap_encryption').html(no_encryption);
$('#td_smtp_port').html('25');
$('#td_smtp_encryption').html(no_encryption);
}
$(document).ready(function() {
$('#v_account').text($('input[name=v_account]').val());
$('#v_password').text($('input[name=v_password]').val());
@ -140,5 +112,37 @@ $(document).ready(function() {
$('#v_password').text($('input[name=v_password]').val());
else
$('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
});
});
$('#mail_configuration').change(function(evt){
var opt = $(evt.target).find('option:selected');
switch(opt.attr('v_type')){
case 'hostname':
$('#td_imap_hostname').html(opt.attr('domain'));
$('#td_smtp_hostname').html(opt.attr('domain'));
break;
case 'starttls':
$('#td_imap_port').html('143');
$('#td_imap_encryption').html('STARTTLS');
$('#td_smtp_port').html('587');
$('#td_smtp_encryption').html('STARTTLS');
break;
case 'ssl':
$('#td_imap_port').html('993');
$('#td_imap_encryption').html('SSL');
$('#td_smtp_port').html('465');
$('#td_smtp_encryption').html('SSL');
break;
case 'no_encription':
$('#td_imap_hostname').html(opt.attr('domain'));
$('#td_smtp_hostname').html(opt.attr('domain'));
$('#td_imap_port').html('143');
$('#td_imap_encryption').html(opt.attr('no_encription'));
$('#td_smtp_port').html('25');
$('#td_smtp_encryption').html(opt.attr('no_encription'));
break;
}
});
});

18
web/js/pages/add_web.js
View file

@ -154,14 +154,14 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
App.Actions.WEB.toggle_letsencrypt = function(elm) {
if ($(elm).attr('checked')) {
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
$('input[name=v_ssl]').prop('checked', true);
$('#ssltable').show();
// $('input[name=v_ssl]').prop('checked', true);
// $('#ssltable').show();
$('#generate-csr').hide();
}
else {
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
$('input[name=v_ssl]').prop('checked', false);
$('#ssltable').hide();
// $('input[name=v_ssl]').prop('checked', false);
// $('#ssltable').hide();
$('#generate-csr').show();
}
}
@ -179,6 +179,16 @@ $(function() {
document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
});
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
$('select[name="v_stats"]').change(function(evt){
var select = $(evt.target);
if(select.val() == 'none'){
$('.stats-auth').hide();
} else {
$('.stats-auth').show();
}
});
});
function WEBrandom() {

36
web/js/pages/edit_mail_acc.js
View file

@ -107,11 +107,43 @@ $(document).ready(function() {
else
$('#v_password').text(Array($(this).val().length+1).join('*'));
});
$('.toggle-psw-visibility-icon').click(function(){
if($('input[name=v_password]').attr('type') == 'text')
$('#v_password').text($('input[name=v_password]').val());
else
$('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
});
});
$('#mail_configuration').change(function(evt){
var opt = $(evt.target).find('option:selected');
switch(opt.attr('v_type')){
case 'hostname':
$('#td_imap_hostname').html(opt.attr('domain'));
$('#td_smtp_hostname').html(opt.attr('domain'));
break;
case 'starttls':
$('#td_imap_port').html('143');
$('#td_imap_encryption').html('STARTTLS');
$('#td_smtp_port').html('587');
$('#td_smtp_encryption').html('STARTTLS');
break;
case 'ssl':
$('#td_imap_port').html('993');
$('#td_imap_encryption').html('SSL');
$('#td_smtp_port').html('465');
$('#td_smtp_encryption').html('SSL');
break;
case 'no_encription':
$('#td_imap_hostname').html(opt.attr('domain'));
$('#td_smtp_hostname').html(opt.attr('domain'));
$('#td_imap_port').html('143');
$('#td_imap_encryption').html(opt.attr('no_encription'));
$('#td_smtp_port').html('25');
$('#td_smtp_encryption').html(opt.attr('no_encription'));
break;
}
});
});

9
web/js/pages/edit_web.js
View file

@ -183,6 +183,15 @@ $(function() {
if ($('input[name=v_letsencrypt]').attr('checked')) {
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
}
$('select[name="v_stats"]').change(function(evt){
var select = $(evt.target);
if(select.val() == 'none'){
$('.stats-auth').hide();
} else {
$('.stats-auth').show();
}
});
});
function WEBrandom() {

2
web/js/templates.js
View file

@ -143,6 +143,7 @@ App.Templates.html = {
<li><label><input type="checkbox" name="write-by-others" value="1" ~!:WRITE_BY_OTHERS~! /> '+App.Constants.FM_WRITE_BY_OTHERS+'</label></li>\
<li><label><input type="checkbox" name="execute-by-others" value="1" ~!:EXECUTE_BY_OTHERS~! /> '+App.Constants.FM_EXECUTE_BY_OTHERS+'</label></li>\
</ul>\
<input type="text" name="mask" class="chmod-mask" maxlength="3" />\
</div>\
<div class="controls">\
<p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
@ -166,6 +167,7 @@ App.Templates.html = {
<li><label><input type="checkbox" name="write-by-others" value="1" checked /> '+App.Constants.FM_WRITE_BY_OTHERS+'</label></li>\
<li><label><input type="checkbox" name="execute-by-others" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_OTHERS+'</label></li>\
</ul>\
<input type="text" name="mask" class="chmod-mask" maxlength="3" value="777" />\
</div>\
<div class="controls">\
<p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\