Changeset 30740

Timestamp:

2016-08-23T22:27:17+12:00 (7 years ago)

Author:

ak19

Message:

The about image and home page image were not working correctly before (the home page image used the about image, and nothing appeared on the about page).

Location:

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

Files:

• gslib.xsl (modified) (1 diff)
• pages/about.xsl (modified) (1 diff)

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

@@ -238 +238 @@
     <xsl:variable name="coll_href"><xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="@name"/>/page/about<xsl:choose><xsl:when test="libraryParamList/param">?<xsl:for-each select="libraryParamList/param"><xsl:value-of select="@name"/>=<xsl:value-of select="@default"/>&amp;</xsl:for-each></xsl:when></xsl:choose></xsl:variable>
     <xsl:choose>
-      <xsl:when test="displayItem[@name='icon']">
+      <xsl:when test="displayItem[@name='smallicon']">
         <a href="{$coll_href}" title="{$desc}">
           <img class="collectionLinkImage">
             <xsl:attribute name="alt"><xsl:value-of select="displayItem[@name='name']"/></xsl:attribute>
-            <xsl:attribute name="src">sites/<xsl:value-of select="$site_name"/>/collect/<xsl:value-of select="@name"/>/images/<xsl:value-of select="displayItem[@name='icon']"/></xsl:attribute>
+            <xsl:attribute name="src">sites/<xsl:value-of select="$site_name"/>/collect/<xsl:value-of select="@name"/>/images/<xsl:value-of select="displayItem[@name='smallicon']"/></xsl:attribute>
           </img>
         </a>

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

@@ -20 +20 @@
     <xsl:template match="/page">
   
+        <xsl:choose>
+            <xsl:when test="$this-element/displayItem[@name='icon']">
+              <img border="0">
+                <xsl:attribute name="src"><xsl:value-of select="$this-element/metadataList/metadata[@name='httpPath']"/>/images/<xsl:value-of select="$this-element/displayItem[@name='icon']"/></xsl:attribute>
+                <xsl:attribute name="alt">
+                  <xsl:value-of select="$this-element/displayItem[@name='name']"/>
+                </xsl:attribute>
+                <xsl:attribute name="title">
+                  <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'aboutpage')"/>
+                </xsl:attribute>
+              </img>        
+            </xsl:when>      
+        </xsl:choose>   
+  
         <!--Display the description text of the current collection,
         and if some services are available then create a list