github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-16 10:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

WEB/WEB. Improved Lets Encrypt stats auth layouts

Browse source
This commit is contained in:
Dmitry Naumov-Socolov 2016-10-18 17:54:02 -04:00
parent 11247009d4
commit 31b55f31cc
4 changed files with 52 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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) { App.Actions.WEB.toggle_letsencrypt = function(elm) {
if ($(elm).attr('checked')) { 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'); $('#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); // $('input[name=v_ssl]').prop('checked', true);
$('#ssltable').show(); // $('#ssltable').show();
$('#generate-csr').hide(); $('#generate-csr').hide();
} }
else { else {
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled'); $('#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); // $('input[name=v_ssl]').prop('checked', false);
$('#ssltable').hide(); // $('#ssltable').hide();
$('#generate-csr').show(); $('#generate-csr').show();
} }
} }
@ -179,6 +179,16 @@ $(function() {
document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value; document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
}); });
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]')) 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() { function WEBrandom() {

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

@ -135,14 +135,14 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
App.Actions.WEB.toggle_letsencrypt = function(elm) { App.Actions.WEB.toggle_letsencrypt = function(elm) {
if ($(elm).attr('checked')) { 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'); $('#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); //$('input[name=v_ssl]').prop('checked', true);
$('#ssltable').show(); //$('#ssltable').show();
$('#generate-csr').hide(); $('#generate-csr').hide();
} }
else { else {
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled'); $('#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); //$('input[name=v_ssl]').prop('checked', false);
$('#ssltable').hide(); //$('#ssltable').hide();
$('#generate-csr').show(); $('#generate-csr').show();
} }
} }
@ -180,7 +180,17 @@ $(function() {
var elm = $(evt.target); var elm = $(evt.target);
App.Actions.WEB.passwordChanged(elm); App.Actions.WEB.passwordChanged(elm);
}); });
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]')) 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() { function WEBrandom() {

23
web/templates/admin/add_web.html
View file

@ -123,14 +123,18 @@
<?php echo ""; }?> <?php echo ""; }?>
<tr> <tr>
<td class="step-top vst-text"> <td class="step-top vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> / <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label>
<a class="generate" id="generate-csr" target="_blank" href="/generate/ssl/"><?php print __('Generate CSR') ?></a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable"> <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
<tr> <tr>
<td class="step-left input-label vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr>
<td class="vst-text input-label step-left"> <td class="vst-text input-label step-left">
<?php print __('SSL Home Directory');?> <?php print __('SSL Home Directory');?>
</td> </td>
@ -149,7 +153,9 @@
</tr> </tr>
<tr> <tr>
<td class="vst-text input-label step-left"> <td class="vst-text input-label step-left">
<?php print __('SSL Certificate');?> <?php print __('SSL Certificate');?>
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -180,11 +186,6 @@
</table> </table>
</td> </td>
</tr> </tr>
<tr>
<td class="step-top vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letsencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr> <tr>
<td class="vst-text step-top"> <td class="vst-text step-top">
<?php print __('Web Statistics');?> <?php print __('Web Statistics');?>
@ -207,8 +208,8 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
<td class="vst-text input-label"> <td class="step-left vst-text input-label">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"> <?php print __('Statistics Authorization');?></label> <label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"> <?php print __('Statistics Authorization');?></label>
</td> </td>
</tr> </tr>

17
web/templates/admin/edit_web.html
View file

@ -180,14 +180,18 @@
<?php echo ""; }?> <?php echo ""; }?>
<tr> <tr>
<td class="vst-text step-top"> <td class="vst-text step-top">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> / <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label>
<a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="step-left"> <td class="step-left">
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable"> <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
<tr> <tr>
<td class="input-label vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" <?php if($v_letencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="App.Actions.WEB.toggle_letsencrypt(this)"> <?php print __('Lets Encrypt Support');?></label>
</td>
</tr>
<tr>
<td class="vst-text input-label"> <td class="vst-text input-label">
<?php print __('SSL Home Directory');?> <?php print __('SSL Home Directory');?>
</td> </td>
@ -208,6 +212,7 @@
<tr> <tr>
<td class="vst-text input-label"> <td class="vst-text input-label">
<?php print __('SSL Certificate');?> <?php print __('SSL Certificate');?>
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -327,12 +332,12 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
<td class="vst-text input-label"> <td class="vst-text input-label step-left">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"><?php print __('Statistics Authorization');?></label> <label><input type="checkbox" size="20" class="vst-checkbox" name="v_stats_auth" <?php if (!empty($v_stats_user)) echo "checked=yes" ?> onclick="javascript:elementHideShow('statstable');"><?php print __('Statistics Authorization');?></label>
</td> </td>
</tr> </tr>
<tr> <tr class="stats-auth">
<td class="step-left"> <td class="step-left">
<table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user"> <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
<tr> <tr>