Skip to content

Commit 09d0cd3

Browse files
author
thom
committed
Show error(s) in ul without bullets (#5158)
1 parent 54b0478 commit 09d0cd3

File tree

11 files changed

+136
-58
lines changed

11 files changed

+136
-58
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,15 @@
144144
</div>
145145
</tmpl_if>
146146
<tmpl_if name="error">
147-
<div id="errorMsg">
148-
<h3>
149-
<tmpl_var name="error_txt">
150-
</h3>
151-
<ol>
152-
<tmpl_var name="error">
153-
</ol>
147+
<div class='alert alert-danger clear'>
148+
<div class='alert-label'>
149+
<strong><tmpl_var name="error_txt"></strong>
150+
</div>
151+
<div class='alert-content'>
152+
<ul style="list-style-type:none">
153+
<tmpl_var name="error">
154+
</ul>
155+
</div>
154156
</div>
155157
</tmpl_if>
156158
<input type="hidden" name="id" id="id" value="{tmpl_var name='id'}">

‎interface/web/client/templates/client_message.htm‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ <h1><tmpl_var name="page_head_txt"></h1>
55
<div id="OKMsg"><p><tmpl_var name="okmsg"></p></div>
66
</tmpl_if>
77
<tmpl_if name="error">
8-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
8+
<div class='alert alert-danger clear'>
9+
<div class='alert-label'>
10+
<strong><tmpl_var name="error_txt"></strong>
11+
</div>
12+
<div class='alert-content'>
13+
<ul style="list-style-type:none">
14+
<tmpl_var name="error">
15+
</ul>
16+
</div>
17+
</div>
918
</tmpl_if>
1019
<div class="form-group">
1120
<label for="sender" class="col-sm-3 control-label">{tmpl_var name='sender_txt'}</label>
@@ -24,7 +33,7 @@ <h1><tmpl_var name="page_head_txt"></h1>
2433
<div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows="10">{tmpl_var name='message'}</textarea></div>
2534
<div class="col-sm-3 col-text"></div><div class="col-sm-9 col-text">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}</div>
2635
</div>
27-
36+
2837
<div class="clear"><div class="right">
2938
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_send_txt'}" data-submit-form="pageForm" data-form-action="client/client_message.php">{tmpl_var name='btn_send_txt'}</button>
3039
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php">{tmpl_var name='btn_cancel_txt'}</button>

‎interface/web/dns/templates/dns_import.htm‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,30 @@ <h1><tmpl_var name="zone_file_import_txt"></h1>
3737
<tmpl_else>
3838
<div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" onkeydown="keydown(event.which);" /></div></tmpl_if>
3939
<div class="col-sm-3 col-text"></div><div class="col-sm-9 col-text"><tmpl_var name='domain_field_desc_txt'}</div>
40-
</div>
40+
</div>
4141
<div class="form-group">
4242
<label for="file" class="col-sm-3 control-label">{tmpl_var name='zonefile_to_import_txt'}</label>
4343
<div class="col-sm-9 col-text"><input name="file" id="file" size="30" type="file" class="fileUpload" /></div>
4444
</div>
45-
45+
4646
<tmpl_if name="msg">
4747
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
4848
</tmpl_if>
4949
<tmpl_if name="error">
50-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
50+
<div class='alert alert-danger clear'>
51+
<div class='alert-label'>
52+
<strong><tmpl_var name="error_txt"></strong>
53+
</div>
54+
<div class='alert-content'>
55+
<ul style="list-style-type:none">
56+
<tmpl_var name="error">
57+
</ul>
58+
</div>
59+
</div>
5160
</tmpl_if>
52-
61+
5362
<input type="hidden" name="id" value="{tmpl_var name='id'}">
54-
63+
5564
<div class="clear"><div class="right">
5665
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
5766
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>

‎interface/web/dns/templates/dns_wizard.htm‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
33
</div>
44

55
<tmpl_if name="error">
6-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
6+
<div class='alert alert-danger clear'>
7+
<div class='alert-label'><strong>
8+
<tmpl_var name="error_txt">
9+
</strong></div>
10+
<div class='alert-content'>
11+
<ul style="list-style-type:none">
12+
<tmpl_var name="error">
13+
</ul>
14+
</div>
15+
</div>
716
</tmpl_if>
817

918

