Changeset 30740

Show
Ignore:
Timestamp:
23.08.2016 22:27:17 (3 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl

    r30688 r30740  
    238238    <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> 
    239239    <xsl:choose> 
    240       <xsl:when test="displayItem[@name='icon']"> 
     240      <xsl:when test="displayItem[@name='smallicon']"> 
    241241        <a href="{$coll_href}" title="{$desc}"> 
    242242          <img class="collectionLinkImage"> 
    243243            <xsl:attribute name="alt"><xsl:value-of select="displayItem[@name='name']"/></xsl:attribute> 
    244             <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> 
     244            <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> 
    245245          </img> 
    246246        </a> 
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/about.xsl

    r19988 r30740  
    2020    <xsl:template match="/page"> 
    2121   
     22        <xsl:choose> 
     23            <xsl:when test="$this-element/displayItem[@name='icon']"> 
     24              <img border="0"> 
     25                <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> 
     26                <xsl:attribute name="alt"> 
     27                  <xsl:value-of select="$this-element/displayItem[@name='name']"/> 
     28                </xsl:attribute> 
     29                <xsl:attribute name="title"> 
     30                  <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'aboutpage')"/> 
     31                </xsl:attribute> 
     32              </img>         
     33            </xsl:when>       
     34        </xsl:choose>    
     35   
    2236        <!--Display the description text of the current collection, 
    2337        and if some services are available then create a list