hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303 from rivaldi8/single-search-box

Browse Source 
Single search box
This commit is contained in:
Mark H. Wood
2013-10-21 07:50:44 -07:00
parent a0e9d91de9 ae94bc4cba
commit 396f738a12
6 changed files with 10 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageSearch.java → dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/FrontPageFeeds.java
View File

@@ -18,35 +18,24 @@ import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.utils.UIException;
import org.dspace.app.xmlui.wing.Message;
import org.dspace.app.xmlui.wing.WingException;
import org.dspace.app.xmlui.wing.element.Body;
import org.dspace.app.xmlui.wing.element.Division;
import org.dspace.app.xmlui.wing.element.PageMeta;
import org.dspace.app.xmlui.wing.element.Para;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.ConfigurationManager;
import org.xml.sax.SAXException;
/**
* This simple component will add a Search Box. It is intended for use on the front page.
* This simple component will add feed links. It is intended for use on the front
* page.
*
* @author Scott Phillips
*/
public class FrontPageSearch extends AbstractDSpaceTransformer implements CacheableProcessingComponent
public class FrontPageFeeds extends AbstractDSpaceTransformer implements CacheableProcessingComponent
{
/** Language Strings */
public static final Message T_dspace_home =
message("xmlui.general.dspace_home");
private static final Message T_head =
message("xmlui.ArtifactBrowser.FrontPageSearch.head");
private static final Message T_para1 =
message("xmlui.ArtifactBrowser.FrontPageSearch.para1");
private static final Message T_go =
message("xmlui.general.go");
/**
* Generate the unique caching key.
@@ -95,20 +84,4 @@ public class FrontPageSearch extends AbstractDSpaceTransformer implements Cachea
}
}
}
public void addBody(Body body) throws SAXException, WingException,
UIException, SQLException, IOException, AuthorizeException
{
Division search =
body.addInteractiveDivision("front-page-search",contextPath+"/search",Division.METHOD_GET,"primary");
search.setHead(T_head);
search.addPara(T_para1);
Para fields = search.addPara();
fields.addText("query");
fields.addButton("submit").setValue(T_go);
}
}

31
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/discovery/SiteViewer.java
View File

@@ -18,16 +18,13 @@ import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.utils.UIException;
import org.dspace.app.xmlui.wing.Message;
import org.dspace.app.xmlui.wing.WingException;
import org.dspace.app.xmlui.wing.element.Body;
import org.dspace.app.xmlui.wing.element.Division;
import org.dspace.app.xmlui.wing.element.PageMeta;
import org.dspace.app.xmlui.wing.element.Para;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.ConfigurationManager;
import org.xml.sax.SAXException;
/**
* Adds a searchbox on the dspace home page
* Adds feed links on the DSpace home page
*
* @author Kevin Van de Velde (kevin at atmire dot com)
* @author Mark Diggory (markd at atmire dot com)
@@ -40,16 +37,6 @@ public class SiteViewer extends AbstractDSpaceTransformer implements CacheablePr
public static final Message T_dspace_home =
message("xmlui.general.dspace_home");
private static final Message T_head =
message("xmlui.ArtifactBrowser.FrontPageSearch.head");
private static final Message T_para1 =
message("xmlui.ArtifactBrowser.FrontPageSearch.para1");
private static final Message T_go =
message("xmlui.general.go");
/**
* Generate the unique caching key.
* This key must be unique inside the space of this component.
@@ -97,20 +84,4 @@ public class SiteViewer extends AbstractDSpaceTransformer implements CacheablePr
}
}
}
public void addBody(Body body) throws SAXException, WingException,
UIException, SQLException, IOException, AuthorizeException
{
Division search =
body.addInteractiveDivision("front-page-search",contextPath+"/discover",Division.METHOD_GET,"primary");
search.setHead(T_head);
search.addPara(T_para1);
Para fields = search.addPara();
fields.addText("query");
fields.addButton("submit").setValue(T_go);
}
}

4
dspace-xmlui/src/main/resources/aspects/ArtifactBrowser/sitemap.xmap
View File

@@ -35,7 +35,7 @@ and searching the repository.
<map:transformer name="FeedbackSent" src="org.dspace.app.xmlui.aspect.artifactbrowser.FeedbackSent"/>
<map:transformer name="Contact" src="org.dspace.app.xmlui.aspect.artifactbrowser.Contact"/>
<map:transformer name="RestrictedItem" src="org.dspace.app.xmlui.aspect.artifactbrowser.RestrictedItem"/>
<map:transformer name="FrontPageSearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.FrontPageSearch"/>
<map:transformer name="FrontPageFeeds" src="org.dspace.app.xmlui.aspect.artifactbrowser.FrontPageFeeds"/>
<map:transformer name="Statistics" src="org.dspace.app.xmlui.aspect.artifactbrowser.StatisticsViewer"/>
</map:transformers>
@@ -94,7 +94,7 @@ and searching the repository.
<map:transform type="Include" src="file://{dspace.dir}/config/news-xmlui.xml" />
</map:act>
<map:transform type="FrontPageSearch"/>
<map:transform type="FrontPageFeeds"/>
<map:transform type="CommunityBrowser">
<map:parameter name="depth" value="1"/>
</map:transform>

4
dspace-xmlui/src/main/resources/aspects/Discovery/sitemap.xmap
View File

@@ -26,7 +26,7 @@ and searching the repository.
<map:transformer name="SimpleSearch" src="org.dspace.app.xmlui.aspect.discovery.SimpleSearch"/>
<map:transformer name="BrowseFacet" src="org.dspace.app.xmlui.aspect.discovery.BrowseFacet"/>
<map:transformer name="SearchFacetFilter" src="org.dspace.app.xmlui.aspect.discovery.SearchFacetFilter"/>
<map:transformer name="FrontPageSearch" src="org.dspace.app.xmlui.aspect.discovery.SiteViewer"/>
<map:transformer name="FrontPageFeeds" src="org.dspace.app.xmlui.aspect.discovery.SiteViewer"/>
<map:transformer name="SiteRecentSubmissions" src="org.dspace.app.xmlui.aspect.discovery.SiteRecentSubmissions"/>
<map:transformer name="SidebarFacetsTransformer" src="org.dspace.app.xmlui.aspect.discovery.SidebarFacetsTransformer"/>
@@ -81,7 +81,7 @@ and searching the repository.
-->
<map:match pattern="">
<map:transform type="SidebarFacetsTransformer"/>
<map:transform type="FrontPageSearch"/>
<map:transform type="FrontPageFeeds"/>
<map:transform type="SiteRecentSubmissions"/>

4
dspace-xmlui/src/main/resources/aspects/SearchArtifacts/sitemap.xmap
View File

@@ -24,7 +24,7 @@ and searching the repository.
<map:transformer name="Navigation" src="org.dspace.app.xmlui.aspect.searchArtifacts.Navigation"/>
<map:transformer name="SimpleSearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.SimpleSearch"/>
<map:transformer name="AdvancedSearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.AdvancedSearch"/>
<map:transformer name="FrontPageSearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.FrontPageSearch"/>
<map:transformer name="FrontPageFeeds" src="org.dspace.app.xmlui.aspect.artifactbrowser.FrontPageFeeds"/>
<map:transformer name="CommunitySearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.CommunitySearch"/>
<map:transformer name="CollectionSearch" src="org.dspace.app.xmlui.aspect.artifactbrowser.CollectionSearch"/>
@@ -81,7 +81,7 @@ and searching the repository.
along with a list of top level communities in DSpace.
-->
<map:match pattern="">
<map:transform type="FrontPageSearch"/>
<map:transform type="FrontPageFeeds"/>
</map:match>

4
dspace-xmlui/src/main/webapp/i18n/messages.xml
View File

@@ -238,10 +238,6 @@
<message key="xmlui.ArtifactBrowser.FeedbackSent.head">Feedback sent</message>
<message key="xmlui.ArtifactBrowser.FeedbackSent.para1">Your comments have been received.</message>
<!-- org.dspace.app.xmlui.artifactbrowser.FrontPageSearch.java -->
<message key="xmlui.ArtifactBrowser.FrontPageSearch.head">Search DSpace</message>
<message key="xmlui.ArtifactBrowser.FrontPageSearch.para1">Enter some text in the box below to search DSpace.</message>
<!-- org.dspace.app.xmlui.artifactbrowser.ItemViewer.java -->
<message key="xmlui.ArtifactBrowser.ItemViewer.trail">View Item</message>
<message key="xmlui.ArtifactBrowser.ItemViewer.head_parent_collections">This item appears in the following Collection(s)</message>