Skip to content

Commit 85dd276

Browse files
author
Till Brehm
committed
Improved Database and Database User forms.
1 parent 745891b commit 85dd276

File tree

2 files changed

+35
-16
lines changed

2 files changed

+35
-16
lines changed

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

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,23 @@ <h1><tmpl_var name="list_head_txt"></h1>
5252
{tmpl_var name='type'}
5353
</select></div>
5454
</div>
55-
<div class="form-group">
55+
<div class="form-group">
5656
<label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label>
57-
<p class="prefix">{tmpl_var name='database_name_prefix'}</p>
58-
<tmpl_if name="edit_disabled">
59-
<div class="col-sm-9"><input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" disabled="disabled" /></div><input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
60-
<tmpl_else>
61-
<div class="col-sm-9"><input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" /></div></tmpl_if>
57+
<div class="col-sm-9">
58+
<div class="input-group">
59+
<span class="input-group-addon" id="database_name-desc">{tmpl_var name='database_name_prefix'}</span>
60+
<tmpl_if name="edit_disabled">
61+
<input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" disabled="disabled" /><input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
62+
<tmpl_else>
63+
<input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" aria-describedby="database_name-desc" />
64+
</tmpl_if>
65+
</div>
66+
</div>
6267
</div>
6368
<div class="form-group">
64-
<label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
65-
<div class="col-sm-6"><input type="text" name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;MB
66-
</div></div>
69+
<label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
70+
<div class="col-sm-9"><div class="input-group"><input type="text" name="database_quota" id="quota" value="{tmpl_var name='database_quota'}" class="form-control" aria-describedby="database_quota-desc" /><span class="input-group-addon" id="database_quota-desc">MB</span></div></div>
71+
</div>
6772
<div class="form-group">
6873
<label for="database_user_id" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
6974
<div class="col-sm-9"><select name="database_user_id" id="database_user_id" class="form-control">
@@ -72,9 +77,11 @@ <h1><tmpl_var name="list_head_txt"></h1>
7277
</div>
7378
<div class="form-group">
7479
<label for="database_ro_user_id" class="col-sm-3 control-label">{tmpl_var name='database_ro_user_txt'}</label>
75-
<div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control">
80+
<div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control" aria-describedby="database_ro_user_id-help">
7681
{tmpl_var name='database_ro_user_id'}
77-
</select></div>&nbsp;{tmpl_var name='optional_txt'}
82+
</select>
83+
<span id="database_ro_user_id-help" class="help-block">{tmpl_var name='optional_txt'}</span>
84+
</div>
7885
</div>
7986
<div class="form-group">
8087
<tmpl_if name="edit_disabled">

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,25 @@ <h1><tmpl_var name="list_head_txt"></h1>
2121
</select></div>
2222
</div>
2323
</tmpl_if>
24-
<div class="form-group">
24+
<div class="form-group">
2525
<label for="database_user" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
26-
<div class="col-sm-2">{tmpl_var name='database_user_prefix'}</div>
27-
<div class="col-sm-7"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" /></div></div>
28-
<div class="form-group">
26+
<div class="col-sm-9">
27+
<div class="input-group">
28+
<span class="input-group-addon" id="database_user-desc">{tmpl_var name='database_user_prefix'}</span>
29+
<input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" aria-describedby="database_user-desc" />
30+
</div>
31+
</div>
32+
</div>
33+
<div class="form-group">
2934
<label for="database_password" class="col-sm-3 control-label">{tmpl_var name='database_password_txt'}</label>
30-
<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>
35+
<div class="col-sm-9">
36+
<div class="input-group">
37+
<input type="database_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');" />
38+
<span class="input-group-btn">
39+
<button class="btn btn-default" type="button" onclick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
40+
</span>
41+
</div>
42+
</div>
3143
</div>
3244
<div class="form-group">
3345
<label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>

0 commit comments

Comments
 (0)