@@ -96,11 +105,11 @@ <h1><tmpl_var name="list_head_txt"></h1>
96105
<label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dnssec_txt'}</label>
97106
<div class="col-sm-9"><input type="checkbox" name="dnssec" value="Y"></div></div>
98107
</tmpl_if>
99-
100-
101-
108+
109+
110+
102111
<input type="hidden" name="create" value="0" />
103-
112+
104113
<div class="clear"><div class="right">
105114
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; ISPConfig.submitForm('pageForm','dns/dns_wizard.php');">{tmpl_var name='btn_save_txt'}</button>
106115
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
@@ -118,7 +127,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
118127
fillSearchFieldWith: 'fill_text',
119128
searchFieldWatermark: '',
120129
resultBoxPosition: ''
121-
});
130+
});
122131
</script>
123132
<script language="JavaScript" type="text/javascript">
124133
jQuery('#ipv6').ispconfigSearch({

‎interface/web/mail/templates/mail_user_backup_list.htm‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
33
</tmpl_if>
44
<tmpl_if name="error">
5-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
5+
<div class='alert alert-danger clear'>
6+
<div class='alert-label'>
7+
<strong><tmpl_var name="error_txt"></strong>
8+
</div>
9+
<div class='alert-content'>
10+
<ul style="list-style-type:none">
11+
<tmpl_var name="error">
12+
</ul>
13+
</div>
14+
</div>
615
</tmpl_if>
716
<h3><tmpl_var name="list_head_txt"></h3>
817

‎interface/web/themes/default/templates/error.tpl.htm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class='alert alert-danger clear'>
22
<div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
33
<div class='alert-content'>
4-
<ol>
5-
<li>###ERRORMSG###</li>
6-
</ol>
4+
<ul style="list-style-type:none">
5+
<li>###ERRORMSG###</li>
6+
</ul>
77
</div>
88
</div>

‎interface/web/themes/default/templates/tabbed_form.tpl.htm‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
<tmpl_if name="form_hint">
22
<div class='page-header'>
3-
<h1><tmpl_var name="form_hint"></h1>
3+
<h1><tmpl_var name="form_hint"></h1>
44
</div>
55
</tmpl_if>
66
<tmpl_if name="msg">
7-
<div class='alert alert-notification'>
8-
<tmpl_var name="msg">
9-
</div>
7+
<div class='alert alert-notification'><tmpl_var name="msg"></div>
108
</tmpl_if>
119
<tmpl_if name="error">
1210
<div class='alert alert-danger clear'>
13-
<div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
14-
<div class='alert-content'>
15-
<ol><tmpl_var name="error"></ol>
16-
</div>
11+
<div class='alert-label'><strong>
12+
<tmpl_var name="error_txt">
13+
</strong></div>
14+
<div class='alert-content'>
15+
<ul style="list-style-type:none">
16+
<tmpl_var name="error">
17+
</ul>
18+
</div>
1719
</div>
1820
</tmpl_if>
19-
21+
2022
<!-- content in tabs -->
2123
<div class='content-tab-wrapper'>
2224
<!-- tabs -->
2325
<ul class='nav nav-tabs'>
24-
<tmpl_loop name="formTab">
25-
<li<tmpl_if name="active"> class='active'</tmpl_if>>
26-
<a href='#' onclick="return ISPConfig.changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')"><tmpl_var name='title'></a>
27-
</li>
28-
</tmpl_loop>
26+
<tmpl_loop name="formTab">
27+
<li<tmpl_if name="active"> class='active'</tmpl_if>>
28+
<a href='#' onclick="return ISPConfig.changeTab('<tmpl_var name='name'>','<tmpl_var name='app_module'>/<tmpl_var name='form_action'>')">
29+
<tmpl_var name='title'>
30+
</a>
31+
</li>
32+
</tmpl_loop>
2933
</ul>
3034

3135
<div id="tabbox_content" class="tab-content">
3236
<div class='tab-pane active fade in'>
33-
<tmpl_dyninclude name="content_tpl">
37+
<tmpl_dyninclude name="content_tpl">
3438
</div>
3539
</div>
3640

‎interface/web/tools/templates/dns_import_tupa.htm‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h1><tmpl_var name="list_head_txt">Import DNS records from Tupa PowerDNS control
1717
<div class="form-group">
1818
<label class="col-sm-3 control-label" for="dbpassword">Tupa database password</label>
1919
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
20-
</div>
20+
</div>
2121
<div class="form-group">
2222
<label class="col-sm-3 control-label" for="dboptions">Tupa database options</label>
2323
<div class="col-sm-9" id="dboptions">
@@ -29,12 +29,21 @@ <h1><tmpl_var name="list_head_txt">Import DNS records from Tupa PowerDNS control
2929
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
3030
</tmpl_if>
3131
<tmpl_if name="error">
32-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
32+
<div class='alert alert-danger clear'>
33+
<div class='alert-label'>
34+
<strong><tmpl_var name="error_txt"></strong>
35+
</div>
36+
<div class='alert-content'>
37+
<ul style="list-style-type:none">
38+
<tmpl_var name="error">
39+
</ul>
40+
</div>
41+
</div>
3342
</tmpl_if>
3443

3544
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3645
<input type="hidden" name="start" value="1">
37-
46+
3847
<div class="clear"><div class="right">
3948
<button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/dns_import_tupa.php">Start</button>
4049
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">Cancel</button>

‎interface/web/tools/templates/import_ispconfig.htm‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h1><tmpl_var name="head_txt"></h1>
44
<p><tmpl_var name="list_desc_txt"></p>
55

66
<div class="panel panel_language_import" style="padding:20px;">
7-
7+
88
<div class="pnl_formsarea">
99
<legend>{tmpl_var name="legend_txt"}</legend>
1010
<div class="form-group">
@@ -19,7 +19,7 @@ <h1><tmpl_var name="head_txt"></h1>
1919
<label class="col-sm-3 control-label">Remote password</label>
2020
<div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div>
2121
</div>
22-
22+
2323
</div>
2424
<tmpl_if name="connected">
2525
<div class="pnl_formsarea">
@@ -66,17 +66,26 @@ <h1><tmpl_var name="head_txt"></h1>
6666
<label class="col-sm-3 control-label">{tmpl_var name="import_aliasdomain_txt"}</label>
6767
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div>
6868
</div>
69-
69+
7070
</div>
7171
</tmpl_if>
72-
72+
7373
<tmpl_if name="msg">
7474
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
7575
</tmpl_if>
7676
<tmpl_if name="error">
77-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
77+
<div class='alert alert-danger clear'>
78+
<div class='alert-label'>
79+
<strong><tmpl_var name="error_txt"></strong>
80+
</div>
81+
<div class='alert-content'>
82+
<ul style="list-style-type:none">
83+
<tmpl_var name="error">
84+
</ul>
85+
</div>
86+
</div>
7887
</tmpl_if>
79-
88+
8089
<input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
8190
<input type="hidden" name="connected" value="{tmpl_var name='connected'}">
8291
<tmpl_if name="connected">
@@ -90,4 +99,4 @@ <h1><tmpl_var name="head_txt"></h1>
9099
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">{tmpl_var name="btn_cancel_txt"}</button>
91100
</div></div>
92101
</tmpl_if>
93-
</div>
102+
</div>

‎interface/web/tools/templates/import_plesk.htm‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h2><tmpl_var name="list_head_txt">Import plesk panel data</h2>
2727
<label class="col-sm-3 control-label">Maildir content backup file (on this server, optional)</label>
2828
<div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" /></div>
2929
</div>
30-
30+
3131
<div class="form-group">
3232
<label class="col-sm-3 control-label">Import all data (that can be imported)</label>
3333
<div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/></div>
@@ -36,18 +36,27 @@ <h2><tmpl_var name="list_head_txt">Import plesk panel data</h2>
3636
<label class="col-sm-3 control-label">Import database contents (make sure the database user has the rights to do so)</label>
3737
<div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/></div>
3838
</div>
39-
39+
4040

4141
<tmpl_if name="msg">
4242
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
4343
</tmpl_if>
4444
<tmpl_if name="error">
45-
<div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
45+
<div class='alert alert-danger clear'>
46+
<div class='alert-label'>
47+
<strong><tmpl_var name="error_txt"></strong>
48+
</div>
49+
<div class='alert-content'>
50+
<ul style="list-style-type:none">
51+
<tmpl_var name="error">
52+
</ul>
53+
</div>
54+
</div>
4655
</tmpl_if>
4756

4857
<input type="hidden" name="id" value="{tmpl_var name='id'}">
49-
58+
5059
<div class="clear"><div class="right">
5160
<button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_plesk.php">Start</button>
5261
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">Cancel</button>
53-
</div></div>
62+
</div></div>

0 commit comments

Comments
 (0)