Skip to content

Commit a4c8c36

Browse files
author
Till Brehm
committed
Merge branch 'more-useless-titles' into 'stable-3.1'
Remove even more useless titles See merge request ispconfig/ispconfig3!1025
2 parents 3f09740 + 4b508f6 commit a4c8c36

File tree

6 files changed

+27
-40
lines changed

6 files changed

+27
-40
lines changed

interface/web/client/templates/client_edit_address.htm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<legend>{tmpl_var name='Address'}</legend>
2-
<div class="form-group">
1+
<div class="form-group">
32
<label for="company_name" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
4-
<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>
3+
<div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" /></div>
4+
</div>
55
<div class="form-group">
66
<label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
77
<div class="col-sm-9"><select name="gender" id="gender" class="form-control">
@@ -146,7 +146,7 @@
146146
</div>
147147
</div>
148148
{tmpl_var name='required_fields_txt'}
149-
149+
150150

151151
<input type="hidden" name="id" value="{tmpl_var name='id'}">
152152

interface/web/client/templates/client_edit_limits.htm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="panel panel_client">
2-
2+
33
<div class="pnl_formsarea">
4-
<fieldset class="inlineLabels"><legend>{tmpl_var name="Limits"}</legend>
4+
<fieldset class="inlineLabels">
55
<div class="form-group">
66
<label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
77
<div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
@@ -361,7 +361,7 @@ <h4 class="panel-title">
361361
<label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
362362
<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>
363363
</div>
364-
364+
365365
</div>
366366
</div>
367367
</div>

interface/web/dns/templates/dns_naptr_edit.htm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
<div class='page-header'>
2-
<h1><tmpl_var name="list_head_txt"></h1>
3-
</div>
4-
<p><tmpl_var name="list_desc_txt"></p>
5-
6-
71
<div class="form-group">
82
<label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
93
<div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>

interface/web/mail/templates/mail_domain_catchall_edit.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
< <div class="form-group">
1+
<div class="form-group">
22
<label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
33
<div class="col-sm-9">
44
<div class="input-group">
@@ -22,7 +22,7 @@
2222
{tmpl_var name='active'}
2323
</div>
2424
</div>
25-
25+
2626
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2727
<input type="hidden" name="type" value="catchall">
2828

interface/web/mail/templates/mail_user_backup.htm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
</div>
88
</tmpl_if>
99

10-
11-
<legend>Backup</legend>
1210
<div class="form-group">
1311
<label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
1412
<div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
@@ -21,7 +19,7 @@
2119
{tmpl_var name='backup_copies'}
2220
</select></div>
2321
</div>
24-
22+
2523
{tmpl_var name='backup_records'}
2624
<input type="hidden" name="id" value="{tmpl_var name='id'}">
2725

