From cbda30058c0f61ae2afbd9085afcf841f32751a5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Jan 2009 11:50:52 -0500
Subject: [PATCH] Fixed: FS#431 - jailkit users cannot login
---
interface/web/sites/templates/database_edit.htm | 143 ++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 76 deletions(-)
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 82129f6..d0ec170 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -1,76 +1,67 @@
-<table width="500" border="0" cellspacing="0" cellpadding="2">
- <tmpl_if name="is_admin">
- <tr>
- <td class="frmText11">{tmpl_var name='server_id_txt'}:</td>
- <td class="frmText11">
- <select name="server_id" class="text">
- {tmpl_var name='server_id'}
- </select>
- </td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='client_txt'}:</td>
- <td class="frmText11">
- <select name="client_group_id" class="text">
- {tmpl_var name='client_group_id'}
- </select>
- </td>
- </tr>
- </tmpl_if>
- <tmpl_if name="is_reseller">
- <tr>
- <td class="frmText11">{tmpl_var name='client_txt'}:</td>
- <td class="frmText11">
- <select name="client_group_id" class="text">
- {tmpl_var name='client_group_id'}
- </select>
- </td>
- </tr>
- </tmpl_if>
- <tr>
- <td class="frmText11">{tmpl_var name='type_txt'}:</td>
- <td class="frmText11">
- <select name="type" class="text">
- {tmpl_var name='type'}
- </select>
- </td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='database_name_txt'}:</td>
- <td class="frmText11"><input name="database_name" type="text" class="text" value="{tmpl_var name='database_name'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='database_user_txt'}:</td>
- <td class="frmText11"><input name="database_user" type="text" class="text" value="{tmpl_var name='database_user'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='database_password_txt'}:</td>
- <td class="frmText11"><input name="database_password" type="password" class="text" value="{tmpl_var name='database_password'}" size="30" maxlength="255"></td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='database_charset_txt'}:</td>
- <td class="frmText11">
- <select name="database_charset" class="text">
- {tmpl_var name='database_charset'}
- </select>
- </td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='remote_access_txt'}:</td>
- <td class="frmText11">{tmpl_var name='remote_access'}</td>
- </tr>
- <tr>
- <td class="frmText11">{tmpl_var name='active_txt'}:</td>
- <td class="frmText11">{tmpl_var name='active'}</td>
- </tr> <tr>
- <td class="frmText11"> </td>
- <td class="frmText11"> </td>
- </tr>
- <tr>
- <td> </td>
- <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><div class="buttonEnding"></div>
- <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><div class="buttonEnding"></div>
- </td>
- </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_database">
+
+ <div class="pnl_formsarea">
+ <fieldset id="wf_area_database"><legend>Database</legend>
+ <tmpl_if name="is_admin">
+ <span class="wf_oneField">
+ <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+ <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+ </span>
+ <span class="wf_oneField">
+ <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+ <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+ </span>
+ </tmpl_if>
+ <tmpl_if name="is_reseller">
+ <span class="wf_oneField">
+ <label for="client_group_id" class="wf_preField">{tmpl_var name='client_id_txt'}</label>
+ <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+ </span>
+ </tmpl_if>
+ <span class="wf_oneField">
+ <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+ <select id="type" name="type">{tmpl_var name='type'}</select>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_name" class="wf_preField">{tmpl_var name='database_name_txt'}</label>
+ {tmpl_var name='database_name_prefix'}
+ <input type="text" id="database_name" name="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_user" class="wf_preField">{tmpl_var name='database_user_txt'}</label>
+ {tmpl_var name='database_user_prefix'}
+ <input type="text" id="database_user" name="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_password" class="wf_preField">{tmpl_var name='database_password_txt'}</label>
+ <input type="password" id="database_password" name="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" class="wf_required" onkeyup="pass_check(this.value)"><span class="wf_reqMark">*</span><br>
+ </span>
+ <span class="wf_oneField">
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
+ <select id="database_charset" name="database_charset">{tmpl_var name='database_charset'}</select>
+ </span>
+ <span class="wf_oneField">
+ <label for="remote_access" class="wf_preField">{tmpl_var name='remote_access_txt'}</label>
+ <span class="">{tmpl_var name='remote_access'}</span>
+ </span>
+ <span class="wf_oneField">
+ <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+ <span class="">{tmpl_var name='active'}</span>
+ </span>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="wf_actions buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
--
Gitblit v1.9.1