Skip to content

Commit f775f1c

Browse files
author
Till Brehm
committed
Merge branch 'mailuser-menus' into 'stable-3.1'
Remove double/empty titles and descriptions for mailusers See merge request ispconfig/ispconfig3!1005
2 parents 73e3570 + b36e2a0 commit f775f1c

File tree

6 files changed

+8
-43
lines changed

6 files changed

+8
-43
lines changed

interface/web/mailuser/templates/index.htm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class='page-header'>
22
<h1><tmpl_var name="page_head_txt"></h1>
33
</div>
4-
<p><tmpl_var name="page_desc_txt"></p>
54

65
<div class="panel panel_mailuser">
76

@@ -33,4 +32,4 @@ <h1><tmpl_var name="page_head_txt"></h1>
3332

3433
</div>
3534

36-
</div>
35+
</div>

interface/web/mailuser/templates/mail_user_autoresponder_edit.htm

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
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="autoresponder_subject" class="col-sm-3 control-label">{tmpl_var name='autoresponder_subject_txt'}</label>
10-
<div class="col-sm-9"><input class="form-control" type="text" name="autoresponder_subject" id="autoresponder_subject" value="{tmpl_var name='autoresponder_subject'}" /></div></div>
3+
<div class="col-sm-9"><input class="form-control" type="text" name="autoresponder_subject" id="autoresponder_subject" value="{tmpl_var name='autoresponder_subject'}" /></div>
4+
</div>
115
<div class="form-group">
126
<label for="autoresponder_text" class="col-sm-3 control-label">{tmpl_var name='autoresponder_text_txt'}</label>
137
<div class="col-sm-9"><textarea class="form-control" name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea></div>
@@ -30,4 +24,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
3024
<button class="btn btn-default formbutton-success" type="button"
3125
value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_autoresponder_edit.php">{tmpl_var name='btn_save_txt'}</button>
3226
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
33-
</div></div>
27+
</div></div>
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 class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
103
<div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
@@ -20,4 +13,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
2013
<div class="clear"><div class="right">
2114
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_cc_edit.php">{tmpl_var name='btn_save_txt'}</button>
2215
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
23-
</div></div>
16+
</div></div>

interface/web/mailuser/templates/mail_user_filter_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="rulename" class="col-sm-3 control-label">{tmpl_var name='rulename_txt'}</label>
103
<div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control"></div></div>
@@ -29,4 +22,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
2922
<div class="clear"><div class="right">
3023
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_filter_edit.php">{tmpl_var name='btn_save_txt'}</button>
3124
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/mail_user_filter_list.php">{tmpl_var name='btn_cancel_txt'}</button>
32-
</div></div>
25+
</div></div>

interface/web/mailuser/templates/mail_user_password_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 class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
103
<div class="col-sm-9">
@@ -44,4 +37,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
4437
<div class="clear"><div class="right">
4538
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_password_edit.php">{tmpl_var name='btn_save_txt'}</button>
4639
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
47-
</div></div>
40+
</div></div>

interface/web/mailuser/templates/mail_user_spamfilter_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 class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
103
<div class="col-sm-9">
@@ -24,4 +17,4 @@ <h1><tmpl_var name="list_head_txt"></h1>
2417
<div class="clear"><div class="right">
2518
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mailuser/mail_user_spamfilter_edit.php">{tmpl_var name='btn_save_txt'}</button>
2619
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php">{tmpl_var name='btn_cancel_txt'}</button>
27-
</div></div>
20+
</div></div>

0 commit comments

Comments
 (0)