diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 23318b218b45b0b76aa32e0ecf747bbf04886569..835b2644003257b9538d7c357d11ed30309f390a 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -1,7 +1,7 @@
- <legend>{tmpl_var name='Address'}</legend>
- <div class="form-group">
+ <div class="form-group">
<label for="company_name" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
- <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" /></div></div>
+ <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" /></div>
+ </div>
<div class="form-group">
<label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
<div class="col-sm-9"><select name="gender" id="gender" class="form-control">
@@ -146,7 +146,7 @@
</div>
</div>
{tmpl_var name='required_fields_txt'}
-
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 0508ab5090bec316646efbdcf7215925fc7e0129..db0b3708045e8a9bc03d522aa83c19b5fd256e65 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -1,7 +1,7 @@
<div class="panel panel_client">
-
+
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="Limits"}</legend>
+ <fieldset class="inlineLabels">
<div class="form-group">
<label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
<div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
@@ -361,7 +361,7 @@
<label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
<div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" /></div>
</div>
-
+
</div>
</div>
</div>
diff --git a/interface/web/dns/templates/dns_naptr_edit.htm b/interface/web/dns/templates/dns_naptr_edit.htm
index 8fd928c3de5b151b72303311d0b8084c007d5241..15a944d6298106e5de1d134c2198d147d6b12a60 100644
--- a/interface/web/dns/templates/dns_naptr_edit.htm
+++ b/interface/web/dns/templates/dns_naptr_edit.htm
@@ -1,9 +1,3 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
<div class="form-group">
<label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
<div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 0ccae15a8feab950c71c71deafd1378f0f161173..8da10f1f09e00e5a8840f3c8feed993b224108d1 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 @@
-< <div class="form-group">
+ <div class="form-group">
<label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
<div class="col-sm-9">
<div class="input-group">
@@ -22,7 +22,7 @@
{tmpl_var name='active'}
</div>
</div>
-
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="catchall">
diff --git a/interface/web/mail/templates/mail_user_backup.htm b/interface/web/mail/templates/mail_user_backup.htm
index 0de61a3297030bdf5d8b4066eac2021544aa7831..bbf1abaf87cc59005ac27627b00c6457409f93b1 100644
--- a/interface/web/mail/templates/mail_user_backup.htm
+++ b/interface/web/mail/templates/mail_user_backup.htm
@@ -7,8 +7,6 @@
</div>
</tmpl_if>
-
- <legend>Backup</legend>
<div class="form-group">
<label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
<div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
@@ -21,7 +19,7 @@
{tmpl_var name='backup_copies'}
</select></div>
</div>
-
+
{tmpl_var name='backup_records'}
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 6092778af876ab69eaf6d142d35ca7517881cac0..e39b889d4ce9abbcebf10b60b5c9592c7815844f 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 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
<tmpl_if name="config_error_msg">
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
@@ -94,7 +89,7 @@
<label for="document_root" class="col-sm-3 control-label" readonly >{tmpl_var name='document_root_txt'}</label>
<div class="col-sm-9">
<div class="checkbox">{tmpl_var name='document_root'}</div>
- </div>
+ </div>
</div>
</tmpl_if>
<div class="form-group">
@@ -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 = '<option value="0">-</option>';
@@ -414,7 +409,7 @@
options += '<option ' + isSelected + ' value="' + data['m_snippets'][i]['directive_snippets_id'] + '">' + data['m_snippets'][i]['name'] + '</option>';
}
options += '</optgroup>';
-
+
options += "<optgroup label=\"{tmpl_var name='select_directive_snippet_txt'}\">";
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<tmpl_if name="use_combobox" value="y">, rerenderSelect2</tmpl_if>);
ISPConfig.loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId<tmpl_if name="use_combobox" value="y">, rerenderSelect2</tmpl_if>);
@@ -438,11 +433,11 @@
//$('#ip_address').add('#ipv6_address').select2();
</tmpl_if>
}
-
+
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 = '<option value="">Default</option>';
@@ -474,7 +469,7 @@
if(noFormChange) ISPConfig.resetFormChanged();
});
}
-
+
<tmpl_if name="readonly_tab">
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');
});
</tmpl_if>
-
+
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');
});
-
+
</script>