From 32dcc8752f280299f0e364ccebcc092db8f2cb4e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 05 Apr 2016 12:17:42 -0400
Subject: [PATCH] Changed autodetect messages from WARN to INFO in non forced mode.
---
interface/web/sites/templates/database_edit.htm | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 84cc1bf..290ae30 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -11,14 +11,14 @@
<label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
- </select>
- </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </select></div>
+ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
- </select>
- </div></tmpl_if>
+ </select></div>
+ </tmpl_if>
</div>
<tmpl_else>
<tmpl_if name="only_one_server">
@@ -29,14 +29,14 @@
<label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
- </select>
- </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </select></div>
+ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
- </select>
- </div></tmpl_if>
+ </select></div>
+ </tmpl_if>
</div>
</tmpl_if>
</tmpl_if>
@@ -44,53 +44,58 @@
<label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
<div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
<div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
- </select>
- </div></div>
- <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>
+ </select></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-9"><input type="text" name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /> MB
- </div></div>
+ <label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label>
+ <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-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">
{tmpl_var name='database_user_id'}
- </select>
- </div></div>
+ </select></div>
+ </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> {tmpl_var name='optional_txt'}
- </div></div>
+ </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">
<label for="database_charset_disabled" class="col-sm-3 control-label">{tmpl_var name='database_charset_txt'}</label>
<div class="col-sm-9"><select name="database_charset_disabled" id="database_charset_disabled" class="form-control" disabled="disabled">
{tmpl_var name='database_charset'}
- </select>
- </div><input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+ </select></div>
+ <input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
<tmpl_else>
<label for="database_charset" class="col-sm-3 control-label">{tmpl_var name='database_charset_txt'}</label>
<div class="col-sm-9"><select name="database_charset" id="database_charset" class="form-control">
{tmpl_var name='database_charset'}
- </select>
- </div></tmpl_if>
+ </select></div>
+ </tmpl_if>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='remote_access_txt'}</label>
@@ -100,8 +105,7 @@
</div>
<div class="form-group">
<label for="remote_ips" class="col-sm-3 control-label">{tmpl_var name='remote_ips_txt'}</label>
- <div class="col-sm-9"><input type="text" name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" class="form-control" /></div></div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<div class="col-sm-9">
@@ -113,7 +117,7 @@
<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'}" onclick="submitForm('pageForm','sites/database_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="sites/database_edit.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="sites/database_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
<script language="JavaScript" type="text/javascript">
--
Gitblit v1.9.1