From daaf24a651b3b5c76c5af8c137635f0e8d2f3bd5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 26 Jan 2012 04:43:18 -0500
Subject: [PATCH] Fixed: FS#2021 - Subdomain redirect types don't appear correctly in firefox.
---
interface/web/sites/templates/web_aliasdomain_edit.htm | 22 +++++++++++++++++++++-
interface/web/sites/templates/web_subdomain_edit.htm | 22 +++++++++++++++++++++-
interface/web/sites/templates/web_domain_redirect.htm | 10 ++++++++++
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 9d8cd9d..7591c6f 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -75,7 +75,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();
@@ -85,8 +90,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();
@@ -97,6 +112,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');
}
});
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
index 1c78b41..2d926cf 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -48,12 +48,22 @@
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']").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();
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();
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