Skip to content

Commit 31b55f3

Browse files
naumov-socolovnaumov-socolov
committed
WEB/WEB. Improved Lets Encrypt stats auth layouts
1 parent 1124700 commit 31b55f3

File tree

4 files changed

+52
-26
lines changed

4 files changed

+52
-26
lines changed

‎web/js/pages/add_web.js‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
154154
App.Actions.WEB.toggle_letsencrypt = function(elm) {
155155
if ($(elm).attr('checked')) {
156156
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
157-
$('input[name=v_ssl]').prop('checked', true);
158-
$('#ssltable').show();
157+
// $('input[name=v_ssl]').prop('checked', true);
158+
// $('#ssltable').show();
159159
$('#generate-csr').hide();
160160
}
161161
else {
162162
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
163-
$('input[name=v_ssl]').prop('checked', false);
164-
$('#ssltable').hide();
163+
// $('input[name=v_ssl]').prop('checked', false);
164+
// $('#ssltable').hide();
165165
$('#generate-csr').show();
166166
}
167167
}
@@ -179,6 +179,16 @@ $(function() {
179179
document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
180180
});
181181
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
182+
183+
$('select[name="v_stats"]').change(function(evt){
184+
var select = $(evt.target);
185+
186+
if(select.val() == 'none'){
187+
$('.stats-auth').hide();
188+
} else {
189+
$('.stats-auth').show();
190+
}
191+
});
182192
});
183193

184194
function WEBrandom() {

‎web/js/pages/edit_web.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
135135
App.Actions.WEB.toggle_letsencrypt = function(elm) {
136136
if ($(elm).attr('checked')) {
137137
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
138-
$('input[name=v_ssl]').prop('checked', true);
139-
$('#ssltable').show();
138+
//$('input[name=v_ssl]').prop('checked', true);
139+
//$('#ssltable').show();
140140
$('#generate-csr').hide();
141141
}
142142
else {
143143
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
144-
$('input[name=v_ssl]').prop('checked', false);
145-
$('#ssltable').hide();
144+
//$('input[name=v_ssl]').prop('checked', false);
145+
//$('#ssltable').hide();
146146
$('#generate-csr').show();
147147
}
148148
}
@@ -180,7 +180,17 @@ $(function() {
180180
var elm = $(evt.target);
181181
App.Actions.WEB.passwordChanged(elm);
182182
});
183-
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
183+
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'));
184+
185+
$('select[name="v_stats"]').change(function(evt){
186+
var select = $(evt.target);
187+
188+
if(select.val() == 'none'){
189+
$('.stats-auth').hide();
190+
} else {
191+
$('.stats-auth').show();
192+
}
193+
});
184194
});
185195

186196
function WEBrandom() {

‎web/templates/admin/add_web.html‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,18 @@
123123
<?php echo ""; }?>
124124
<tr>
125125
<td class="step-top vst-text">
126-
<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> /
127-
<a class="generate" id="generate-csr" target="_blank" href="/generate/ssl/"><?php print __('Generate CSR') ?></a>
126+
<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>
128127
</td>
129128
</tr>
130129
<tr>
131130
<td>
132131
<table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
133-
<tr>
132+
<tr>
133+
<td class="step-left input-label vst-text">
134+
<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>
135+
</td>
136+
</tr>
137+
<tr>
134138
<td class="vst-text input-label step-left">
135139
<?php print __('SSL Home Directory');?>
136140
</td>
@@ -149,7 +153,9 @@
149153
</tr>
150154
<tr>
151155
<td class="vst-text input-label step-left">
152-
<?php print __('SSL Certificate');?>
156+
<?php print __('SSL Certificate');?>
157+
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
158+
153159
</td>
154160
</tr>
155161
<tr>
@@ -180,11 +186,6 @@
180186
</table>
181187
</td>
182188
</tr>
183-
<tr>
184-
<td class="step-top vst-text">
185-
<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>
186-
</td>
187-
</tr>
188189
<tr>
189190
<td class="vst-text step-top">
190191
<?php print __('Web Statistics');?>
@@ -207,8 +208,8 @@
207208
</select>
208209
</td>
209210
</tr>
210-
<tr>
211-
<td class="vst-text input-label">
211+
<tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
212+
<td class="step-left vst-text input-label">
212213
<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>
213214
</td>
214215
</tr>

‎web/templates/admin/edit_web.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,18 @@
180180
<?php echo ""; }?>
181181
<tr>
182182
<td class="vst-text step-top">
183-
<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> /
184-
<a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a>
183+
<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>
185184
</td>
186185
</tr>
187186
<tr>
188187
<td class="step-left">
189188
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
190-
<tr>
189+
<tr>
190+
<td class="input-label vst-text">
191+
<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>
192+
</td>
193+
</tr>
194+
<tr>
191195
<td class="vst-text input-label">
192196
<?php print __('SSL Home Directory');?>
193197
</td>
@@ -208,6 +212,7 @@
208212
<tr>
209213
<td class="vst-text input-label">
210214
<?php print __('SSL Certificate');?>
215+
<span id="generate-csr"> / <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a></span>
211216
</td>
212217
</tr>
213218
<tr>
@@ -327,12 +332,12 @@
327332
</select>
328333
</td>
329334
</tr>
330-
<tr>
331-
<td class="vst-text input-label">
335+
<tr class="stats-auth" style="<? if ($v_stats == 'none') { ?>display:none"<? } ?>>
336+
<td class="vst-text input-label step-left">
332337
<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>
333338
</td>
334339
</tr>
335-
<tr>
340+
<tr class="stats-auth">
336341
<td class="step-left">
337342
<table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
338343
<tr>

0 commit comments

Comments
 (0)