Skip to content

Commit 5c7919f

Browse files
author
Marius Cramer
committed
Layout improvement (flags and javascript)
1 parent e645fa3 commit 5c7919f

File tree

12 files changed

+25
-26
lines changed

12 files changed

+25
-26
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
77

88
<div class="form-group">
99
<label for="remote_username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
10-
<p class="prefix">{tmpl_var name='username_prefix'}</p>
11-
<div class="col-sm-9"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" /></div></div>
10+
<div class="col-sm-3">{tmpl_var name='username_prefix'}</div>
11+
<div class="col-sm-6"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" /></div></div>
1212

1313
<div class="form-group">
1414
<label for="remote_password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>

‎interface/web/client/client_list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
$app->listform_actions->SQLOrderBy = 'ORDER BY client.company_name, client.contact_name, client.client_id';
2121
$app->listform_actions->SQLExtWhere = "client.limit_client = 0";
22-
$app->listform_actions->SQLExtSelect = ', client.country as countryiso';
22+
$app->listform_actions->SQLExtSelect = ', LOWER(client.country) as countryiso';
2323
$app->listform_actions->onLoad();
2424

2525

‎interface/web/client/reseller_list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
$app->listform_actions->SQLOrderBy = 'ORDER BY client.company_name, client.contact_name, client.client_id';
5151
$app->listform_actions->SQLExtWhere = "(client.limit_client > 0 or client.limit_client = -1)";
52-
$app->listform_actions->SQLExtSelect = ', client.country as countryiso';
52+
$app->listform_actions->SQLExtSelect = ', LOWER(client.country) as countryiso';
5353
$app->listform_actions->onLoad();
5454

5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4747
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_no"}</a></td>
4848
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
4949
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="city"}</a></td>
50-
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td>
50+
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}"><span class="flags flag-{tmpl_var name="countryiso"}">{tmpl_var name="country"}</span></a></td>
5151
<td class="text-right">
5252
<tmpl_if name="is_admin">
5353
<a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></button>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4747
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_no"}</a></td>
4848
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
4949
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="city"}</a></td>
50-
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td>
50+
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}"><span class="flags flag-{tmpl_var name="countryiso"}">{tmpl_var name="country"}</span></a></td>
5151
<td class="text-right">
5252
<a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></button>
5353
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>

‎interface/web/js/scrigo.js.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@ function onAfterContentLoad(url, data) {
9595
?>
9696

9797

98-
$('#pageContent').find("select:not(.chosen-select)").select2({
98+
$('#pageContent,#sidebar').find("select:not(.chosen-select)").select2({
9999
placeholder: '',
100100
width: 'element',
101101
selectOnBlur: true,
102102
allowClear: true,
103103
formatResult: function(o) {
104-
if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '"></span>' + o.text;
104+
if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '">' + o.text + '</span>';
105105
else return o.text;
106106
},
107107
formatSelection: function(o) {
108-
if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '"></span>' + o.text;
108+
if(o.id && $(o.element).parent().hasClass('flags')) return '<span class="flags flag-' + o.id.toLowerCase() + '">' + o.text + '</span>';
109109
else return o.text;
110110
}
111111
}).on('change', function(e) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
2323
</tmpl_if>
2424
<div class="form-group">
2525
<label for="database_user" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
26-
<p class="prefix">{tmpl_var name='database_user_prefix'}</p>
27-
<div class="col-sm-9"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" /></div></div>
26+
<div class="col-sm-3">{tmpl_var name='database_user_prefix'}</div>
27+
<div class="col-sm-6"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" /></div></div>
2828
<div class="form-group">
2929
<label for="database_password" class="col-sm-3 control-label">{tmpl_var name='database_password_txt'}</label>
3030
<div class="col-sm-6"><input type="password" name="database_password" id="database_password" value="{tmpl_var name='database_password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
1313
</div>
1414
<div class="form-group">
1515
<label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
16-
<p class="prefix">{tmpl_var name='username_prefix'}</p>
17-
<div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
16+
<div class="col-sm-3">{tmpl_var name='username_prefix'}</div>
17+
<div class="col-sm-6"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
1818
<div class="form-group">
1919
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
2020
<div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ <h1><tmpl_var name="list_head_txt"></h1>
2121
</div>
2222
<div class="form-group">
2323
<label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
24-
<p class="prefix">{tmpl_var name='username_prefix'} </p>
25-
<div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control"/></div></div>
24+
<div class="col-sm-3">{tmpl_var name='username_prefix'} </div>
25+
<div class="col-sm-6"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control"/></div></div>
2626
<div class="form-group">
2727
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
2828
<div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>

‎interface/web/themes/default/assets/stylesheets/ispconfig.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,10 @@ ul.gs-resultbox li:last-child {
368368
border-bottom-right-radius: 5px; }
369369

370370
span.flags {
371-
display: inline-block;
372371
background-image: url("../images/flags_sprite.png");
373372
background-repeat: no-repeat;
374-
height: 20px;
375-
width: 30px;
373+
min-height: 20px;
374+
padding-left: 27px;
376375
vertical-align: middle;
377376
}
378377
span.flag-el {background-position:0 -1475px}

0 commit comments

Comments
 (0)