Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 186445 Details for
Bug 291105
[Help][Search] Help Contents UI enhancements (involving search scope)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch for display number of results found
patch291105a.txt (text/plain), 5.36 KB, created by
Chris Goldthorpe
on 2011-01-10 18:08:17 EST
(
hide
)
Description:
Patch for display number of results found
Filename:
MIME Type:
Creator:
Chris Goldthorpe
Created:
2011-01-10 18:08:17 EST
Size:
5.36 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.help.webapp >Index: advanced/searchView.jsp >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchView.jsp,v >retrieving revision 1.38 >diff -u -r1.38 searchView.jsp >--- advanced/searchView.jsp 11 Oct 2010 19:59:54 -0000 1.38 >+++ advanced/searchView.jsp 10 Jan 2011 23:07:14 -0000 >@@ -1,5 +1,5 @@ > <%-- >- Copyright (c) 2000, 2010 IBM Corporation and others. >+ 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 >@@ -124,18 +124,23 @@ > <a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a> > <% > } >-} else { >+} else { // data.getResultsCount() != 0 > %> >+<p><b><%=data.getMatchesInScopeMessage()%></b> > <% > if (data.isScopeActive()) { > %> >-<p> >-<%= data.getScopeActiveMessage() %> >-<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a> >-</p> >+ <a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a> >+<% >+ } else { >+%> >+ <a class="showall" onclick="rescope();" ><%=ServletResources.getString("changeScopeLink", request)%></a> > <% > } > %> >+</p> >+ >+ > <table class="results" cellspacing='0'> > > <% >Index: advanced/view.js >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/view.js,v >retrieving revision 1.1 >diff -u -r1.1 view.js >--- advanced/view.js 11 Oct 2010 19:59:55 -0000 1.1 >+++ advanced/view.js 10 Jan 2011 23:07:14 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2010 IBM Corporation and others. >+ * Copyright (c) 2010, 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 >@@ -16,4 +16,11 @@ > if (searchFrame.getSearchWord) { > searchFrame.location.replace("searchScoped.jsp?searchWord=" + searchFrame.getSearchWord() + "&workingSet="); > } >+} >+ >+function rescope() { >+ var searchFrame = parent.parent.parent.parent.parent.HelpToolbarFrame.SearchFrame; >+ if (searchFrame.getSearchWord) { >+ searchFrame.openAdvanced(); >+ } > } >\ No newline at end of file >Index: src/org/eclipse/help/internal/webapp/WebappResources.properties >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties,v >retrieving revision 1.80 >diff -u -r1.80 WebappResources.properties >--- src/org/eclipse/help/internal/webapp/WebappResources.properties 11 Oct 2010 19:59:55 -0000 1.80 >+++ src/org/eclipse/help/internal/webapp/WebappResources.properties 10 Jan 2011 23:07:14 -0000 >@@ -1,5 +1,5 @@ > ############################################################################### >-# Copyright (c) 2000, 2010 IBM Corporation and others. >+# 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 >@@ -40,7 +40,9 @@ > TocHeading=Contents > Close=Close > activeScope=Scope {0}: >+matchesInScope={0} matches in {1}: > showAllLink=Show all >+changeScopeLink=Change scope > Nothing_found=Nothing found. > Nothing_found_in_scope=Nothing found in scope {0}. > Indexing=Indexing... >Index: src/org/eclipse/help/internal/webapp/data/SearchData.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/SearchData.java,v >retrieving revision 1.13 >diff -u -r1.13 SearchData.java >--- src/org/eclipse/help/internal/webapp/data/SearchData.java 25 Aug 2010 17:38:38 -0000 1.13 >+++ src/org/eclipse/help/internal/webapp/data/SearchData.java 10 Jan 2011 23:07:14 -0000 >@@ -1,5 +1,5 @@ > /******************************************************************************* >- * Copyright (c) 2000, 2010 IBM Corporation and others. >+ * 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 >@@ -551,10 +551,15 @@ > return NLS.bind(ServletResources.getString("Nothing_found_in_scope", request), scope); //$NON-NLS-1$ > } > } >- >+ > public String getScopeActiveMessage() { > String scope = getScope(); >- return NLS.bind(ServletResources.getString("activeScope", request), scope); //$NON-NLS-1$ >+ return NLS.bind(ServletResources.getString("activeScope", request), scope); //$NON-NLS-1$ >+ } >+ >+ public String getMatchesInScopeMessage() { >+ String scope = getScope(); >+ return NLS.bind(ServletResources.getString("matchesInScope", request), "" + getResultsCount(), scope); //$NON-NLS-1$ //$NON-NLS-2$ > } > > /*
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 291105
:
177968
|
177969
|
177970
| 186445