DS-847 Fix items without titles in browse and item display page.

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6666 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Peter Dietz
2011-09-08 21:54:08 +00:00
parent 2e38c44051
commit 9c7d06fe37
2 changed files with 15 additions and 7 deletions

View File

@@ -117,7 +117,7 @@
</xsl:choose> </xsl:choose>
</xsl:attribute> </xsl:attribute>
<xsl:choose> <xsl:choose>
<xsl:when test="dim:field[@element='title']"> <xsl:when test="dim:field[@element='title'] and (string-length(dim:field[@element='title']) &gt; 0)">
<xsl:value-of select="dim:field[@element='title'][1]/node()"/> <xsl:value-of select="dim:field[@element='title'][1]/node()"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>

View File

@@ -266,8 +266,8 @@
<xsl:variable name="page_title" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']" /> <xsl:variable name="page_title" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']" />
<title> <title>
<xsl:choose> <xsl:choose>
<xsl:when test="not($page_title)"> <xsl:when test="not($page_title) or (string-length($page_title) &lt; 1)">
<xsl:text> </xsl:text> <i18n:text>xmlui.dri2xhtml.METS-1.0.no-title</i18n:text>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:copy-of select="$page_title/node()" /> <xsl:copy-of select="$page_title/node()" />
@@ -303,9 +303,9 @@
</a> </a>
<h1 class="pagetitle"> <h1 class="pagetitle">
<xsl:choose> <xsl:choose>
<!-- protectiotion against an empty page title --> <!-- protection against an empty page title -->
<xsl:when test="not(/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title'])"> <xsl:when test="not(/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']) or (string-length(/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']) &lt; 1)">
<xsl:text> </xsl:text> <i18n:text>xmlui.dri2xhtml.METS-1.0.no-title</i18n:text>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:copy-of select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']/node()"/> <xsl:copy-of select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='title']/node()"/>
@@ -1554,7 +1554,15 @@
<xsl:call-template name="standardAttributes"> <xsl:call-template name="standardAttributes">
<xsl:with-param name="class">ds-div-head</xsl:with-param> <xsl:with-param name="class">ds-div-head</xsl:with-param>
</xsl:call-template> </xsl:call-template>
<xsl:choose>
<xsl:when test="string-length(./node()) &lt; 1">
<i18n:text>xmlui.dri2xhtml.METS-1.0.no-title</i18n:text>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates /> <xsl:apply-templates />
</xsl:otherwise>
</xsl:choose>
</xsl:element> </xsl:element>
</xsl:template> </xsl:template>