Skip to content

Commit 54ffb8b

Browse files
author
Till Brehm
committed
Merge branch '5758-error-style' into 'develop'
Better styling for config error messages (#5758) Closes #5758 See merge request ispconfig/ispconfig3!1203
2 parents a265c64 + c8947ba commit 54ffb8b

File tree

8 files changed

+80
-58
lines changed

8 files changed

+80
-58
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
6-
</div>
7-
</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
811
</tmpl_if>
912

1013
<div class="form-group">

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
6-
</div>
7-
</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
811
</tmpl_if>
912

1013

@@ -55,7 +58,7 @@
5558
{tmpl_var name='ssl_action'}
5659
</select></div>
5760
</div>
58-
61+
5962

6063
<input type="hidden" name="id" value="{tmpl_var name='id'}">
6164
<input type="hidden" name="type" value="ssl">
@@ -77,11 +80,11 @@
7780
$('#load_data').click(function(){
7881
loadClientData();
7982
});
80-
81-
83+
84+
8285
function loadClientData() {
8386
var web_id = $("input[name=id]").val();
84-
87+
8588
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {'web_id': web_id, 'type': "getclientssldata"}, function(data) {
8689
$('#ssl_organisation').val(data['company_name']);
8790
$('#ssl_locality').val(data['city']);

‎interface/web/sites/templates/web_vhost_domain_advanced.htm‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
6-
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
710
</div>
8-
</div>
911
</tmpl_if>
1012
<input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
1113
<div class="form-group">

‎interface/web/sites/templates/web_vhost_domain_backup.htm‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
6-
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
710
</div>
8-
</div>
911
</tmpl_if>
1012

1113

‎interface/web/sites/templates/web_vhost_domain_edit.htm‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
6-
</div>
7-
</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
811
</tmpl_if>
912

1013

‎interface/web/sites/templates/web_vhost_domain_redirect.htm‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
6-
</div>
7-
</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
811
</tmpl_if>
912

1013

11-
14+
1215
<div class="form-group">
1316
<label for="redirect_type" class="col-sm-3 control-label">{tmpl_var name='redirect_type_txt'}</label>
1417
<div class="col-sm-9"><select name="redirect_type" id="redirect_type" class="form-control">
@@ -48,14 +51,14 @@
4851
var webId = jQuery('input[name="id"]').val();
4952
var serverId;
5053
getServerId(webId);
51-
54+
5255
function getServerId(webId){
5356
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
5457
serverId = data.serverid;
5558
adjustForm(serverId);
5659
});
5760
}
58-
61+
5962
function adjustForm(serverId){
6063
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
6164
var selected = jQuery('#redirect_type').val();
@@ -77,7 +80,7 @@
7780
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
7881
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
7982
//jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
80-
83+
8184
jQuery('#redirect_type option[value="last"]').hide();
8285
jQuery('#redirect_type option[value="break"]').hide();
8386
jQuery('#redirect_type option[value="redirect"]').hide();
@@ -88,5 +91,5 @@
8891
}
8992
});
9093
}
91-
94+
9295
</script>

‎interface/web/sites/templates/web_vhost_domain_ssl.htm‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
6-
</div>
7-
</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
811
</tmpl_if>
912

1013

‎interface/web/sites/templates/web_vhost_domain_stats.htm‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<tmpl_if name="config_error_msg">
2-
<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
3-
<p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
4-
<div>
5-
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
6-
</div>
7-
</div>
2+
<div class="alert alert-danger">
3+
<p>
4+
<tmpl_var name="configuration_error_txt">
5+
<div>
6+
<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div>
7+
<div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
8+
</div>
9+
</p>
10+
</div>
811
</tmpl_if>
912
<div class="form-group">
1013
<label class="col-sm-3 control-label">{tmpl_var name='stats_user_txt'}</label>
@@ -43,7 +46,7 @@
4346
{tmpl_var name='stats_type'}
4447
</select></div>
4548
</div>
46-
49+
4750

4851
<input type="hidden" name="id" value="{tmpl_var name='id'}">
4952

0 commit comments

Comments
 (0)