diff options
author | Dejan Gloszic | 2005-04-27 18:09:34 +0000 |
---|---|---|
committer | Dejan Gloszic | 2005-04-27 18:09:34 +0000 |
commit | 379aa53bbd09ab1e922c5bb37c67a38a168c7d65 (patch) | |
tree | 0072532e1c02f75fc667e5b521c42cb1d5e334b9 /org.eclipse.help.webapp | |
parent | e9210921c0bbd7f09a7c34de6e7b30882218a6dc (diff) | |
download | eclipse.platform.ua-379aa53bbd09ab1e922c5bb37c67a38a168c7d65.tar.gz eclipse.platform.ua-379aa53bbd09ab1e922c5bb37c67a38a168c7d65.tar.xz eclipse.platform.ua-379aa53bbd09ab1e922c5bb37c67a38a168c7d65.zip |
*** empty log message ***
Diffstat (limited to 'org.eclipse.help.webapp')
3 files changed, 26 insertions, 27 deletions
diff --git a/org.eclipse.help.webapp/advanced/confirm.jsp b/org.eclipse.help.webapp/advanced/confirm.jsp index 8bb356b50..e9b8ef012 100644 --- a/org.eclipse.help.webapp/advanced/confirm.jsp +++ b/org.eclipse.help.webapp/advanced/confirm.jsp @@ -112,7 +112,7 @@ function confirmed(){ <div style="padding:10px;"> <span style="font-weight:bold;"><%=ServletResources.getString(request.getParameter("header"), request)%></span> <br><br> - <%=ServletResources.getString(request.getParameter("message"), request)%> + <%=ServletResources.getConfirmShowAllExplanation(request)%> </div> </div> <% if ("true".equalsIgnoreCase(request.getParameter("dontaskagain")) ){ %> diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java index cb69d83d4..7b24fcce4 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java @@ -14,6 +14,8 @@ import java.util.*; import javax.servlet.http.*; +import org.eclipse.help.internal.base.BaseHelpSystem; +import org.eclipse.help.internal.base.HelpBasePlugin; import org.eclipse.help.internal.webapp.*; /** @@ -29,6 +31,13 @@ public class ServletResources { super(); } + public static String getConfirmShowAllExplanation(HttpServletRequest request) { + String message = HelpBasePlugin.getActivitySupport().getShowAllMessage(); + if (message==null) + message = getString("confirmShowAllExplanation", request); + return message; + } + /** * Returns a string from a property file. It uses 'name' as a the key to * retrieve from the webapp.properties file. diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java index df6518071..1b5ff9884 100644 --- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java +++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InjectionFilter.java @@ -13,16 +13,13 @@ package org.eclipse.help.internal.webapp.servlet; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import java.util.Locale; import javax.servlet.http.HttpServletRequest; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.help.internal.base.BaseHelpSystem; import org.eclipse.help.internal.base.HelpBasePlugin; -import org.eclipse.help.internal.webapp.WebappResources; import org.eclipse.help.internal.webapp.data.UrlUtil; /** @@ -48,13 +45,14 @@ public class InjectionFilter implements IFilter { * @see IFilter#filter(HttpServletRequest, OutputStream) */ public OutputStream filter(HttpServletRequest req, OutputStream out) { - boolean addNarrow = false; - boolean addDisabled = false; - // This filter only works inside the workbench if (BaseHelpSystem.getMode() != BaseHelpSystem.MODE_WORKBENCH) return out; + boolean addNarrow = false; + boolean addDisabled = false; + boolean needsLiveHelp = false; + String uri = req.getRequestURI(); if (uri == null || !uri.endsWith("html") && !uri.endsWith("htm")) { //$NON-NLS-1$ //$NON-NLS-2$ return out; @@ -75,6 +73,8 @@ public class InjectionFilter implements IFilter { } if (!addNarrow && !addDisabled) return out; + + needsLiveHelp = HelpBasePlugin.getActivitySupport().getDocumentMessageUsesLiveHelp(); IPath path = new Path(pathInfo); int upLevels = path.segmentCount() - 1; @@ -90,9 +90,11 @@ public class InjectionFilter implements IFilter { script.append(disabledBook1); appendRelativePath(script, upLevels); script.append(disabledBook2); - script.append(disabledBook3); - appendRelativePath(script, upLevels, "org.eclipse.help"); //$NON-NLS-1$ - script.append(disabledBook4); + if (needsLiveHelp) { + script.append(disabledBook3); + appendRelativePath(script, upLevels, "org.eclipse.help"); //$NON-NLS-1$ + script.append(disabledBook4); + } appendDisabled(disabledContent, upLevels); } try { @@ -118,25 +120,13 @@ public class InjectionFilter implements IFilter { private void appendDisabled(StringBuffer buff, int nsteps) { String message = HelpBasePlugin.getActivitySupport().getDocumentMessage(); - if (message!=null) - buff.append(message); - //String localeStr = Platform.getNL(); - //Locale locale = UrlUtil.getLocale(localeStr); - -/* + if (message==null) + return; buff.append("<div id=\"help-disabledTopic\">"); //$NON-NLS-1$ buff.append("<img src=\""); //$NON-NLS-1$ appendRelativePath(buff, nsteps, "org.eclipse.help.webapp"); //$NON-NLS-1$ - buff - .append("advanced/images/e_show_all.gif\" border=\"0\" align=\"middle\"> "); //$NON-NLS-1$ - buff.append(WebappResources.getString("disabledTopic1", locale)); //$NON-NLS-1$ - buff.append(WebappResources.getString("disabledTopic2", locale)); //$NON-NLS-1$ - buff.append("<br><br>"); //$NON-NLS-1$ - buff.append(WebappResources.getString("disabledTopic3", locale)); //$NON-NLS-1$ - buff - .append(" <a href='javascript:liveAction(\"org.eclipse.help.ui\", \"org.eclipse.help.ui.internal.ShowCapabilitiesPreferenceAction\",\"\")'>"); //$NON-NLS-1$ - buff.append(WebappResources.getString("disabledTopic4", locale)); //$NON-NLS-1$ - buff.append("</a><br><hr></div>"); //$NON-NLS-1$ -*/ + buff.append("advanced/images/e_show_all.gif\" border=\"0\" align=\"bottom\"> "); //$NON-NLS-1$ + buff.append(message); + buff.append("<br><hr></div>"); //$NON-NLS-1$ } }
\ No newline at end of file |