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

Merge pull request #630 from atmire/DS-2134

Browse Source 
DS-2134 missing configuration properties for mirage2
This commit is contained in:
Bram Luyten
2014-10-31 23:40:36 +01:00
parent c3d64ef956 ea36245c40
commit 06358d17f8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dspace-xmlui-mirage2/src/main/webapp/xsl/aspect/artifactbrowser/item-view.xsl
View File

@@ -334,8 +334,8 @@
<xsl:variable name="label-1"> <xsl:variable name="label-1">
<xsl:choose> <xsl:choose>
<xsl:when test="confman:getProperty('mirage2','item-view.bitstream.href.label.1')"> <xsl:when test="confman:getProperty('mirage2.item-view.bitstream.href.label.1')">
<xsl:value-of select="confman:getProperty('mirage2','item-view.bitstream.href.label.1')"/> <xsl:value-of select="confman:getProperty('mirage2.item-view.bitstream.href.label.1')"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:text>label</xsl:text> <xsl:text>label</xsl:text>
@@ -345,8 +345,8 @@
<xsl:variable name="label-2"> <xsl:variable name="label-2">
<xsl:choose> <xsl:choose>
<xsl:when test="confman:getProperty('mirage2','item-view.bitstream.href.label.2')"> <xsl:when test="confman:getProperty('mirage2.item-view.bitstream.href.label.2')">
<xsl:value-of select="confman:getProperty('mirage2','item-view.bitstream.href.label.2')"/> <xsl:value-of select="confman:getProperty('mirage2.item-view.bitstream.href.label.2')"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:text>title</xsl:text> <xsl:text>title</xsl:text>
@@ -368,16 +368,16 @@
</xsl:with-param> </xsl:with-param>
</xsl:call-template> </xsl:call-template>
<xsl:choose> <xsl:choose>
<xsl:when test="contains($label-1, 'label') and mets:FLocat[@LOCTYPE='URL']/@xlink:label"> <xsl:when test="contains($label-1, 'label') and string-length(mets:FLocat[@LOCTYPE='URL']/@xlink:label)!=0">
<xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:label"/> <xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:label"/>
</xsl:when> </xsl:when>
<xsl:when test="contains($label-1, 'title') and mets:FLocat[@LOCTYPE='URL']/@xlink:title"> <xsl:when test="contains($label-1, 'title') and string-length(mets:FLocat[@LOCTYPE='URL']/@xlink:title)!=0">
<xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:title"/> <xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:title"/>
</xsl:when> </xsl:when>
<xsl:when test="contains($label-2, 'label') and mets:FLocat[@LOCTYPE='URL']/@xlink:label"> <xsl:when test="contains($label-2, 'label') and string-length(mets:FLocat[@LOCTYPE='URL']/@xlink:label)!=0">
<xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:label"/> <xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:label"/>
</xsl:when> </xsl:when>
<xsl:when test="contains($label-2, 'title') and mets:FLocat[@LOCTYPE='URL']/@xlink:title"> <xsl:when test="contains($label-2, 'title') and string-length(mets:FLocat[@LOCTYPE='URL']/@xlink:title)!=0">
<xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:title"/> <xsl:value-of select="mets:FLocat[@LOCTYPE='URL']/@xlink:title"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>

6
dspace/config/dspace.cfg
View File

@@ -1994,6 +1994,12 @@ webui.suggest.enable = false
# (metdata is the default value if this option is not specified) # (metdata is the default value if this option is not specified)
#xmlui.theme.mirage.item-list.emphasis = file #xmlui.theme.mirage.item-list.emphasis = file
### Settings for the Item page in Mirage2 theme ###
# Whether the title or the label of a file should be used to display it on the item page
mirage2.item-view.bitstream.href.label.1 = label
# Whether the title or the label of a file should be used as a fallback to display it on the item page
mirage2.item-view.bitstream.href.label.2 = title
# Determine which bundles administrators and collection administrators may upload # Determine which bundles administrators and collection administrators may upload
# into an existing item through the administrative interface. If the user does not # into an existing item through the administrative interface. If the user does not
# have the appropriate privileges (add & write) on the bundle then that bundle will # have the appropriate privileges (add & write) on the bundle then that bundle will