Changeset 28622 for main/trunk

Timestamp:

2013-11-14T11:18:43+13:00 (10 years ago)

Author:

jlwhisler

Message:

Updated display page so that, for documents with no text that are not images, the filename will appear with a link to the source file (instead of nothing appearing at all). Also added source links to the images (so it's possible to see the full-size image directly from the display page by default.)

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -457 +457 @@
                     <div id="wrap{util:replace(@nodeID, '.', '_')}" class="zoomImage" style="position:relative; width: {$screenImageWidth}px; height: {$screenImageHeight}px;">
                         <div id="small{util:replace(@nodeID, '.', '_')}" style="position:relative; width: {$screenImageWidth}px; height: {$screenImageHeight}px;">
-                            <gsf:image type="screen"/>
+                            <gsf:link type="source"><gsf:image type="screen"/></gsf:link>
                         </div>
                         <div id="mover{util:replace(@nodeID, '.', '_')}" style="border: 1px solid green; position: absolute; top: 0; left: 0; width: 598px; height: 598px; overflow: hidden; z-index: 100; background: white; display: none;">
@@ -464 +464 @@
                             </div>
                             <div id="large{util:replace(@nodeID, '.', '_')}" style="position: relative; width: {$imageWidth}px; height: {$imageHeight}px;">
-                                <gsf:image type="source"/>
+                                <gsf:link type="source"><gsf:image type="source"/></gsf:link>
                             </div>
                         </div>
@@ -518 +518 @@
         <!-- Hides the "This document has no text." message -->
         <xsl:variable name="noText"><gsf:metadata name="NoText"/></xsl:variable>
-        <xsl:if test="not($noText = '1')">
+        <xsl:choose>
+        <xsl:when test="not($noText = '1')">
+
             <!-- Section text -->
             <xsl:for-each select="nodeContent">
@@ -535 +537 @@
                 </xsl:for-each>
             </xsl:for-each>
-        </xsl:if><xsl:text> </xsl:text>
+        </xsl:when>
+        <xsl:when test="$noText = '1' and not(metadataList/metadata[@name='Image'])">
+            <gsf:link type="source"><gsf:metadata name="Source"/></gsf:link>
+        </xsl:when>
+        </xsl:choose>
+        <xsl:text> </xsl:text>
     </xsl:template>