From 31e0d15191bb745a03057544adb224f6f1ef67f2 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 26 Jan 2012 09:48:42 -0500
Subject: [PATCH] Merged revisions 2911-2912 from stable branch.

---
 interface/web/sites/templates/web_subdomain_edit.htm |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm
index 85f35c7..0acbe13 100644
--- a/interface/web/sites/templates/web_subdomain_edit.htm
+++ b/interface/web/sites/templates/web_subdomain_edit.htm
@@ -62,7 +62,12 @@
 			jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
 				var selected = jQuery('#redirect_type').val();
 				if(data.servertype == "nginx"){
-					jQuery('#redirect_type option[value="R"]').hide();
+					jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+					jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+					jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+					jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+					
+					jQuery("#redirect_type option[value='R']").hide();
 					jQuery('#redirect_type option[value="L"]').hide();
 					jQuery('#redirect_type option[value="R,L"]').hide();
 					jQuery('#redirect_type option[value="R=301,L"]').hide();
@@ -72,8 +77,18 @@
 					jQuery('#redirect_type option[value="redirect"]').show();
 					jQuery('#redirect_type option[value="permanent"]').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);
+					
 					if(selected != "no" && selected != "" && selected != "last"  && selected != "break"  && selected != "redirect"  && selected != "permanent") 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="last"]').hide();
 					jQuery('#redirect_type option[value="break"]').hide();
 					jQuery('#redirect_type option[value="redirect"]').hide();
@@ -84,6 +99,11 @@
 					jQuery('#redirect_type option[value="R,L"]').show();
 					jQuery('#redirect_type option[value="R=301,L"]').show();
 					
+					jQuery('#redirect_type option[value="R"]').attr('disabled',false);
+					jQuery('#redirect_type option[value="L"]').attr('disabled',false);
+					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');
 				}
 			});

--
Gitblit v1.9.1