Skip to content

Commit 6d2f77c

Browse files
author
Till Brehm
committed
Merge branch 'remove-double-or-empty-titles' into 'stable-3.1'
Remove double or empty titles See merge request ispconfig/ispconfig3!1001
2 parents e2c5aad + 517e507 commit 6d2f77c

File tree

120 files changed

+80
-714
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+80
-714
lines changed

‎interface/web/admin/form/users.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
*/
6262

6363
$form['title'] = 'Users';
64-
$form['description'] = 'Form to edit systemusers.';
64+
//$form['description'] = 'Form to edit systemusers.';
6565
$form['name'] = 'users';
6666
$form['action'] = 'users_edit.php';
6767
$form['db_table'] = 'sys_user';

‎interface/web/admin/templates/directive_snippets_edit.htm‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
81
<div class="form-group">
92
<label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
103
<tmpl_if name='is_master'><div class="col-sm-9 col-text">{tmpl_var name='name'}</div></tmpl_else><div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></tmpl_if>

‎interface/web/admin/templates/firewall_edit.htm‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
81
<div class="form-group">
92
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
103
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
@@ -30,4 +23,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
3023
<div class="clear"><div class="right">
3124
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/firewall_edit.php">{tmpl_var name='btn_save_txt'}</button>
3225
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/firewall_list.php">{tmpl_var name='btn_cancel_txt'}</button>
33-
</div></div>
26+
</div></div>

‎interface/web/admin/templates/remote_action_osupdate.htm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ <h1><tmpl_var name="do_osupdate_caption"></h1>
44
<p><tmpl_var name="do_osupdate_desc"></p>
55

66

7-
<legend>{tmpl_var name='do_osupdate_caption'}</legend>
87
<div class="form-group">
98
<label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
109
<div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="$('#OKMsg').hide(); ">
@@ -19,4 +18,4 @@ <h1><tmpl_var name="do_osupdate_caption"></h1>
1918

2019
<div class="clear"><div class="right">
2120
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_do_txt'}" data-submit-form="pageForm" data-form-action="admin/remote_action_osupdate.php">{tmpl_var name='btn_do_txt'}</button>
22-
</div></div>
21+
</div></div>

‎interface/web/admin/templates/remote_user_edit.htm‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
81
<div class="form-group">
92
<label for="remote_username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
103
<div class="col-sm-9"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" /></div></div>

‎interface/web/admin/templates/server_edit_services.htm‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
81
<div class="form-group">
92
<label for="server_name" class="col-sm-3 control-label">{tmpl_var name='server_name_txt'}</label>
103
<div class="col-sm-9"><input type="text" name="server_name" id="server_name" value="{tmpl_var name='server_name'}" class="form-control" /></div></div>

‎interface/web/admin/templates/server_ip_edit.htm‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
<legend>{tmpl_var name='server_ip_edit_title'}</legend>
81
<div class="form-group">
92
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
103
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">

‎interface/web/admin/templates/server_ip_map_edit.htm‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +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>
51
<div class="form-group">
62
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
73
<div class="col-sm-9">

‎interface/web/admin/templates/server_php_fastcgi_edit.htm‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
81
<div class="form-group">
92
<label for="php_fastcgi_binary" class="col-sm-3 control-label">{tmpl_var name='php_fastcgi_binary_txt'}</label>
103
<div class="col-sm-9"><input type="text" name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" class="form-control" /></div></div>
@@ -18,4 +11,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
1811
<div class="clear"><div class="right">
1912
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_php_edit.php">{tmpl_var name='btn_save_txt'}</button>
2013
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
21-
</div></div>
14+
</div></div>

‎interface/web/admin/templates/server_php_fpm_edit.htm‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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-
7-
81
<div class="form-group">
92
<label for="php_fpm_init_script" class="col-sm-3 control-label">{tmpl_var name='php_fpm_init_script_txt'}</label>
103
<div class="col-sm-9"><input type="text" name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" class="form-control" /></div></div>
@@ -21,4 +14,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
2114
<div class="clear"><div class="right">
2215
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_php_edit.php">{tmpl_var name='btn_save_txt'}</button>
2316
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php">{tmpl_var name='btn_cancel_txt'}</button>
24-
</div></div>
17+
</div></div>

0 commit comments

Comments
 (0)