interface/web/sites/templates/web_vhost_domain_edit.htm

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<div class='page-header'>
2-
<h1><tmpl_var name="list_head_txt"></h1>
3-
</div>
4-
<p><tmpl_var name="list_desc_txt"></p>
5-
61
<tmpl_if name="config_error_msg">
72
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
83
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
@@ -94,7 +89,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
9489
<label for="document_root" class="col-sm-3 control-label" readonly >{tmpl_var name='document_root_txt'}</label>
9590
<div class="col-sm-9">
9691
<div class="checkbox">{tmpl_var name='document_root'}</div>
97-
</div>
92+
</div>
9893
</div>
9994
</tmpl_if>
10095
<div class="form-group">
@@ -291,13 +286,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
291286
}
292287
adjustForm(true);
293288
reloadFastcgiPHPVersions(true);
294-
289+
295290
jQuery('#client_group_id').change(function(){
296291
clientGroupId = $(this).val();
297292
reloadWebIP();
298293
reloadFastcgiPHPVersions();
299294
});
300-
295+
301296
if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm' || (jQuery('#php').val() == 'hhvm' && serverType == 'nginx')){
302297
jQuery('.fastcgi_php_version:hidden').show();
303298
if(jQuery('#php').val() == 'hhvm'){
@@ -311,10 +306,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
311306
jQuery('.fastcgi_php_version:visible').hide();
312307
}
313308
//ISPConfig.resetFormChanged();
314-
309+
315310
jQuery('#php').change(function(){
316311
reloadFastcgiPHPVersions();
317-
if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){
312+
if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm' || (jQuery(this).val() == 'hhvm' && serverType == 'nginx')){
318313
jQuery('.fastcgi_php_version:hidden').show();
319314
if(jQuery(this).val() == 'hhvm'){
320315
jQuery('#fastcgi_php_version_txt').hide();
@@ -333,7 +328,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
333328
// new Vhostsubdomains/Vhostaliasdomains
334329
if(serverId == '') jQuery('#parent_domain_id').trigger('change');
335330

336-
/*
331+
/*
337332
if(jQuery('#directive_snippets_id').val() > 0){
338333
jQuery('.pagespeed').show();
339334
} else {
@@ -347,7 +342,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
347342
}
348343
});
349344
*/
350-
345+
351346
function reloadServerId(noFormChange) {
352347
var parentWebId = jQuery('#parent_domain_id').val();
353348
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : parentWebId, type : "getserverid"}, function(data) {
@@ -356,7 +351,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
356351
if(noFormChange) reloadFastcgiPHPVersions(noFormChange);
357352
});
358353
}
359-
354+
360355
function adjustForm(noFormChange){
361356
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
362357
if(data.servertype == "nginx"){
@@ -399,7 +394,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
399394
}
400395
});
401396
}
402-
397+
403398
function reloadDirectiveSnippets() {
404399
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getdirectivesnippet"}, function(data) {
405400
var options = '<option value="0">-</option>';
@@ -414,7 +409,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
414409
options += '<option ' + isSelected + ' value="' + data['m_snippets'][i]['directive_snippets_id'] + '">' + data['m_snippets'][i]['name'] + '</option>';
415410
}
416411
options += '</optgroup>';
417-
412+
418413
options += "<optgroup label=\"{tmpl_var name='select_directive_snippet_txt'}\">";
419414
for (var i = 0, len = data['snippets'].length; i < len; i++) {
420415
var isSelected = '';
@@ -430,19 +425,19 @@ <h1><tmpl_var name="list_head_txt"></h1>
430425
$('#directive_snippets_id').html(options).change();
431426
});
432427
}
433-
428+
434429
function reloadWebIP() {
435430
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>);
436431
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>);
437432
<tmpl_if name="use_combobox" value="y">
438433
//$('#ip_address').add('#ipv6_address').select2();
439434
</tmpl_if>
440435
}
441-
436+
442437
function rerenderSelect2(elem) {
443438
$('#'+elem).select2();
444439
}
445-
440+
446441
function reloadFastcgiPHPVersions(noFormChange) {
447442
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) {
448443
//var options = '<option value="">Default</option>';
@@ -474,7 +469,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
474469
if(noFormChange) ISPConfig.resetFormChanged();
475470
});
476471
}
477-
472+
478473
<tmpl_if name="readonly_tab">
479474
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(); });
480475
jQuery('#dom-edit-submit').click(function() {
@@ -485,7 +480,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
485480
ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php');
486481
});
487482
</tmpl_if>
488-
483+
489484
if($('#domain').val() == ''){
490485
$('#web_folder_domain').text('[DOMAIN]');
491486
} else {
@@ -498,9 +493,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
498493
$('#web_folder_domain').text($('#domain').val());
499494
}
500495
});
501-
496+
502497
$('#more_folder_directive_snippets').click(function(){
503498
$('.folder_directive_snippets:hidden:first').removeClass('hidden');
504499
});
505-
500+
506501
</script>

0 commit comments

Comments
 (0)