From ef6969eba7756cd971aefb2cbeec4e897a794e92 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 18 Oct 2009 13:23:17 -0400
Subject: [PATCH] Added missing newline at the end of apache_ispconfig.conf.master
---
interface/web/sites/templates/database_edit.htm | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 463c1b1..99e1d07 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -7,16 +7,24 @@
<fieldset class="inlineLabels">
<tmpl_if name="is_admin">
<div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput" {tmpl_var name='edit_disabled'}>
- {tmpl_var name='server_id'}
- </select>
+ <tmpl_if name="edit_disabled">
+ <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
+ <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ {tmpl_var name='server_id'}
+ </select>
+ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ <tmpl_else>
+ <label for="server_id">{tmpl_var name='server_id_txt'}</label>
+ <select name="server_id" id="server_id" class="selectInput">
+ {tmpl_var name='server_id'}
+ </select>
+ </tmpl_if>
</div>
<div class="ctrlHolder">
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'}
- </select>
+ </select>
</div>
</tmpl_if>
<tmpl_if name="is_reseller">
@@ -24,20 +32,25 @@
<label for="client_group_id">{tmpl_var name='client_txt'}</label>
<select name="client_group_id" id="client_group_id" class="selectInput">
{tmpl_var name='client_group_id'}
- </select>
+ </select>
</div>
</tmpl_if>
<div class="ctrlHolder">
<label for="type">{tmpl_var name='type_txt'}</label>
<select name="type" id="type" class="selectInput formLengthHalf">
{tmpl_var name='type'}
- </select>
+ </select>
</div>
<div class="ctrlHolder">
<label for="database_name">{tmpl_var name='database_name_txt'}</label>
<div style="float: left;">{tmpl_var name='database_name_prefix'} </div>
- <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" {tmpl_var name='edit_disabled'} />
- </div>
+ <tmpl_if name="edit_disabled">
+ <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
+ <input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
+ <tmpl_else>
+ <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </tmpl_if>
+ </div>
<div class="ctrlHolder">
<label for="database_user">{tmpl_var name='database_user_txt'}</label>
<div style="float: left;">{tmpl_var name='database_user_prefix'} </div>
@@ -45,7 +58,7 @@
</div>
<div class="ctrlHolder">
<label for="database_password">{tmpl_var name='database_password_txt'}</label>
- <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" />
+ <input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" onkeyup="pass_check(this.value)" />
</div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='password_strength_txt'}</p>
@@ -53,17 +66,29 @@
<p class="formHint"><span id="passText"> </span></p>
</div>
<div class="ctrlHolder">
- <label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
- <select name="database_charset" id="database_charset" class="selectInput formLengthHalf" {tmpl_var name='edit_disabled'}>
- {tmpl_var name='database_charset'}
- </select>
+ <tmpl_if name="edit_disabled">
+ <label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
+ <select name="database_charset_disabled" id="database_charset_disabled" class="selectInput formLengthHalf" disabled="disabled">
+ {tmpl_var name='database_charset'}
+ </select>
+ <input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+ <tmpl_else>
+ <label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
+ <select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
+ {tmpl_var name='database_charset'}
+ </select>
+ </tmpl_if>
</div>
<div class="ctrlHolder">
- <p class="label">{tmpl_var name='remote_access_txt'}</p>
- <div class="multiField">
- {tmpl_var name='remote_access'}
- </div>
- </div>
+ <p class="label">{tmpl_var name='remote_access_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='remote_access'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="remote_ips">{tmpl_var name='remote_ips_txt'}</label>
+ <input name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" size="60" type="text" class="textInput formLengthHalf" />
+ </div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='active_txt'}</p>
<div class="multiField">
--
Gitblit v1.9.1