facets = resp.getFacetResult(facetField);
+ Comparator comparator = new SolrBrowseDAO.FacetValueComparator();
+ Collections.sort(facets, comparator);
+ int x = Collections.binarySearch(facets, value, comparator);
+ int ascValue = (x >= 0) ? x : -(x + 1);
+ if (isAscending)
+ {
+ return ascValue;
+ }
+ else
+ {
+ return doCountQuery() - ascValue;
+ }
+ }
+
+ @Override
+ public boolean isEnableBrowseFrequencies()
+ {
+ return showFrequencies;
+ }
+
+ @Override
+ public void setEnableBrowseFrequencies(boolean enableBrowseFrequencies)
+ {
+ showFrequencies = enableBrowseFrequencies;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getContainerID()
+ */
+ @Override
+ public UUID getContainerID()
+ {
+ return containerID;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getContainerIDField()
+ */
+ @Override
+ public String getContainerIDField()
+ {
+ return containerIDField;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getContainerTable()
+ */
+ @Override
+ public String getContainerTable()
+ {
+ return containerTable;
+ }
+
+ // FIXME is this in use?
+ @Override
+ public String[] getCountValues()
+ {
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getFocusField()
+ */
+ @Override
+ public String getJumpToField()
+ {
+ return focusField;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getFocusValue()
+ */
+ @Override
+ public String getJumpToValue()
+ {
+ return focusValue;
+ }
+
+ @Override
+ public void setStartsWith(String startsWith) {
+ sResponse = null;
+ this.startsWith = startsWith;
+ }
+
+ @Override
+ public String getStartsWith() {
+ return startsWith;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getLimit()
+ */
+ @Override
+ public int getLimit()
+ {
+ return limit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getOffset()
+ */
+ @Override
+ public int getOffset()
+ {
+ return offset;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getOrderField()
+ */
+ @Override
+ public String getOrderField()
+ {
+ return orderField;
+ }
+
+ // is this in use?
+ @Override
+ public String[] getSelectValues()
+ {
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getTable()
+ */
+ @Override
+ public String getTable()
+ {
+ return table;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getValue()
+ */
+ @Override
+ public String getFilterValue()
+ {
+ return value;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#getValueField()
+ */
+ @Override
+ public String getFilterValueField()
+ {
+ return valueField;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#isAscending()
+ */
+ @Override
+ public boolean isAscending()
+ {
+ return ascending;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#isDistinct()
+ */
+ @Override
+ public boolean isDistinct()
+ {
+ return this.distinct;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setAscending(boolean)
+ */
+ @Override
+ public void setAscending(boolean ascending)
+ {
+ this.ascending = ascending;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setContainerID(int)
+ */
+ @Override
+ public void setContainerID(UUID containerID)
+ {
+ this.containerID = containerID;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setContainerIDField(java.lang.String)
+ */
+ @Override
+ public void setContainerIDField(String containerIDField)
+ {
+ this.containerIDField = containerIDField;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setContainerTable(java.lang.String)
+ */
+ @Override
+ public void setContainerTable(String containerTable)
+ {
+ this.containerTable = containerTable;
+
+ }
+
+ // is this in use?
+ @Override
+ public void setCountValues(String[] fields)
+ {
+ // this.countValues = fields;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setDistinct(boolean)
+ */
+ @Override
+ public void setDistinct(boolean bool)
+ {
+ this.distinct = bool;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setEqualsComparator(boolean)
+ */
+ @Override
+ public void setEqualsComparator(boolean equalsComparator)
+ {
+ this.equalsComparator = equalsComparator;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setFocusField(java.lang.String)
+ */
+ @Override
+ public void setJumpToField(String focusField)
+ {
+ this.focusField = focusField;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setFocusValue(java.lang.String)
+ */
+ @Override
+ public void setJumpToValue(String focusValue)
+ {
+ this.focusValue = focusValue;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setLimit(int)
+ */
+ @Override
+ public void setLimit(int limit)
+ {
+ this.limit = limit;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setOffset(int)
+ */
+ @Override
+ public void setOffset(int offset)
+ {
+ this.offset = offset;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setOrderField(java.lang.String)
+ */
+ @Override
+ public void setOrderField(String orderField)
+ {
+ this.orderField = orderField;
+
+ }
+
+ // is this in use?
+ @Override
+ public void setSelectValues(String[] selectValues)
+ {
+ // this.selectValues = selectValues;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setTable(java.lang.String)
+ */
+ @Override
+ public void setTable(String table)
+ {
+ if (table.equals(BrowseIndex.getWithdrawnBrowseIndex().getTableName()))
+ {
+ itemsWithdrawn = true;
+ }
+ else if (table.equals(BrowseIndex.getPrivateBrowseIndex().getTableName()))
+ {
+ itemsDiscoverable = false;
+ }
+ facetField = table;
+ }
+
+ @Override
+ public void setFilterMappingTables(String tableDis, String tableMap)
+ {
+ if (tableDis != null)
+ {
+ this.facetField = tableDis;
+ }
+ // this.fields = tableDis;
+ // this.tableMap = tableMap;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setValue(java.lang.String)
+ */
+ @Override
+ public void setFilterValue(String value)
+ {
+ this.value = value;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setFilterValuePartial(boolean)
+ */
+ @Override
+ public void setFilterValuePartial(boolean part)
+ {
+ this.valuePartial = part;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#setValueField(java.lang.String)
+ */
+ @Override
+ public void setFilterValueField(String valueField)
+ {
+ this.valueField = valueField;
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.dspace.browse.BrowseDAO#useEqualsComparator()
+ */
+ @Override
+ public boolean useEqualsComparator()
+ {
+ return equalsComparator;
+ }
+
+ @Override
+ public String getAuthorityValue()
+ {
+ return authority;
+ }
+
+ @Override
+ public void setAuthorityValue(String value)
+ {
+ this.authority = value;
+ }
+}
diff --git a/dspace/modules/additions/src/main/java/org/dspace/content/Community.java b/dspace/modules/additions/src/main/java/org/dspace/content/Community.java
new file mode 100644
index 0000000000..d8626dd082
--- /dev/null
+++ b/dspace/modules/additions/src/main/java/org/dspace/content/Community.java
@@ -0,0 +1,274 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.content;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.log4j.Logger;
+import org.dspace.content.comparator.NameAscendingComparator;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.CommunityService;
+import org.dspace.core.*;
+import org.dspace.eperson.Group;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.proxy.HibernateProxyHelper;
+
+import javax.persistence.*;
+import java.util.*;
+
+/**
+ * Class representing a community
+ *
+ * The community's metadata (name, introductory text etc.) is loaded into'
+ * memory. Changes to this metadata are only reflected in the database after
+ * update is called.
+ *
+ * @author Robert Tansley
+ * @version $Revision$
+ */
+@Entity
+@Table(name="community")
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy")
+public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
+{
+ /** log4j category */
+ private static final Logger log = Logger.getLogger(Community.class);
+
+ @Column(name="community_id", insertable = false, updatable = false)
+ private Integer legacyId;
+
+ @ManyToMany(fetch = FetchType.LAZY)
+ @JoinTable(
+ name = "community2community",
+ joinColumns = {@JoinColumn(name = "parent_comm_id") },
+ inverseJoinColumns = {@JoinColumn(name = "child_comm_id") }
+ )
+ private Set subCommunities = new HashSet<>();
+
+ @ManyToMany(fetch = FetchType.LAZY, mappedBy = "subCommunities")
+ private Set parentCommunities = new HashSet<>();
+
+ @ManyToMany(fetch = FetchType.LAZY, mappedBy = "communities", cascade = {CascadeType.PERSIST})
+ private Set collections = new HashSet<>();
+
+ @OneToOne
+ @JoinColumn(name = "admin")
+ /** The default group of administrators */
+ private Group admins;
+
+ /** The logo bitstream */
+ @OneToOne
+ @JoinColumn(name = "logo_bitstream_id")
+ private Bitstream logo = null;
+
+ // Keys for accessing Community metadata
+ public static final String COPYRIGHT_TEXT = "copyright_text";
+ public static final String INTRODUCTORY_TEXT = "introductory_text";
+ public static final String SHORT_DESCRIPTION = "short_description";
+ public static final String SIDEBAR_TEXT = "side_bar_text";
+
+ @Transient
+ protected transient CommunityService communityService;
+
+ /**
+ * Protected constructor, create object using:
+ * {@link org.dspace.content.service.CommunityService#create(Community, Context)}
+ * or
+ * {@link org.dspace.content.service.CommunityService#create(Community, Context, String)}
+ *
+ */
+ protected Community()
+ {
+
+ }
+
+ void addSubCommunity(Community subCommunity)
+ {
+ subCommunities.add(subCommunity);
+ setModified();
+ }
+
+ public void removeSubCommunity(Community subCommunity)
+ {
+ subCommunities.remove(subCommunity);
+ setModified();
+ }
+
+ /**
+ * Get the logo for the community. null is return if the
+ * community does not have a logo.
+ *
+ * @return the logo of the community, or null
+ */
+ public Bitstream getLogo()
+ {
+ return logo;
+ }
+
+ void setLogo(Bitstream logo) {
+ this.logo = logo;
+ setModified();
+ }
+
+ /**
+ * Get the default group of administrators, if there is one. Note that the
+ * authorization system may allow others to be administrators for the
+ * community.
+ *
+ * The default group of administrators for community 100 is the one called
+ * community_100_admin.
+ *
+ * @return group of administrators, or null if there is no
+ * default group.
+ */
+ public Group getAdministrators()
+ {
+ return admins;
+ }
+
+ void setAdmins(Group admins) {
+ this.admins = admins;
+ setModified();
+ }
+
+ /**
+ * Get the collections in this community. Throws an SQLException because
+ * creating a community object won't load in all collections.
+ *
+ * @return array of Collection objects
+ */
+ public List getCollections()
+ {
+ // We return a copy because we do not want people to add elements to this collection directly.
+ // We return a list to maintain backwards compatibility
+ Collection[] output = collections.toArray(new Collection[]{});
+ Arrays.sort(output, new NameAscendingComparator());
+ return Arrays.asList(output);
+ }
+
+ void addCollection(Collection collection)
+ {
+ collections.add(collection);
+ }
+
+ void removeCollection(Collection collection)
+ {
+ collections.remove(collection);
+ }
+
+ /**
+ * Get the immediate sub-communities of this community. Throws an
+ * SQLException because creating a community object won't load in all
+ * collections.
+ *
+ * @return array of Community objects
+ */
+ public List getSubcommunities()
+ {
+ // We return a copy because we do not want people to add elements to this collection directly.
+ // We return a list to maintain backwards compatibility
+ Community[] output = subCommunities.toArray(new Community[]{});
+ Arrays.sort(output, new NameAscendingComparator());
+ return Arrays.asList(output);
+ }
+
+ /**
+ * Return the parent community of this community, or null if the community
+ * is top-level
+ *
+ * @return the immediate parent community, or null if top-level
+ */
+ public List getParentCommunities()
+ {
+ // We return a copy because we do not want people to add elements to this collection directly.
+ // We return a list to maintain backwards compatibility
+ Community[] output = parentCommunities.toArray(new Community[]{});
+ Arrays.sort(output, new NameAscendingComparator());
+ return Arrays.asList(output);
+ }
+
+ void addParentCommunity(Community parentCommunity) {
+ parentCommunities.add(parentCommunity);
+ }
+
+ void clearParentCommunities(){
+ parentCommunities.clear();
+ }
+
+ public void removeParentCommunity(Community parentCommunity)
+ {
+ parentCommunities.remove(parentCommunity);
+ setModified();
+ }
+
+ /**
+ * Return true if other is the same Community
+ * as this object, false otherwise
+ *
+ * @param other
+ * object to compare to
+ *
+ * @return true if object passed in represents the same
+ * community as this object
+ */
+ @Override
+ public boolean equals(Object other)
+ {
+ if (other == null)
+ {
+ return false;
+ }
+ Class objClass = HibernateProxyHelper.getClassWithoutInitializingProxy(other);
+ if (this.getClass() != objClass)
+ {
+ return false;
+ }
+ final Community otherCommunity = (Community) other;
+ if (!this.getID().equals(otherCommunity.getID() ))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder().append(getID()).toHashCode();
+ }
+
+ /**
+ * return type found in Constants
+ * @return Community type
+ */
+ @Override
+ public int getType()
+ {
+ return Constants.COMMUNITY;
+ }
+
+ @Override
+ public String getName() {
+ String value = getCommunityService().getMetadataFirstValue(this, MetadataSchema.DC_SCHEMA, "title", null, Item.ANY);
+ return value == null ? "" : value;
+ }
+
+ @Override
+ public Integer getLegacyId() {
+ return legacyId;
+ }
+
+ private CommunityService getCommunityService() {
+ if(communityService == null)
+ {
+ communityService = ContentServiceFactory.getInstance().getCommunityService();
+ }
+ return communityService;
+ }
+}
\ No newline at end of file
diff --git a/dspace/modules/additions/src/main/java/org/dspace/sort/OrderFormatAuthor.java b/dspace/modules/additions/src/main/java/org/dspace/sort/OrderFormatAuthor.java
new file mode 100644
index 0000000000..0d41a3fb53
--- /dev/null
+++ b/dspace/modules/additions/src/main/java/org/dspace/sort/OrderFormatAuthor.java
@@ -0,0 +1,28 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.sort;
+
+import org.dspace.text.filter.DecomposeDiactritics;
+import org.dspace.text.filter.LowerCaseAndTrim;
+import org.dspace.text.filter.StripDiacritics;
+import org.dspace.text.filter.TextFilter;
+import org.dspace.sort.AbstractTextFilterOFD;
+
+/**
+ * Standard author ordering delegate implementation
+ *
+ * @author Graham Triggs
+ */
+public class OrderFormatAuthor extends AbstractTextFilterOFD
+{
+ {
+ filters = new TextFilter[] { new DecomposeDiactritics(),
+ new StripDiacritics(),
+ new LowerCaseAndTrim() };
+ }
+}
diff --git a/dspace/modules/additions/src/main/java/org/dspace/sort/OrderFormatText.java b/dspace/modules/additions/src/main/java/org/dspace/sort/OrderFormatText.java
new file mode 100644
index 0000000000..85b86a27cb
--- /dev/null
+++ b/dspace/modules/additions/src/main/java/org/dspace/sort/OrderFormatText.java
@@ -0,0 +1,28 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.sort;
+
+import org.dspace.text.filter.DecomposeDiactritics;
+import org.dspace.text.filter.StripDiacritics;
+import org.dspace.text.filter.LowerCaseAndTrim;
+import org.dspace.text.filter.TextFilter;
+import org.dspace.sort.AbstractTextFilterOFD;
+
+/**
+ * Standard text ordering delegate implementation
+ *
+ * @author Graham Triggs
+ */
+public class OrderFormatText extends AbstractTextFilterOFD
+{
+ {
+ filters = new TextFilter[] { new DecomposeDiactritics(),
+ new StripDiacritics(),
+ new LowerCaseAndTrim() };
+ }
+}
diff --git a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/images/favicon.ico b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/images/favicon.ico
index 7274e66518..f353a5f98c 100644
Binary files a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/images/favicon.ico and b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/images/favicon.ico differ
diff --git a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/_style.scss b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/_style.scss
index 953079fe1e..0f7e03b071 100644
--- a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/_style.scss
+++ b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/_style.scss
@@ -69,6 +69,10 @@ width:200px;
font-weight: 900;
}
+.a-ul {
+text-decoration: underline;
+}
+
// Altmetric styles
.altmetric-embed {
padding-top: 25px;
diff --git a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/classic_mirage_color_scheme/_bootstrap_variables.scss b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/classic_mirage_color_scheme/_bootstrap_variables.scss
index 3a9b9e5c47..53b4243c78 100644
--- a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/classic_mirage_color_scheme/_bootstrap_variables.scss
+++ b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/styles/classic_mirage_color_scheme/_bootstrap_variables.scss
@@ -10,15 +10,16 @@
// ----------------------
// VT Colors
-$chicago-maroon: #660000;
-$burnt-orange: #ff6600;
+$chicago-maroon: #861F41;
+$burnt-orange: #C64600;
+$vt-blue-4t: #668AAA;
// Web accessibility 2.0 compatible colors
$gray-on-almost-white-aim: #494949;
$gray-on-white-aim: #4c4c4c;
-$content-link: #8c5206;
-$content-link-hover: #12252c;
+$content-link: $burnt-orange;
+$content-link-hover: $vt-blue-4t;
$content-text: #000000;
$brand-primary: $chicago-maroon;
diff --git a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/xsl/core/page-structure.xsl b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/xsl/core/page-structure.xsl
index ce6e838926..677f40ea0e 100644
--- a/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/xsl/core/page-structure.xsl
+++ b/dspace/modules/xmlui-mirage2/src/main/webapp/themes/vtmirage2/xsl/core/page-structure.xsl
@@ -879,16 +879,15 @@
-
-
+
+
+
diff --git a/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java b/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
index cbae891f05..b467f7f2bf 100644
--- a/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
+++ b/dspace/modules/xmlui/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/ConfigurableBrowse.java
@@ -24,9 +24,11 @@
import org.dspace.app.xmlui.wing.Message;
import org.dspace.app.xmlui.wing.WingException;
import org.dspace.app.xmlui.wing.element.*;
+import org.dspace.app.xmlui.wing.element.List;
import org.dspace.authorize.AuthorizeException;
import org.dspace.browse.*;
import org.dspace.content.*;
+import org.dspace.content.Collection;
import org.dspace.content.Item;
import org.dspace.content.authority.factory.ContentAuthorityServiceFactory;
import org.dspace.content.authority.service.ChoiceAuthorityService;
@@ -41,10 +43,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* Implements all the browse functionality (browse by title, subject, authors,
@@ -1101,7 +1100,10 @@ Map getControlParameters() throws UIException
paramMap.put(BrowseParams.RESULTS_PER_PAGE, Integer
.toString(this.scope.getResultsPerPage()));
paramMap.put(BrowseParams.ETAL, Integer.toString(this.etAl));
-
+ if (this.scope.hasStartsWith()) {
+ paramMap.put(BrowseParams.STARTS_WITH, this.scope.getStartsWith());
+ }
+
return paramMap;
}
diff --git a/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml b/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml
index 01f322128c..4460dd852f 100644
--- a/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml
+++ b/dspace/modules/xmlui/src/main/resources/aspects/Discovery/i18n/messages.xml
@@ -51,7 +51,6 @@
Committee Member
Thesis Degree Level
Department
- Series
Patent Type
Inventor
Assignee
@@ -87,6 +86,7 @@
Series
+
Browsing by: Author
Browsing by: Title
Browsing by: Subject
@@ -109,15 +109,21 @@
Browsing by: Department
Browsing by: Issue date
+
Title
Date issued
Keyword
Abstract
- Series
- Mime-Type
- Sponsor
+ Call Number
Identifier
+ Journal Title
Language (ISO)
+ Publisher
+ Rights
+ Sponsor
+ Series
+ Version
+ Mime-Type
Coverage
Technical Report No.
Committee Member
@@ -138,6 +144,7 @@
Now showing items {0}-{1}
+
Filter by: Author
Author
Author
@@ -160,8 +167,6 @@
Filter by: Assignee
Filter by: Inventor
Filter by: Patent Type
- Date Issued
-
Starts with
Or enter first few letters:
diff --git a/dspace/modules/xmlui/src/main/webapp/i18n/messages.xml b/dspace/modules/xmlui/src/main/webapp/i18n/messages.xml
index bd193b85b6..832bfb18bd 100644
--- a/dspace/modules/xmlui/src/main/webapp/i18n/messages.xml
+++ b/dspace/modules/xmlui/src/main/webapp/i18n/messages.xml
@@ -1586,8 +1586,9 @@
Metadata Files
Thumbnails
Licenses
- Movie Posters
+ Movie Posters
Creative Commons Licenses
+ SWORD
File
Please enter the name of the file on your computer corresponding to your item. If you click "Browse...", a new window will appear in which you can locate and select the file from your computer.
Description