From bfcdef6bc91753cb2044e3626f522b5b1aec129f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 14 Nov 2012 05:34:56 -0500
Subject: [PATCH] Merged revisions 3596-3670 from 3.0.5 stable branch.
---
interface/web/sites/templates/web_aliasdomain_edit.htm | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 3f80059..66c2c40 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -37,6 +37,12 @@
{tmpl_var name='subdomain'}
</select>
</div>
+ <div class="ctrlHolder">
+ <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+ <select name="seo_redirect" id="seo_redirect" class="selectInput">
+ {tmpl_var name='seo_redirect'}
+ </select>
+ </div>
<div class="ctrlHolder">
<p class="label">{tmpl_var name='active_txt'}</p>
<div class="multiField">
@@ -62,6 +68,19 @@
jQuery('#parent_domain_id').change(function(){
webId = $(this).val();
getServerId(webId);
+ });
+
+ if(jQuery('#redirect_type').val() == 'proxy'){
+ jQuery('.tabbox_tabs ul li:last').show();
+ } else {
+ jQuery('.tabbox_tabs ul li:last').hide();
+ }
+ jQuery('#redirect_type').change(function(){
+ if(jQuery(this).val() == 'proxy'){
+ jQuery('.tabbox_tabs ul li:last').show();
+ } else {
+ jQuery('.tabbox_tabs ul li:last').hide();
+ }
});
function getServerId(webId){
@@ -89,23 +108,27 @@
jQuery('#redirect_type option[value="break"]').show();
jQuery('#redirect_type option[value="redirect"]').show();
jQuery('#redirect_type option[value="permanent"]').show();
+ jQuery('#redirect_type option[value="proxy"]').show();
jQuery('#redirect_type option[value="last"]').attr('disabled',false);
jQuery('#redirect_type option[value="break"]').attr('disabled',false);
jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled',false);
- if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
} else {
jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="proxy"]').attr('disabled','disabled');
jQuery('#redirect_type option[value="last"]').hide();
jQuery('#redirect_type option[value="break"]').hide();
jQuery('#redirect_type option[value="redirect"]').hide();
jQuery('#redirect_type option[value="permanent"]').hide();
+ jQuery('#redirect_type option[value="proxy"]').hide();
jQuery('#redirect_type option[value="R"]').show();
jQuery('#redirect_type option[value="L"]').show();
@@ -117,7 +140,7 @@
jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
}
});
}
--
Gitblit v1.9.1