Changeset 26043 for main/trunk

Timestamp:

2012-07-31T14:45:16+12:00 (12 years ago)

Author:

ak19

Message:

Belongs with commit 26038 (changes to Action.java): 1. gsf:link type=equivdoc now gets expanded to the same as gsf:equivlinkgs3. Used in the Associated Files Example tutorial. 2. Thanks to Sam, the gsf:link type=web (with icon of type web too) now works as well. This simplifies and streamlines the format statement for the Pointing To Docs On Web tutorial.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/config_format.xsl

@@ -87 +87 @@
                   <xsl:apply-templates/>
                 </a>
+            </xsl:when>
+            <xsl:when test="@type='web'">
+              <xslt:value-of disable-output-escaping="yes" select="metadataList/metadata[contains(@name, 'weblink')]"/>
+              <xsl:apply-templates/>
+              <xslt:value-of disable-output-escaping="yes" select="metadataList/metadata[contains(@name, '/weblink')]"/>
+            </xsl:when>
+            <xsl:when test="@type='equivdoc'">
+              <xsl:call-template name="gsf:equivlinkgs3"/>
             </xsl:when>
             <xsl:otherwise> <!-- a document link -->
@@ -119 +127 @@
                 <img style="border:0px"><xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'bookshelf_image')"/></xsl:attribute></img>
             </xsl:when>
+            <xsl:when test="@type='web'">
+              <xslt:value-of disable-output-escaping="yes" select="metadataList/metadata[contains(@name, 'webicon')]"/>             
+            </xsl:when>
             <xsl:when test="not(@type) or @type='document'">
                 <img style="border:0px"><xslt:attribute name="id">documentBasketBook<xslt:value-of select="/page/pageResponse/collection/@name"/>:<xslt:value-of select="@nodeID"/></xslt:attribute><xslt:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_icon_image')"/></xslt:attribute></img> 
@@ -133 +144 @@
 
   <!-- Another way (also works with DSpace tutorial): build all the equivalent document links for the current document in one go. No looping necessary: handled in function call. -->
-  <xsl:template match="gsf:equivlinkgs3">
+  <xsl:template match="gsf:equivlinkgs3" name="gsf:equivlinkgs3">
     <xslt:variable name="docicon" select="metadataList/metadata[contains(@name, 'equivDocIcon')]"/> 
     <xslt:variable name="docStartlink" select="metadataList/metadata[contains(@name, 'all_*,*_equivDocLink')]"/>