Changeset 36041

Timestamp:

2022-02-03T10:25:35+13:00 (2 years ago)

Author:

cstephen

Message:

Imlpement shared document templates so that the TOC can be used outside of a document

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• layouts/toc.xsl (modified) (1 diff)
• pages/document-shared.xsl (added)
• pages/document.xsl (modified) (4 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/toc.xsl

@@ -8 +8 @@
     extension-element-prefixes="java util"
     exclude-result-prefixes="java util gsf">
+
+    <xsl:include href="../pages/document-shared.xsl" />
 
     <xsl:template name="rightSidebarTOC">

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

@@ -15 +15 @@
     <!-- templates for adding user comments -->
     <xsl:import href="layouts/usercomments.xsl"/>
+
+    <!-- We technically need this include. However, it is imported with toc.xsl -->
+    <!-- <xsl:include href="document-shared.xsl" /> -->
     
     <xsl:variable name="bookswitch">
@@ -84 +87 @@
             </div>
         </div>
-    </xsl:template> 
-
-    <xsl:template name="sectionHeading">
-        <xsl:call-template name="sectionTitle"/>
     </xsl:template>
     
@@ -627 +626 @@
     </xsl:template>
     
-    
-    <!-- The default template for displaying section titles -->
-    <xsl:template name="sectionTitle">
-      <!--<xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Title']"/>
--->   <gsf:metadata name="Title" highlight="true"/><!-- allows search term highlighting in section titles-->
-    </xsl:template>
-    
     <xsl:template name="wrappedSectionImage">
         <gsf:variable name="screenImageWidth"><gsf:metadata name="ScreenWidth"/></gsf:variable>
@@ -737 +729 @@
         <xsl:text> </xsl:text>
     </xsl:template>
-
-    <!-- display the text content of a node (content node or metadata node), marking up the annotations -->
-    <xsl:template name="displayMarkedUpTextAndAnnotations">
-      <xsl:variable name="annotation_class">
-        <xsl:choose>
-          <xsl:when test="/page/pageRequest/paramList/param[@name = 'hl']/@value = 'off' or /page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true'">noTermHighlight</xsl:when>
-          <xsl:otherwise>termHighlight</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:for-each select="node()">
-        <xsl:choose>
-          <xsl:when test="not(name())">
-        <xsl:value-of select="." disable-output-escaping="yes"/>
-          </xsl:when>
-          <xsl:when test="name() = 'annotation'">
-        <span class="{$annotation_class}"><xsl:value-of select="."/></span>
-          </xsl:when>
-          <xsl:otherwise>
-        <xsl:apply-templates/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:template>
-
     
     <!-- The default template for displaying the document node text in