From 05457e3f788d6a36817a380919c68e74092c621f Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Wed, 26 May 2010 08:59:54 -0400
Subject: [PATCH] Site->aliasdomain now works together with the domain - module

---
 interface/web/sites/templates/web_aliasdomain_edit.htm |   72 +++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 76aca15..82773d1 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -3,48 +3,54 @@
 
 <div class="panel panel_web_domain">
 
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <div class="ctrlHolder">
-      	<label for="domain">{tmpl_var name='domain_txt'}</label>
-        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+	<div class="pnl_formsarea">
+		<fieldset class="inlineLabels">
+			<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="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
-        <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+			<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="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
-        <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+			</div>
+			<div class="ctrlHolder">
+				<label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+				<select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
 					{tmpl_var name='redirect_type'}
 				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
-        <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
 			</div>
-      <div class="ctrlHolder">
-      	<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
-        <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+			<div class="ctrlHolder">
+				<label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+				<input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+			</div>
+			<div class="ctrlHolder">
+				<label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+				<select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
 					{tmpl_var name='subdomain'}
 				</select>
-      </div>
-      <div class="ctrlHolder">
-				<p class="label">{tmpl_var name='active_txt'}</p>
-					<div class="multiField">
-						{tmpl_var name='active'}
-					</div>
 			</div>
-    </fieldset>
+			<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="id" value="{tmpl_var name='id'}">
 
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_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_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
+		<div class="buttonHolder buttons">
+			<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_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_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+		</div>
+	</div>
+
 </div>

--
Gitblit v1.9.1