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/mail/templates/mail_domain_edit.htm |  117 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 6889b8a..3e5da39 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -1,48 +1,73 @@
-<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'}
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_mail_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset class="inlineLabels">
+      <tmpl_if name="is_admin">
+      <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>
-	</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'}
+		<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>
-	</td>
-  </tr>
-  </tmpl_if>
-  <tr>
-    <td class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td class="frmText11"><input name="domain" type="text" class="text" value="{tmpl_var name='domain'}" size="30" maxlength="255"></td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='policy_txt'}:</td>
-    <td class="frmText11">
-		<select name="policy" class="text">
-			{tmpl_var name='policy'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">&nbsp;</td>
-    <td class="frmText11">{tmpl_var name='active'} &nbsp; {tmpl_var name='active_txt'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">&nbsp;</td>
-    <td class="frmText11">&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_domain_list.php');"><div class="buttonEnding"></div>
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="id" value="{tmpl_var name='id'}">
-<input type="hidden" name="type" value="local">
\ No newline at end of file
+		</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>
+      </div>
+      </tmpl_if>
+      
+      <tmpl_if name="is_reseller">
+      <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>
+      </div>
+      </tmpl_if>
+      
+      <div class="ctrlHolder">
+      	<label for="domain">{tmpl_var name='domain_txt'}</label>
+        <tmpl_if name="domain_option">
+			<select name="domain" id="domain" class="selectInput">
+					{tmpl_var name='domain_option'}
+			</select>
+		<tmpl_else>
+	        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+        </tmpl_if>
+	  </div>
+      <div class="ctrlHolder">
+      	<label for="policy">{tmpl_var name='policy_txt'}</label>
+        <select name="policy" id="policy" class="selectInput">
+					{tmpl_var name='policy'}
+				</select>
+      </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'}">
+    <input type="hidden" name="type" value="local">
+
+    <div class="buttonHolder buttons">
+      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_domain_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('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>

--
Gitblit v1.9.1