Merge pull request #2023 from jaapmarcus/fix/additional_ftp_accounts

Fix #2021 Checkbox of Additional FTP accounts didn't work
+ Fixed overlay UI issues

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [Development]
+
+### Bugfixes
+
+- Fix UI issues after upgrade jQuery + jQuery UI to last version (#2021 and #2032)
+
 ## [1.4.9] - Service release 
 
 ### Bugfixes

web/css/src/dependencies/jquery-ui.custom.css

@@ -7,6 +7,7 @@
 	left: 0;
 	padding: .2em;
 	outline: 0;
+	z-index: 1000 !important;
 }
 .ui-dialog .ui-dialog-titlebar {
 	padding: .4em 1em;
@@ -136,4 +137,14 @@
 
 .ui-tabs-panel{
 	clear:both !important;
-}
+}
+
+.ui-widget-overlay {
+	 background-color: rgba(0,0,0,0.9);
+	 height: 100%;
+	 width:100%;
+	 z-index: 999 !important;
+	 position: absolute;
+	 top:0px;
+	 left:0px;
+ }

web/js/pages/edit_web.js

@@ -143,12 +143,12 @@ App.Actions.WEB.remove_ftp_user = function(elm) {
     
     if ($('.ftptable-nrm:visible').length == 0) {
         $('.add-new-ftp-user-button').hide();
-        $('input[name="v_ftp"]').attr('checked', false);
+        $('input[name="v_ftp"]').prop('checked', false);
     }
 }
 
 App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
-    if ($(elm).attr('checked')) {
+    if ($(elm).prop('checked')) {
         $('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').show();
         $('.ftptable-nrm').each(function(i, elm) {
             var login = $(elm).find('.v-ftp-user');
@@ -177,7 +177,8 @@ App.Actions.WEB.toggle_ssl = function (elm){
 }
 
 App.Actions.WEB.toggle_letsencrypt = function(elm) {
-    if ($(elm).attr('checked')) {
+    if ($(elm).prop('checked')) {
+        $('#ssl-details').hide();
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
         $('#generate-csr').hide();
 	if(!$('.lets-encrypt-note').hasClass('enabled')){
@@ -187,6 +188,7 @@ App.Actions.WEB.toggle_letsencrypt = function(elm) {
     else {
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
         $('#generate-csr').show();
+        $('#ssl-details').show();
 	$('.lets-encrypt-note').hide();
     }
 }

web/templates/pages/edit_web.html

@@ -224,7 +224,7 @@
 								<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
 									<tr>
 										<td class="input-label vst-text">
-											<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="elementHideShow('ssl-details');App.Actions.WEB.toggle_letsencrypt(this)"><?=_('Lets Encrypt Support');?></label>
+											<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="elementHideShow('letsinfo');App.Actions.WEB.toggle_letsencrypt(this)"><?=_('Lets Encrypt Support');?></label>
 										</td>
 									</tr>
 									<tr>
@@ -350,6 +350,9 @@
 															<?=$v_ssl_issuer?>
 														</td>
 													</tr>
+													<tr id="letsinfo" style="display:<?php if ($v_letsencrypt == 'yes' || $v_letencrypt == 'on' ) { echo 'block';} else {echo 'none';} ?>">
+														<td><a href="#" onclick="elementHideShow('ssl-details'); return false;" class="generate"><?=_('Show Certifcate');?></a></td>
+													</tr>
 												</table>
 											</td>
 										</tr>