Merged revisions 2886-2909 from stable branch.

tbrehm

2012-01-25 355efb9a7f74a2035f595bbd0d03375710d08587

 interface/web/sites/templates/web_aliasdomain_edit.htm

@@ -78,6 +78,7 @@
               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();
               
               jQuery('#redirect_type option[value="last"]').show();
               jQuery('#redirect_type option[value="break"]').show();
@@ -94,8 +95,9 @@
               jQuery('#redirect_type option[value="R"]').show();
               jQuery('#redirect_type option[value="L"]').show();
               jQuery('#redirect_type option[value="R,L"]').show();
               jQuery('#redirect_type option[value="R=301,L"]').show();
               
               if(selected != "no" && selected != "" && selected != "R"  && selected != "L"  && selected != "R,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');
            }
         });
      }