From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/sites/templates/database_edit.htm | 139 +++++++++++++++++++++++++++++----------------
1 files changed, 89 insertions(+), 50 deletions(-)
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 239e664..558e311 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -1,64 +1,103 @@
<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_database">
<div class="pnl_formsarea">
- <fieldset id="wf_area_database"><legend>Database</legend>
+ <fieldset class="inlineLabels">
<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>
+ <div class="ctrlHolder">
+ <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>
</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="64" 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="10" maxlength="10" 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>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+ <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ {tmpl_var name='parent_domain_id'}
+ </select>
+ </div>
+ <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>
+ </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>
+ <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>
+ <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </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" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /> <a href="javascript:void(0);" onClick="generatePassword('database_password');">{tmpl_var name='generate_password_txt'}</a>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div id="passBar"></div>
+ <p class="formHint"><span id="passText"> </span></p>
+ </div>
+ <div class="ctrlHolder">
+ <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('database_password','repeat_password');" />
+ </div>
+ <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+ <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+ <div class="ctrlHolder">
+ <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>
+ <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">
+ {tmpl_var name='active'}
+ </div>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="wf_actions buttons">
+ <div class="buttonHolder 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>
--
Gitblit v1.9.1