From 65fc415b9a4715bc411548e782235b8c788a2c18 Mon Sep 17 00:00:00 2001 From: thom Date: Mon, 15 Jun 2020 20:37:24 +0200 Subject: [PATCH 1/2] Remove double or empty titles --- .../web/dns/templates/dns_naptr_edit.htm | 6 --- .../sites/templates/web_vhost_domain_edit.htm | 39 ++++++++----------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/interface/web/dns/templates/dns_naptr_edit.htm b/interface/web/dns/templates/dns_naptr_edit.htm index 8fd928c3de..15a944d629 100644 --- a/interface/web/dns/templates/dns_naptr_edit.htm +++ b/interface/web/dns/templates/dns_naptr_edit.htm @@ -1,9 +1,3 @@ -
-

-
-

- -
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm index 6092778af8..e39b889d4c 100644 --- a/interface/web/sites/templates/web_vhost_domain_edit.htm +++ b/interface/web/sites/templates/web_vhost_domain_edit.htm @@ -1,8 +1,3 @@ -
-

-
-

-

{tmpl_var name='configuration_error_txt'}

@@ -94,7 +89,7 @@
{tmpl_var name='document_root'}
-
+
@@ -291,13 +286,13 @@ } adjustForm(true); reloadFastcgiPHPVersions(true); - + jQuery('#client_group_id').change(function(){ clientGroupId = $(this).val(); reloadWebIP(); reloadFastcgiPHPVersions(); }); - + if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm' || (jQuery('#php').val() == 'hhvm' && serverType == 'nginx')){ jQuery('.fastcgi_php_version:hidden').show(); if(jQuery('#php').val() == 'hhvm'){ @@ -311,10 +306,10 @@ jQuery('.fastcgi_php_version:visible').hide(); } //ISPConfig.resetFormChanged(); - + jQuery('#php').change(function(){ reloadFastcgiPHPVersions(); - if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){ + if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){ jQuery('.fastcgi_php_version:hidden').show(); if(jQuery(this).val() == 'hhvm'){ jQuery('#fastcgi_php_version_txt').hide(); @@ -333,7 +328,7 @@ // new Vhostsubdomains/Vhostaliasdomains if(serverId == '') jQuery('#parent_domain_id').trigger('change'); -/* +/* if(jQuery('#directive_snippets_id').val() > 0){ jQuery('.pagespeed').show(); } else { @@ -347,7 +342,7 @@ } }); */ - + function reloadServerId(noFormChange) { var parentWebId = jQuery('#parent_domain_id').val(); jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) { @@ -356,7 +351,7 @@ if(noFormChange) reloadFastcgiPHPVersions(noFormChange); }); } - + function adjustForm(noFormChange){ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) { if(data.servertype == "nginx"){ @@ -399,7 +394,7 @@ } }); } - + function reloadDirectiveSnippets() { jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getdirectivesnippet"}, function(data) { var options = ''; @@ -414,7 +409,7 @@ options += ''; } options += ''; - + options += ""; for (var i = 0, len = data['snippets'].length; i < len; i++) { var isSelected = ''; @@ -430,7 +425,7 @@ $('#directive_snippets_id').html(options).change(); }); } - + function reloadWebIP() { ISPConfig.loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId, rerenderSelect2); ISPConfig.loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId, rerenderSelect2); @@ -438,11 +433,11 @@ //$('#ip_address').add('#ipv6_address').select2(); } - + function rerenderSelect2(elem) { $('#'+elem).select2(); } - + function reloadFastcgiPHPVersions(noFormChange) { jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi", client_group_id : clientGroupId}, function(data) { //var options = ''; @@ -474,7 +469,7 @@ if(noFormChange) ISPConfig.resetFormChanged(); }); } - + jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').not('#directive_snippets_id').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); }); jQuery('#dom-edit-submit').click(function() { @@ -485,7 +480,7 @@ ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php'); }); - + if($('#domain').val() == ''){ $('#web_folder_domain').text('[DOMAIN]'); } else { @@ -498,9 +493,9 @@ $('#web_folder_domain').text($('#domain').val()); } }); - + $('#more_folder_directive_snippets').click(function(){ $('.folder_directive_snippets:hidden:first').removeClass('hidden'); }); - + -- GitLab From 4b508f66ccbbe28535bc2b975016cb83529a270a Mon Sep 17 00:00:00 2001 From: thom Date: Mon, 15 Jun 2020 21:10:02 +0200 Subject: [PATCH 2/2] Remove double or empty titles --- interface/web/client/templates/client_edit_address.htm | 8 ++++---- interface/web/client/templates/client_edit_limits.htm | 6 +++--- .../web/mail/templates/mail_domain_catchall_edit.htm | 4 ++-- interface/web/mail/templates/mail_user_backup.htm | 4 +--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm index 23318b218b..835b264400 100644 --- a/interface/web/client/templates/client_edit_address.htm +++ b/interface/web/client/templates/client_edit_address.htm @@ -1,7 +1,7 @@ - {tmpl_var name='Address'} -
+
-
+
+
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 0508ab5090..db0b370804 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -1,7 +1,7 @@
- +
-
{tmpl_var name="Limits"} +
- +
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm index 0ccae15a8f..8da10f1f09 100644 --- a/interface/web/mail/templates/mail_domain_catchall_edit.htm +++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm @@ -1,4 +1,4 @@ -<
+
@@ -22,7 +22,7 @@ {tmpl_var name='active'}
- + diff --git a/interface/web/mail/templates/mail_user_backup.htm b/interface/web/mail/templates/mail_user_backup.htm index 0de61a3297..bbf1abaf87 100644 --- a/interface/web/mail/templates/mail_user_backup.htm +++ b/interface/web/mail/templates/mail_user_backup.htm @@ -7,8 +7,6 @@
- - Backup
- + {tmpl_var name='backup_records'} -- GitLab