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/web_domain_edit.htm |  213 ++++++++++++++++++++++++----------------------------
 1 files changed, 99 insertions(+), 114 deletions(-)

diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index 59d7256..6525d5f 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -1,114 +1,99 @@
-<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" id="server_id" class="text" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
-			{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='ip_address_txt'}:</td>
-    <td class="frmText11">
-		<select name="ip_address" id="ip_address" class="text">
-			{tmpl_var name='ip_address'}
-		</select>
-	</td>
-  </tr>
-  <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='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='parent_domain_id_txt'}:</td>
-    <td class="frmText11">
-		<select name="parent_domain_id" class="text">
-			{tmpl_var name='parent_domain_id'}
-		</select>
-	</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='vhost_type_txt'}:</td>
-    <td class="frmText11">
-		<select name="vhost_type" class="text">
-			{tmpl_var name='vhost_type'}
-		</select>
-	</td>
-  </tr>
-  -->
-  <tr>
-    <td class="frmText11">{tmpl_var name='hd_quota_txt'}:</td>
-    <td class="frmText11"><input name="hd_quota" type="text" class="text" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7"> MB</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='traffic_quota_txt'}:</td>
-    <td class="frmText11"><input name="traffic_quota" type="text" class="text" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7"> MB</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='cgi_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='cgi'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssi_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='ssi'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='suexec_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='suexec'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='ssl_txt'}:</td>
-    <td class="frmText11">{tmpl_var name='ssl'}</td>
-  </tr>
-  <tr>
-    <td class="frmText11">{tmpl_var name='php_txt'}:</td>
-    <td class="frmText11">
-		<select name="php" class="text">
-			{tmpl_var name='php'}
-		</select>
-	</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">&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','sites/web_domain_edit.php');"><div class="buttonEnding"></div>&nbsp;
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_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_web_domain">
+
+  <div class="pnl_formsarea">
+    <fieldset id="wf_area_web_domain"><legend>Domain</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" onChange="loadContentInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">{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_group_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="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
+        <select id="ip_address" name="ip_address">{tmpl_var name='ip_address'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
+        <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
+      </span>
+<!--
+      <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="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
+        <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="vhost_type" class="wf_preField">{tmpl_var name='vhost_type_txt'}</label>
+        <select id="vhost_type" name="vhost_type">{tmpl_var name='vhost_type'}</select>
+      </span>
+-->      
+      <span class="wf_oneField">
+        <label for="hd_quota" class="wf_preField">{tmpl_var name='hd_quota_txt'}</label>
+        <input type="text" id="hd_quota" name="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="traffic_quota" class="wf_preField">{tmpl_var name='traffic_quota_txt'}</label>
+        <input type="text" id="traffic_quota" name="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7">
+      </span>
+      <span class="wf_oneField">
+        <label for="cgi" class="wf_preField">{tmpl_var name='cgi_txt'}</label>                    
+        <span class="">{tmpl_var name='cgi'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssi" class="wf_preField">{tmpl_var name='ssi_txt'}</label>                    
+        <span class="">{tmpl_var name='ssi'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="suexec" class="wf_preField">{tmpl_var name='suexec_txt'}</label>                    
+        <span class="">{tmpl_var name='suexec'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="errordocs" class="wf_preField">{tmpl_var name='errordocs_txt'}</label>                    
+        <span class="">{tmpl_var name='errordocs'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="is_subdomainwww" class="wf_preField">{tmpl_var name='is_subdomainwww_txt'}</label>                    
+        <span class="">{tmpl_var name='is_subdomainwww'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="subdomain" class="wf_preField">{tmpl_var name='subdomain_txt'}</label>                    
+        <select id="subdomain" name="subdomain">{tmpl_var name='subdomain'}</select>
+      </span>
+      <span class="wf_oneField">
+        <label for="ssl" class="wf_preField">{tmpl_var name='ssl_txt'}</label>                    
+        <span class="">{tmpl_var name='ssl'}</span>
+      </span>
+      <span class="wf_oneField">
+        <label for="php" class="wf_preField">{tmpl_var name='php_txt'}</label>
+        <select id="php" name="php">{tmpl_var name='php'}</select>
+      </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/web_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('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+    </div>
+  </div>
+  
+</div>

--
Gitblit v1.9.1