Changeset 37005 for main

Timestamp:

2022-12-09T22:47:23+13:00 (17 months ago)

Author:

davidb

Message:

Introduction of documentPost to balance out documentPre; change to use Image rather than Source/SourceFile in places where images are to be displayed in the browser (Source might be a format such as TIFF that a browser cannot display, however Image can be controlled by the collectinConfig.xml file to be web friendly

File:

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

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

@@ -18 +18 @@
     <!-- We technically need this include. However, it is imported with toc.xsl -->
     <!-- <xsl:include href="document-shared.xsl" /> -->
-    
+
+    <xsl:variable name="docID" select="/page/pageRequest/paramList/param[@name='d']/@value"/>
+
     <xsl:variable name="bookswitch">
         <xsl:choose>
@@ -87 +89 @@
                 <xsl:call-template name="documentNodeText"/>
             </div>
+            <xsl:call-template name="documentPost"/>
         </div>
     </xsl:template>
@@ -478 +481 @@
                     </xsl:choose>
                   </div>
+                  <xsl:call-template name="documentPost"/>                
                 </div>
             </xsl:when>
@@ -508 +512 @@
                         </xsl:for-each>
                     </div>
+                    <xsl:call-template name="documentPost"/>                    
                 </div>
             </xsl:when>
@@ -634 +639 @@
 
         <xsl:choose>
-          <xsl:when test="metadataList/metadata[@name = 'Screen'] and metadataList/metadata[@name = 'SourceFile'] and ($imageWidth div $screenImageWidth > 1.2) and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']) or /page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']/@value='false')">
+          <!-- **** Should the test of 'Source' perhaps be changed to 'Image' to be more consistent with usage else where for showing an web friendy Image-->
+          <xsl:when test="metadataList/metadata[@name = 'Screen'] and metadataList/metadata[@name = 'Source'] and ($imageWidth div $screenImageWidth > 1.2) and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']) or /page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']/@value='false')">
             <gsf:div id="tidyDiv" />
             <!-- adding a div with clear:both when the image doesn't nicely fit in beside the side bar. Otherwise, the divs stays up, but the image moves down and everything looks and acts weird. -->
@@ -660 +666 @@
                             </div>
                             <div id="large{util:replace(@nodeID, '.', '_')}" style="position: relative; width: {$imageWidth}px; height: {$imageHeight}px;">
-                                <gsf:link type="source"><gsf:image type="source"/></gsf:link>
+                                <gsf:link type="source"><gsf:image type="image"/></gsf:link>
                             </div>
                         </div>
@@ -797 +803 @@
         </xsl:if>
     </xsl:template>
-    
+
+    <xsl:template name="documentPost">
+      <!-- empty by default, to be overridden as needed -->
+    </xsl:template>
+
+
     <xsl:template name="mapFeatures">
         <div id="map_canvas" class="map_canvas_full"><xsl:text> </xsl:text></div>