From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/templates/database_edit.htm | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index ff80af5..290ae30 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -52,18 +52,23 @@
{tmpl_var name='type'}
</select></div>
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label>
- <p class="prefix">{tmpl_var name='database_name_prefix'}</p>
- <tmpl_if name="edit_disabled">
- <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'}" />
- <tmpl_else>
- <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>
+ <div class="col-sm-9">
+ <div class="input-group">
+ <span class="input-group-addon" id="database_name-desc">{tmpl_var name='database_name_prefix'}</span>
+ <tmpl_if name="edit_disabled">
+ <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'}" />
+ <tmpl_else>
+ <input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" aria-describedby="database_name-desc" />
+ </tmpl_if>
+ </div>
+ </div>
</div>
<div class="form-group">
- <label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
- <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"> MB
- </div></div>
+ <label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
+ <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>
+ </div>
<div class="form-group">
<label for="database_user_id" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
<div class="col-sm-9"><select name="database_user_id" id="database_user_id" class="form-control">
@@ -72,9 +77,11 @@
</div>
<div class="form-group">
<label for="database_ro_user_id" class="col-sm-3 control-label">{tmpl_var name='database_ro_user_txt'}</label>
- <div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control">
+ <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">
{tmpl_var name='database_ro_user_id'}
- </select></div> {tmpl_var name='optional_txt'}
+ </select>
+ <span id="database_ro_user_id-help" class="help-block">{tmpl_var name='optional_txt'}</span>
+ </div>
</div>
<div class="form-group">
<tmpl_if name="edit_disabled">
--
Gitblit v1.9.1