Changeset 25920

Show
Ignore:
Timestamp:
10.07.2012 14:14:17 (7 years ago)
Author:
sjm84
Message:

Some fixes and tidying

Files:
1 modified

Legend:

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

    r25873 r25920  
    1414    doctype-system="http://www.w3.org/TR/html4/loose.dtd"/> 
    1515 
     16    <xsl:include href="xml-to-string.xsl"/> 
     17     
    1618  <!-- some global parameters - these are set by whoever is invoking the transformation --> 
    1719  <xsl:param name="interface_name"/> 
    1820  <xsl:param name="library_name"/> 
    1921  <xsl:param name="site_name"/> 
    20   <xsl:include href="xml-to-string.xsl"/> 
    2122  <!-- every pages ....................................................................... --> 
    2223 
     
    290291  <xsl:param name="pageType"/> 
    291292  <xsl:variable name="this-element" select="/page/pageResponse/collection|/page/pageResponse/serviceCluster"/> 
    292   <xsl:variable name="this-service" select="/page/pageResponse/service/@name"/> 
     293  <xsl:variable name="this-service" select="/page/pageRequest/paramList/param[@name = 's']/@value"/> 
    293294   
    294295  <xsl:template name="aboutCollectionPageTitle"> 
     
    677678    <!-- prev --> 
    678679    <a> 
    679       <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@selectedNode"/>.pp&amp;sib=1&amp;p.s=<xsl:value-of select="/page/pageRequest/paramList/param[@name=&quot;p.s&quot;]/@value"/>&amp;p.sa=<xsl:value-of select="/page/pageRequest/paramList/param[@name=&quot;p.sa&quot;]/@value"/>&amp;p.a=<xsl:value-of select="/page/pageRequest/paramList/param[@name=&quot;p.a&quot;]/@value"/></xsl:attribute> 
     680      <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@selectedNode"/>.pp&amp;sib=1&amp;p.s=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.s']/@value"/>&amp;p.sa=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.sa']/@value"/>&amp;p.a=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.a']/@value"/></xsl:attribute> 
    680681      <img class="lessarrow" src="interfaces/{$interface_name}/images/previous.png"/> 
    681682    </a> 
    682683    <!-- next --> 
    683684    <a> 
    684       <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@selectedNode"/>.np&amp;sib=1&amp;p.s=<xsl:value-of select="/page/pageRequest/paramList/param[@name=&quot;p.s&quot;]/@value"/>&amp;p.sa=<xsl:value-of select="/page/pageRequest/paramList/param[@name=&quot;p.sa&quot;]/@value"/>&amp;p.a=<xsl:value-of select="/page/pageRequest/paramList/param[@name=&quot;p.a&quot;]/@value"/></xsl:attribute> 
     685      <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@selectedNode"/>.np&amp;sib=1&amp;p.s=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.s']/@value"/>&amp;p.sa=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.sa']/@value"/>&amp;p.a=<xsl:value-of select="/page/pageRequest/paramList/param[@name='p.a']/@value"/></xsl:attribute> 
    685686      <img class="morearrow" src="interfaces/{$interface_name}/images/next.png"/> 
    686687    </a>