Changeset 26345 for main/trunk

Timestamp:

2012-10-18T14:31:13+13:00 (12 years ago)

Author:

kjdon

Message:

gsf:links can have a rollover text. specify the text in title att, or a key for colleciton dictionary in titlekey att. added this to almost all types of links - not for those where the a tag is defined in another place

File:

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

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

@@ -70 +70 @@
     <xsl:template match="gsf:link">
     <xslt:variable name="collName" select="/page/pageResponse/collection/@name"/>
+    <xsl:variable name="opt-title">                 
+      <xsl:choose>
+    <xsl:when test="@title"><xslt:attribute name="title"><xsl:value-of select="@title"/></xslt:attribute></xsl:when>
+    <xsl:when test="@titlekey"><xslt:attribute name="title"><xslt:value-of disable-output-escaping="yes" select="util:getCollectionText($collName, $site_name, /page/@lang, '{@titlekey}')"/></xslt:attribute></xsl:when>
+      </xsl:choose>
+    </xsl:variable>
         <xsl:choose>
             <xsl:when test="@type='query'">
@@ -87 +93 @@
                         </xsl:choose>
                     </xslt:attribute>
+                                        <xsl:copy-of select="$opt-title"/>
                     <xsl:apply-templates/>
                 </a>
@@ -106 +113 @@
                         </xsl:choose>
                     </xslt:attribute>
+                                        <xsl:copy-of select="$opt-title"/>
                     <xsl:apply-templates/>
                 </a>
@@ -114 +122 @@
                    disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='assocfilepath']" />/<xslt:value-of 
                    disable-output-escaping="yes" select="(.//metadataList)[last()]/metadata[@name='srclinkFile']" /></xslt:attribute>
+                                  <xsl:copy-of select="$opt-title"/>
                   <xsl:apply-templates/>
                 </a>
             </xsl:when>
             <xsl:when test="@type='web'">
-              <xslt:value-of disable-output-escaping="yes" select="metadataList/metadata[contains(@name, 'weblink')]"/>
+    <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')]"/>
@@ -131 +140 @@
                         <xsl:value-of select="@page"/>
                     </xslt:attribute>
-                    <xsl:choose>
-                        <xsl:when test="@title"><xsl:attribute name="title"><xsl:value-of select="@title"/></xsl:attribute></xsl:when>
-                        <xsl:when test="@titlekey"><xslt:attribute name="title"><xslt:value-of disable-output-escaping="yes" select="util:getCollectionText($collName, $site_name, /page/@lang, '{@titlekey}')"/></xslt:attribute></xsl:when>
-                    </xsl:choose>
-                    <xsl:apply-templates/>
+                                    <xsl:copy-of select="$opt-title"/>
+                <xsl:apply-templates/>
                 </a>    
             </xsl:when>
@@ -146 +152 @@
                 </xslt:variable>
                 <a>
+                              <xsl:copy-of select="$opt-title"/>
                     <xslt:attribute name="href">
                         <xslt:value-of select='$library_name'/>
@@ -285 +292 @@
     <!-- With gsf:collectionText, a user can request a string from the collection's dictionary in the current lang -->
     <xsl:template match="gsf:collectionText" name="gsf:collectionText">
-    <!--<xslt:variable name="collName" select="/page/pageResponse/collection/@name"/>-->
+    <xslt:variable name="collName" select="/page/pageResponse/collection/@name"/>
         <xslt:value-of select="util:getCollectionText($collName, $site_name, /page/@lang, '{@name}', '{@args}')"/>
     </xsl:template>