diff options
4 files changed, 43 insertions, 6 deletions
diff --git a/org.eclipse.help.webapp/advanced/indexView.jsp b/org.eclipse.help.webapp/advanced/indexView.jsp index d9b42320a..4864a0ead 100644 --- a/org.eclipse.help.webapp/advanced/indexView.jsp +++ b/org.eclipse.help.webapp/advanced/indexView.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (c) 2005, 2007 Intel Corporation and others. + Copyright (c) 2005, 2009 Intel Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ IBM Corporation - 122967 [Help] Remote help system (improve responsiveness) IBM Corporation - 166695 [Webapp] Index View truncates button if large fonts are used IBM Corporation 2006, refactored index view into a single frame + IBM Corporation 2009, css changes --%> <%@ include file="fheader.jsp"%> @@ -27,6 +28,17 @@ <style type="text/css"> <%@ include file="indexView.css"%> </style> +<% + if (requestData.isMacMozilla()) { +%> +<style type="text/css"> +#button { + background:GrayText; +} +</style> +<% + } +%> <base target="ContentViewFrame"> diff --git a/org.eclipse.help.webapp/advanced/searchScoped.jsp b/org.eclipse.help.webapp/advanced/searchScoped.jsp index 85f2ecbc7..25c094bc6 100644 --- a/org.eclipse.help.webapp/advanced/searchScoped.jsp +++ b/org.eclipse.help.webapp/advanced/searchScoped.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (c) 2000, 2007 IBM Corporation and others. + Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -84,7 +84,17 @@ A { } #go { - background:ThreeDShadow; +<% + if (data.isMacMozilla()) { +%> + background:GrayText; +<% + } else { +%> + background:ThreeDShadow; +<% + } +%> color:Window; font-weight:bold; border:1px solid ThreeDShadow; diff --git a/org.eclipse.help.webapp/advanced/searchSimple.jsp b/org.eclipse.help.webapp/advanced/searchSimple.jsp index ce01c424d..3da3e7f74 100644 --- a/org.eclipse.help.webapp/advanced/searchSimple.jsp +++ b/org.eclipse.help.webapp/advanced/searchSimple.jsp @@ -1,5 +1,5 @@ <%-- - Copyright (c) 2000, 2004 IBM Corporation and others. + Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -71,7 +71,17 @@ INPUT { } #go { - background:ThreeDShadow; +<% + if (data.isMacMozilla()) { +%> + background:GrayText; +<% + } else { +%> + background:ThreeDShadow; +<% + } +%> color:Window; font-weight:bold; border:1px solid ThreeDShadow; diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java index 27e04fe07..779a60249 100644 --- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java +++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -78,6 +78,11 @@ public class RequestData { return UrlUtil.isMozilla(request); } + public boolean isMacMozilla() { + return UrlUtil.isMozilla(request) && + (request.getHeader("User-Agent").indexOf("Macintosh") > 0 ); //$NON-NLS-1$ //$NON-NLS-2$ + } + public String getMozillaVersion() { return UrlUtil.getMozillaVersion(request); } |