diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index 356d2e1b252e6803a3dd94c6f32f9f3c51e912f0..ea8386c224608c07fbe199e295da2c944dc1dba1 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -144,13 +144,15 @@
</div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg">
- <h3>
- <tmpl_var name="error_txt">
- </h3>
- <ol>
- <tmpl_var name="error">
- </ol>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
</div>
</tmpl_if>
<input type="hidden" name="id" id="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm
index b546181fa71a5a77edee9ae936cafb80e4e31756..d934d5f6d2f82f3524433f64562238c98cbda219 100644
--- a/interface/web/client/templates/client_message.htm
+++ b/interface/web/client/templates/client_message.htm
@@ -5,7 +5,16 @@
<div id="OKMsg"><p><tmpl_var name="okmsg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
<div class="form-group">
<label for="sender" class="col-sm-3 control-label">{tmpl_var name='sender_txt'}</label>
@@ -24,7 +33,7 @@
<div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows="10">{tmpl_var name='message'}</textarea></div>
<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>
</div>
-
+
<div class="clear"><div class="right">
<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>
<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>
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm
index dafb9016a0c3a13e2f3bd2bf0ecc241f9a440912..c461e01ed6d06e3c0ac37e8e4cb9e2da54f0c912 100644
--- a/interface/web/dns/templates/dns_import.htm
+++ b/interface/web/dns/templates/dns_import.htm
@@ -37,21 +37,30 @@
<tmpl_else>
<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>
<div class="col-sm-3 col-text"></div><div class="col-sm-9 col-text"><tmpl_var name='domain_field_desc_txt'}</div>
- </div>
+ </div>
<div class="form-group">
<label for="file" class="col-sm-3 control-label">{tmpl_var name='zonefile_to_import_txt'}</label>
<div class="col-sm-9 col-text"><input name="file" id="file" size="30" type="file" class="fileUpload" /></div>
</div>
-
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
-
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<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>
<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>
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 2f4f24b4e08266604971ea4d521b7206290b6e48..daaac277eba8a85811e291e9c04e6289f168fd6f 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -3,7 +3,16 @@
</div>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'><strong>
+ <tmpl_var name="error_txt">
+ </strong></div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
@@ -96,11 +105,11 @@
<label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dnssec_txt'}</label>
<div class="col-sm-9"><input type="checkbox" name="dnssec" value="Y"></div></div>
</tmpl_if>
-
-
-
+
+
+
<input type="hidden" name="create" value="0" />
-
+
<div class="clear"><div class="right">
<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>
<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 @@
fillSearchFieldWith: 'fill_text',
searchFieldWatermark: '',
resultBoxPosition: ''
- });
+ });
</script>
<script language="JavaScript" type="text/javascript">
jQuery('#ipv6').ispconfigSearch({
diff --git a/interface/web/mail/templates/mail_user_backup_list.htm b/interface/web/mail/templates/mail_user_backup_list.htm
index 87dc2a548fad9b582e4d09dcc4b8bc9c949b2665..95fec378f4507ba5588f29991918dbd7931c56d3 100644
--- a/interface/web/mail/templates/mail_user_backup_list.htm
+++ b/interface/web/mail/templates/mail_user_backup_list.htm
@@ -2,7 +2,16 @@
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
<h3><tmpl_var name="list_head_txt"></h3>
diff --git a/interface/web/themes/default/templates/error.tpl.htm b/interface/web/themes/default/templates/error.tpl.htm
index dbb730f59960def03ce504c79db2251f38b55909..20e5dfc2fa877f055423156fdd0379367cf0fb68 100644
--- a/interface/web/themes/default/templates/error.tpl.htm
+++ b/interface/web/themes/default/templates/error.tpl.htm
@@ -1,8 +1,8 @@
<div class='alert alert-danger clear'>
<div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
<div class='alert-content'>
- <ol>
- <li>###ERRORMSG###</li>
- </ol>
+ <ul style="list-style-type:none">
+ <li>###ERRORMSG###</li>
+ </ul>
</div>
</div>
diff --git a/interface/web/themes/default/templates/tabbed_form.tpl.htm b/interface/web/themes/default/templates/tabbed_form.tpl.htm
index 5a500038898abf076ca364e51ce0f2db31f79dcd..b15bc6ac1ab431d1d414d5fb47d0ac45a9fb0009 100644
--- a/interface/web/themes/default/templates/tabbed_form.tpl.htm
+++ b/interface/web/themes/default/templates/tabbed_form.tpl.htm
@@ -1,36 +1,40 @@
<tmpl_if name="form_hint">
<div class='page-header'>
- <h1><tmpl_var name="form_hint"></h1>
+ <h1><tmpl_var name="form_hint"></h1>
</div>
</tmpl_if>
<tmpl_if name="msg">
- <div class='alert alert-notification'>
- <tmpl_var name="msg">
- </div>
+ <div class='alert alert-notification'><tmpl_var name="msg"></div>
</tmpl_if>
<tmpl_if name="error">
<div class='alert alert-danger clear'>
- <div class='alert-label'><strong><tmpl_var name="error_txt"></strong></div>
- <div class='alert-content'>
- <ol><tmpl_var name="error"></ol>
- </div>
+ <div class='alert-label'><strong>
+ <tmpl_var name="error_txt">
+ </strong></div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
</div>
</tmpl_if>
-
+
<!-- content in tabs -->
<div class='content-tab-wrapper'>
<!-- tabs -->
<ul class='nav nav-tabs'>
- <tmpl_loop name="formTab">
- <li<tmpl_if name="active"> class='active'</tmpl_if>>
- <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>
- </li>
- </tmpl_loop>
+ <tmpl_loop name="formTab">
+ <li<tmpl_if name="active"> class='active'</tmpl_if>>
+ <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>
+ </li>
+ </tmpl_loop>
</ul>
<div id="tabbox_content" class="tab-content">
<div class='tab-pane active fade in'>
- <tmpl_dyninclude name="content_tpl">
+ <tmpl_dyninclude name="content_tpl">
</div>
</div>
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm
index 4593fbb8002e71ca47c63ae50fce1a9afcb89191..bd2d07c479bef23629130ecd76449084acf4b07f 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -17,7 +17,7 @@
<div class="form-group">
<label class="col-sm-3 control-label" for="dbpassword">Tupa database password</label>
<div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
- </div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label" for="dboptions">Tupa database options</label>
<div class="col-sm-9" id="dboptions">
@@ -29,12 +29,21 @@
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="start" value="1">
-
+
<div class="clear"><div class="right">
<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>
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">Cancel</button>
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 9d845701f6dc403dd60725a9d2554f609b319fa2..278a6de5ea55df6e7c9b817ac2e11aaba51749c6 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -4,7 +4,7 @@
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import" style="padding:20px;">
-
+
<div class="pnl_formsarea">
<legend>{tmpl_var name="legend_txt"}</legend>
<div class="form-group">
@@ -19,7 +19,7 @@
<label class="col-sm-3 control-label">Remote password</label>
<div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div>
</div>
-
+
</div>
<tmpl_if name="connected">
<div class="pnl_formsarea">
@@ -66,17 +66,26 @@
<label class="col-sm-3 control-label">{tmpl_var name="import_aliasdomain_txt"}</label>
<div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div>
</div>
-
+
</div>
</tmpl_if>
-
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
-
+
<input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
<input type="hidden" name="connected" value="{tmpl_var name='connected'}">
<tmpl_if name="connected">
@@ -90,4 +99,4 @@
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">{tmpl_var name="btn_cancel_txt"}</button>
</div></div>
</tmpl_if>
- </div>
\ No newline at end of file
+ </div>
diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm
index 645913abd64cad157d11a75d9e5d35e408fd9e7c..2a8110d6bf3af6a03d99cf1a5436483837f6241c 100644
--- a/interface/web/tools/templates/import_plesk.htm
+++ b/interface/web/tools/templates/import_plesk.htm
@@ -27,7 +27,7 @@
<label class="col-sm-3 control-label">Maildir content backup file (on this server, optional)</label>
<div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" /></div>
</div>
-
+
<div class="form-group">
<label class="col-sm-3 control-label">Import all data (that can be imported)</label>
<div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/></div>
@@ -36,18 +36,27 @@
<label class="col-sm-3 control-label">Import database contents (make sure the database user has the rights to do so)</label>
<div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/></div>
</div>
-
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
-
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_plesk.php">Start</button>
<button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">Cancel</button>
- </div></div>
\ No newline at end of file
+ </div></div>
diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm
index 7876875b9828e9bc9d1f2be90b75bf3449f268c0..86bf46891aabf19e9aabd73744a8f2c69a0e7474 100644
--- a/interface/web/tools/templates/import_vpopmail.htm
+++ b/interface/web/tools/templates/import_vpopmail.htm
@@ -4,7 +4,7 @@
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
-
+
<div class="pnl_formsarea">
<legend>{tmpl_var name="legend_txt"}</legend>
<div class="form-group">
@@ -34,14 +34,23 @@
<div class="col-sm-9"><input class="form-control" type="text" id="local_server_id" value="{tmpl_var name='local_server_id'}" name="local_server_id" /></div>
</div>
</div>
-
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong><tmpl_var name="error_txt"></strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
</tmpl_if>
-
+
<input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_vpopmail.php">{tmpl_var name="btn_start_txt"}</button>