Attachment #186445 for bug #291105

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 291105
Collapse All | Expand All




<%--
 Copyright (c) 2000, 2011 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

<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
<%
    }
} else { // data.getResultsCount() != 0
%>
<p><b><%=data.getMatchesInScopeMessage()%></b>
<%
    if (data.isScopeActive()) {
%>
&nbsp;<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
<% 
    } else {
%>
    &nbsp;<a class="showall" onclick="rescope();" ><%=ServletResources.getString("changeScopeLink", request)%></a>
<%
    }
%>
</p>


<table class="results" cellspacing='0'>

<%

Lines 1-5 Link Here

(-)advanced/view.js (-1 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.	2	* Copyright (c) 2010, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 16-19 Link Here
16	if (searchFrame.getSearchWord) {	16	if (searchFrame.getSearchWord) {
17	searchFrame.location.replace("searchScoped.jsp?searchWord=" + searchFrame.getSearchWord() + "&workingSet=");	17	searchFrame.location.replace("searchScoped.jsp?searchWord=" + searchFrame.getSearchWord() + "&workingSet=");
18	}	18	}
		19	}
		20
		21	function rescope() {
		22	var searchFrame = parent.parent.parent.parent.parent.HelpToolbarFrame.SearchFrame;
		23	if (searchFrame.getSearchWord) {
		24	searchFrame.openAdvanced();
		25	}
19	}	26	}

Lines 1-5 Link Here

(-)src/org/eclipse/help/internal/webapp/WebappResources.properties (-1 / +3 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2000, 2010 IBM Corporation and others.	2	# Copyright (c) 2000, 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 40-46 Link Here
40	TocHeading=Contents	40	TocHeading=Contents
41	Close=Close	41	Close=Close
42	activeScope=Scope {0}:	42	activeScope=Scope {0}:
		43	matchesInScope={0} matches in {1}:
43	showAllLink=Show all	44	showAllLink=Show all
		45	changeScopeLink=Change scope
44	Nothing_found=Nothing found.	46	Nothing_found=Nothing found.
45	Nothing_found_in_scope=Nothing found in scope {0}.	47	Nothing_found_in_scope=Nothing found in scope {0}.
46	Indexing=Indexing...	48	Indexing=Indexing...

Lines 1-5 Link Here

(-)src/org/eclipse/help/internal/webapp/data/SearchData.java (-3 / +8 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 551-560 Link Here
551	return NLS.bind(ServletResources.getString("Nothing_found_in_scope", request), scope); //$NON-NLS-1$	551	return NLS.bind(ServletResources.getString("Nothing_found_in_scope", request), scope); //$NON-NLS-1$
552	}	552	}
553	}	553	}
554		554
555	public String getScopeActiveMessage() {	555	public String getScopeActiveMessage() {
556	String scope = getScope();	556	String scope = getScope();
557	return NLS.bind(ServletResources.getString("activeScope", request), scope); //$NON-NLS-1$	557	return NLS.bind(ServletResources.getString("activeScope", request), scope); //$NON-NLS-1$
		558	}
		559
		560	public String getMatchesInScopeMessage() {
		561	String scope = getScope();
		562	return NLS.bind(ServletResources.getString("matchesInScope", request), "" + getResultsCount(), scope); //$NON-NLS-1$ //$NON-NLS-2$
558	}	563	}
559		564
560	/*	565	/*

Return to bug 291105

Lines 1-5 Link Here

(-)advanced/searchView.jsp (-6 / +11 lines)
1	<%--	1	<%--
2	Copyright (c) 2000, 2010 IBM Corporation and others.	2	Copyright (c) 2000, 2011 IBM Corporation and others.
3	All rights reserved. This program and the accompanying materials	3	All rights reserved. This program and the accompanying materials
4	are made available under the terms of the Eclipse Public License v1.0	4	are made available under the terms of the Eclipse Public License v1.0
5	which accompanies this distribution, and is available at	5	which accompanies this distribution, and is available at
Lines 124-141 Link Here
124	<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>	124	<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
125	<%	125	<%
126	}	126	}
127	} else {	127	} else { // data.getResultsCount() != 0
128	%>	128	%>
		129	<p><b><%=data.getMatchesInScopeMessage()%></b>
129	<%	130	<%
130	if (data.isScopeActive()) {	131	if (data.isScopeActive()) {
131	%>	132	%>
132	<p>	133	<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
133	<%= data.getScopeActiveMessage() %>	134	<%
134	<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>	135	} else {
135	</p>	136	%>
		137	<a class="showall" onclick="rescope();" ><%=ServletResources.getString("changeScopeLink", request)%></a>
136	<%	138	<%
137	}	139	}
138	%>	140	%>
		141	</p>
		142
		143
139	<table class="results" cellspacing='0'>	144	<table class="results" cellspacing='0'>
140		145
141	<%	146	<%