|
 |
88b21ec |
### Eclipse Workspace Patch 1.0
|
|
|
88b21ec |
#P org.eclipse.help.webapp
|
|
|
88b21ec |
Index: advanced/tocToolbar.jsp
|
|
|
88b21ec |
===================================================================
|
|
|
88b21ec |
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/tocToolbar.jsp,v
|
|
|
88b21ec |
retrieving revision 1.14
|
|
|
88b21ec |
diff -u -r1.14 tocToolbar.jsp
|
|
|
88b21ec |
--- plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 22 Jan 2009 22:19:55 -0000 1.14
|
|
|
88b21ec |
+++ plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 21 Sep 2009 20:55:27 -0000
|
|
|
88b21ec |
@@ -16,6 +16,9 @@
|
|
|
88b21ec |
String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request));
|
|
|
88b21ec |
String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')";
|
|
|
88b21ec |
String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request));
|
|
|
88b21ec |
+ // See Bug 290064 for an explanation of why these constants are used
|
|
|
88b21ec |
+ final String ON = "on";
|
|
|
88b21ec |
+ final String OFF = "off";
|
|
|
88b21ec |
%>
|
|
|
88b21ec |
|
|
|
88b21ec |
<jsp:include page="toolbar.jsp">
|
|
|
88b21ec |
@@ -62,6 +65,6 @@
|
|
|
88b21ec |
<jsp:param name="image" value="auto_synch_toc.gif"/>
|
|
|
88b21ec |
<jsp:param name="action" value="toggleAutosynch"/>
|
|
|
88b21ec |
<jsp:param name="param" value=""/>
|
|
|
88b21ec |
- <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? "on" : "off")%>"/>
|
|
|
88b21ec |
+ <jsp:param name="state" value="<%=((new CookiesData(application, request, response)).isSynchToc() ? ON : OFF)%>"/>
|
|
|
88b21ec |
|
|
|
88b21ec |
</jsp:include>
|
|
|
88b21ec |
\ No newline at end of file
|
|
|
88b21ec |
Index: advanced/searchToolbar.jsp
|
|
|
88b21ec |
===================================================================
|
|
|
88b21ec |
RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchToolbar.jsp,v
|
|
|
88b21ec |
retrieving revision 1.12
|
|
|
88b21ec |
diff -u -r1.12 searchToolbar.jsp
|
|
|
88b21ec |
--- plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 29 Aug 2007 22:45:40 -0000 1.12
|
|
|
88b21ec |
+++ plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 21 Sep 2009 20:55:27 -0000
|
|
|
88b21ec |
@@ -1,5 +1,5 @@
|
|
|
88b21ec |
<%--
|
|
|
88b21ec |
- Copyright (c) 2000, 2007 IBM Corporation and others.
|
|
|
88b21ec |
+ Copyright (c) 2000, 2009 IBM Corporation and others.
|
|
|
88b21ec |
All rights reserved. This program and the accompanying materials
|
|
|
88b21ec |
are made available under the terms of the Eclipse Public License v1.0
|
|
|
88b21ec |
which accompanies this distribution, and is available at
|
|
|
88b21ec |
@@ -9,6 +9,11 @@
|
|
|
88b21ec |
IBM Corporation - initial API and implementation
|
|
|
88b21ec |
--%>
|
|
|
88b21ec |
<%@ include file="header.jsp"%>
|
|
|
88b21ec |
+<%
|
|
|
88b21ec |
+ // See Bug 290064 for an explanation of why these constants are used
|
|
|
88b21ec |
+ final String ON = "on";
|
|
|
88b21ec |
+ final String OFF = "off";
|
|
|
88b21ec |
+%>
|
|
|
88b21ec |
|
|
|
88b21ec |
|
|
|
88b21ec |
<jsp:include page="toolbar.jsp">
|
|
|
88b21ec |
@@ -27,13 +32,13 @@
|
|
|
88b21ec |
<jsp:param name="image" value="show_categories.gif"/>
|
|
|
88b21ec |
<jsp:param name="action" value="toggleShowCategories"/>
|
|
|
88b21ec |
<jsp:param name="param" value=""/>
|
|
|
88b21ec |
- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? "on" : "off")%>"/>
|
|
|
88b21ec |
+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowCategories() ? ON : OFF)%>"/>
|
|
|
88b21ec |
|
|
|
88b21ec |
<jsp:param name="name" value="show_descriptions"/>
|
|
|
88b21ec |
<jsp:param name="tooltip" value='show_descriptions'/>
|
|
|
88b21ec |
<jsp:param name="image" value="show_descriptions.gif"/>
|
|
|
88b21ec |
<jsp:param name="action" value="toggleShowDescriptions"/>
|
|
|
88b21ec |
<jsp:param name="param" value=""/>
|
|
|
88b21ec |
- <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? "on" : "off")%>"/>
|
|
|
88b21ec |
+ <jsp:param name="state" value="<%=((new SearchData(application, request, response)).isShowDescriptions() ? ON : OFF)%>"/>
|
|
|
88b21ec |
|
|
|
88b21ec |
</jsp:include>
|
|
|
88b21ec |
\ No newline at end of file
|