Skip to content
Snippets Groups Projects
Commit 09d0cd36 authored by Thom's avatar Thom :tools:
Browse files

Show error(s) in ul without bullets (#5158)

parent 54b0478f
No related branches found
No related tags found
1 merge request!1199Show error(s) in UL without bullets (#5158)
Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 58 deletions
interface/web/admin/templates/system_config_misc_edit.htm
+ 9
− 7
View file @ 09d0cd36
......@@ -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'}">
......
interface/web/client/templates/client_message.htm
+ 11
− 2
View file @ 09d0cd36
......@@ -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>
......
interface/web/dns/templates/dns_import.htm
+ 14
− 5
View file @ 09d0cd36
......@@ -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>
......
interface/web/dns/templates/dns_wizard.htm
+ 15
− 6
View file @ 09d0cd36
......@@ -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({
......
interface/web/mail/templates/mail_user_backup_list.htm
+ 10
− 1
View file @ 09d0cd36
......@@ -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>
......
interface/web/themes/default/templates/error.tpl.htm
+ 3
− 3
View file @ 09d0cd36
<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>
interface/web/themes/default/templates/tabbed_form.tpl.htm
+ 19
− 15
View file @ 09d0cd36
<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>
......
interface/web/tools/templates/dns_import_tupa.htm
+ 12
− 3
View file @ 09d0cd36
......@@ -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>
......
interface/web/tools/templates/import_ispconfig.htm
+ 16
− 7
View file @ 09d0cd36
......@@ -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>
interface/web/tools/templates/import_plesk.htm
+ 14
− 5
View file @ 09d0cd36
......@@ -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>
interface/web/tools/templates/import_vpopmail.htm
+ 13
− 4
View file @ 09d0cd36
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment