Changeset 3655


Ignore:
Timestamp:
2003-01-06T15:56:12+13:00 (21 years ago)
Author:
kjdon
Message:

tidy up

Location:
trunk/gsdl3/interfaces/default/transform
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/interfaces/default/transform/about.xsl

    r3597 r3655  
    7070<tr>
    7171<xsl:if test="contains($serviceName, 'Query')">
    72 <xsl:variable name="orig-type"><xsl:value-of select="substring-before($serviceName, 'Query')"/></xsl:variable>
    73 <xsl:variable name="lower-type" select="java:org.greenstone.gsdl3.util.XSLTUtil.toLower($orig-type)"/>
    74 <td><a href="{$library}?a=q&amp;sa={$orig-type}&amp;c={$collName}"><xsl:value-of select="$serviceName"/></a></td>
     72<xsl:variable name="s-type"><xsl:value-of select="substring-before($serviceName, 'Query')"/></xsl:variable>
     73<td><a href="{$library}?a=q&amp;sa={$s-type}&amp;c={$collName}"><xsl:value-of select="$serviceName"/></a></td>
    7574</xsl:if>
    7675<xsl:if test="contains($serviceName, 'Browse')">
    77 <xsl:variable name="orig-type"><xsl:value-of select="substring-before($serviceName, 'Browse')"/></xsl:variable>
    78 <xsl:variable name="lower-type" select="java:org.greenstone.gsdl3.util.XSLTUtil.toLower($orig-type)"/>
    79 <td><a href="{$library}?a=b&amp;sa={$orig-type}&amp;c={$collName}"><xsl:value-of select="$serviceName"/></a></td>
     76<xsl:variable name="s-type"><xsl:value-of select="substring-before($serviceName, 'Browse')"/></xsl:variable>
     77<td><a href="{$library}?a=b&amp;sa={$s-type}&amp;c={$collName}"><xsl:value-of select="$serviceName"/></a></td>
    8078</xsl:if>
    8179<xsl:if test="contains($serviceName, 'Applet')">
    82 <xsl:variable name="orig-type"><xsl:value-of select="substring-before($serviceName, 'Applet')"/></xsl:variable>
    83 <td><a href="{$library}?a=a&amp;sa=d&amp;sn={$orig-type}&amp;c={$collName}"><xsl:value-of select="$serviceName"/></a></td>
     80<xsl:variable name="s-type"><xsl:value-of select="substring-before($serviceName, 'Applet')"/></xsl:variable>
     81<td><a href="{$library}?a=a&amp;sa=d&amp;s={$s-type}&amp;c={$collName}"><xsl:value-of select="$serviceName"/></a></td>
    8482</xsl:if>
    8583</tr>
    … …  
    9694<table>
    9795<xsl:for-each select="service">
    98 <tr><td><a href="{$library}?a={$collName}&amp;sa={@name}"><xsl:value-of select="@name"/></a></td></tr>
     96<tr><td><a href="{$library}?a=pr&amp;sa=d&amp;c={$collName}&amp;s={@name}"><xsl:value-of select="@name"/></a></td></tr>
    9997</xsl:for-each>
    10098</table>

  • trunk/gsdl3/interfaces/default/transform/applet.xsl

    r3564 r3655  
    99<xsl:template match="page">
    1010
    11 <xsl:variable name="collName"><xsl:value-of select="request/paramList/param[@name='collection']/@value"/></xsl:variable>
     11<xsl:variable name="collName"><xsl:value-of select="request/paramList/param[@name='c']/@value"/></xsl:variable>
    1212<html>
    1313<xsl:call-template name="greenstoneHead"/>

  • trunk/gsdl3/interfaces/default/transform/basicquery.xsl

    r3595 r3655  
    1010<xsl:template match="page">
    1111
    12 <xsl:variable name="collName"><xsl:value-of select="request/paramList/param[@name='collection']/@value"/></xsl:variable>
     12<xsl:variable name="collName"><xsl:value-of select="request/paramList/param[@name='c']/@value"/></xsl:variable>
    1313
    1414<html>
    … …  
    3333<xsl:template match="service">
    3434<xsl:param name="collName">coll-name</xsl:param>
    35 <xsl:variable name="queryString"><xsl:value-of select="../request/paramList/param[@name='query']/@value"/></xsl:variable>
    3635<xsl:variable name="subaction"><xsl:value-of select="../request/@subaction"/></xsl:variable>
    3736<xsl:variable name='library' select='ancestor::page/config/library_name'/>
    … …  
    9190<xsl:variable name="library" select="ancestor::page/config/library_name"/>
    9291<table width="537">
    93 <xsl:for-each select="content/resourceList/resource">
    94 <tr><td><a href="{$library}?a=r&amp;c={$collName}&amp;r={@name}">link</a></td><td><xsl:value-of select="metadataList/metadata[@name='Title']"/></td></tr>
     92<xsl:for-each select="content/documentList/document">
     93<tr><td><a href="{$library}?a=d&amp;c={$collName}&amp;d={@name}">link</a></td><td><xsl:value-of select="metadataList/metadata[@name='Title']"/></td></tr>
    9594</xsl:for-each>
    9695</table>

  • trunk/gsdl3/interfaces/default/transform/classifier.xsl

    r3582 r3655  
    1010
    1111<xsl:template match="page">
    12 <xsl:variable name="collName"><xsl:value-of select="request/paramList/param[@name='collection']/@value"/></xsl:variable>
     12<xsl:variable name="collName"><xsl:value-of select="request/paramList/param[@name='c']/@value"/></xsl:variable>
    1313<html>
    1414<xsl:call-template name="greenstoneHead"/>
    … …  
    4242</xsl:when>
    4343<xsl:otherwise>
    44 <td align='center'><a href="{$library}?a=b&amp;sa=classifier&amp;c={$collName}&amp;cl={@name}"><xsl:value-of select="metadataList/metadata[@name='Title']"/></a></td></xsl:otherwise></xsl:choose>
     44<td align='center'><a href="{$library}?a=b&amp;sa=Classifier&amp;c={$collName}&amp;cl={@name}"><xsl:value-of select="metadataList/metadata[@name='Title']"/></a></td></xsl:otherwise></xsl:choose>
    4545</xsl:for-each>
    4646</tr></table>
    … …  
    4848</xsl:template>
    4949
    50 <!-- recursively process all nodes and resources -->
     50<!-- recursively process all nodes and documents -->
    5151
    5252<xsl:template match="classifier[@type='vertical' and @interleave='true']">
    5353<xsl:param name="collName">coll-name</xsl:param>
    5454<xsl:variable name='link' select='@link'/>
    55 <table width='537'><xsl:for-each select='node|resource'>
     55<table width='537'><xsl:for-each select='node|document'>
    5656<xsl:choose><xsl:when test='name()="node"'><tr valign='top'><xsl:apply-templates select='.' mode='current-node'><xsl:with-param name='link' select='$link'/><xsl:with-param name='collName' select='$collName'/></xsl:apply-templates></tr><tr valign='top'><td></td><xsl:apply-templates select='.' mode='process-all-children'><xsl:with-param name='collName' select='$collName'/><xsl:with-param name='link' select='$link'/></xsl:apply-templates></tr>
    5757</xsl:when>
    … …  
    6666<xsl:param name="collName">coll-name</xsl:param>
    6767<xsl:variable name='link' select='@link'/>
    68 <!-- process the nodes and resources separately-->
     68<!-- process the nodes and documents separately-->
    6969<table width='537'>
    7070<xsl:for-each select='node'>
    … …  
    7272</table>
    7373<table width='537'>
    74 <xsl:for-each select='//resource'>
     74<xsl:for-each select='//document'>
    7575<tr valign='top'><xsl:apply-templates select='.'><xsl:with-param name='collName' select='$collName'/></xsl:apply-templates></tr>
    7676</xsl:for-each>
    … …  
    8282<xsl:param name="collName">coll-name</xsl:param>
    8383<xsl:variable name='link' select='@link'/>
    84 <!-- process the nodes and resources separately-->
     84<!-- process the nodes and documents separately-->
    8585
    8686<table width='537'><tr valign='top'>
    … …  
    9393</table>
    9494<table width='537'>
    95 <xsl:for-each select='//resource'>
     95<xsl:for-each select='//document'>
    9696<tr valign='top'><xsl:apply-templates select='.'><xsl:with-param name='collName' select='$collName'/></xsl:apply-templates></tr>
    9797</xsl:for-each>
    … …  
    103103<xsl:param name="collName">coll-name</xsl:param>
    104104<xsl:variable name='link' select='@link'/>
    105 <!-- process the nodes and resources together -->
     105<!-- process the nodes and documents together -->
    106106
    107107<table><tr valign='top'>
    108 <xsl:for-each select='node|resource'>
     108<xsl:for-each select='node|document'>
    109109<xsl:choose><xsl:when test='name()="node"'><xsl:apply-templates select='.' mode='current-node'><xsl:with-param name='link' select='$link'/><xsl:with-param name='collName' select='$collName'/></xsl:apply-templates>
    110110</xsl:when>
    … …  
    114114</tr>
    115115<tr valign='top'>
    116 <xsl:for-each select='node|resource'>
    117 <xsl:choose><xsl:when test='name()="node" and node|resource'><xsl:if test="$link='icon'"><td></td></xsl:if><xsl:apply-templates select='.' mode='process-all-children'><xsl:with-param name='collName' select='$collName'/><xsl:with-param name='link' select='$link'/></xsl:apply-templates></xsl:when>
     116<xsl:for-each select='node|document'>
     117<xsl:choose><xsl:when test='name()="node" and node|document'><xsl:if test="$link='icon'"><td></td></xsl:if><xsl:apply-templates select='.' mode='process-all-children'><xsl:with-param name='collName' select='$collName'/><xsl:with-param name='link' select='$link'/></xsl:apply-templates></xsl:when>
    118118<xsl:otherwise><td></td><xsl:if test="$link='icon'"><td></td></xsl:if>
    119119</xsl:otherwise>
    … …  
    124124</xsl:template>
    125125
    126 <!-- different template for resource, not used at the moment
     126<!-- different template for document, not used at the moment
    127127priority attribute used to decide which template to use -->
    128128<!--
    129 <xsl:template match="resource" priority="1">
     129<xsl:template match="document" priority="1">
    130130<xsl:param name="collName">coll-name</xsl:param>
    131131<xsl:variable name='library' select='ancestor::page/config/library_name'/>
    132132<xsl:variable name='year' select="metadataList/metadata[@name='Year']"/>
    133133<xsl:variable name='month' select="metadataList/metadata[@name='Month']"/>
    134 <td><b><xsl:if test="not($year = preceding-sibling::resource[1]/metadataList/metadata[@name='Year'])"><xsl:value-of select="$year"/></xsl:if></b></td>
    135 <td><b><xsl:if test="not($year = preceding-sibling::resource[1]/metadataList/metadata[@name='Year'] and $month = preceding-sibling::resource[1]/metadataList/metadata[@name='Month'])"><xsl:value-of select="$month"/></xsl:if></b></td>
     134<td><b><xsl:if test="not($year = preceding-sibling::document[1]/metadataList/metadata[@name='Year'])"><xsl:value-of select="$year"/></xsl:if></b></td>
     135<td><b><xsl:if test="not($year = preceding-sibling::document[1]/metadataList/metadata[@name='Year'] and $month = preceding-sibling::document[1]/metadataList/metadata[@name='Month'])"><xsl:value-of select="$month"/></xsl:if></b></td>
    136136<td><a href="{$library}?a=r&amp;c={$collName}&amp;r={@name}"><img src='interfaces/default/images/book.gif' width='18' height='11' border='0'/></a></td><td><xsl:value-of select="metadataList/metadata[@name='Title']"/></td>
    137137</xsl:template>
    138138-->
    139139
    140 <xsl:template match="resource">
     140<xsl:template match="document">
    141141<xsl:param name="collName">coll-name</xsl:param>
    142142<xsl:variable name='library' select='ancestor::page/config/library_name'/>
    143 <td><a href="{$library}?a=r&amp;c={$collName}&amp;r={@name}"><img src='interfaces/default/images/book.gif' width='18' height='11' border='0'/></a></td><td><xsl:value-of select="metadataList/metadata[@name='Title']"/></td>
     143<td><a href="{$library}?a=d&amp;c={$collName}&amp;d={@name}"><img src='interfaces/default/images/book.gif' width='18' height='11' border='0'/></a></td><td><xsl:value-of select="metadataList/metadata[@name='Title']"/></td>
    144144</xsl:template>
    145145
    … …  
    152152<xsl:variable name="library" select="ancestor::page/config/library_name"/>
    153153<xsl:choose><xsl:when test="$link='icon'">
    154 <td><a><xsl:attribute name='href'><xsl:value-of select='$library'/>?a=b&amp;sa=classifier&amp;c=<xsl:value-of select='$collName'/>&amp;cl=<xsl:value-of select='@name'/><xsl:if test="node|resource">.pr</xsl:if></xsl:attribute><img src='interfaces/default/images/bshelf.gif' border='0' width='20' height='16' /></a></td><td align='left'><xsl:value-of select="metadataList/metadata[@name='Title']"/></td>
     154<td><a><xsl:attribute name='href'><xsl:value-of select='$library'/>?a=b&amp;sa=Classifier&amp;c=<xsl:value-of select='$collName'/>&amp;cl=<xsl:value-of select='@name'/><xsl:if test="node|document">.pr</xsl:if></xsl:attribute><img src='interfaces/default/images/bshelf.gif' border='0' width='20' height='16' /></a></td><td align='left'><xsl:value-of select="metadataList/metadata[@name='Title']"/></td>
    155155</xsl:when><xsl:otherwise>
    156 <td><a><xsl:attribute name='href'><xsl:value-of select='$library'/>?a=b&amp;sa=classifier&amp;c=<xsl:value-of select='$collName'/>&amp;cl=<xsl:value-of select='@name'/><xsl:if test="node|resource">.pr</xsl:if></xsl:attribute><xsl:value-of select="metadataList/metadata[@name='Title']"/></a></td>
     156<td><a><xsl:attribute name='href'><xsl:value-of select='$library'/>?a=b&amp;sa=Classifier&amp;c=<xsl:value-of select='$collName'/>&amp;cl=<xsl:value-of select='@name'/><xsl:if test="node|document">.pr</xsl:if></xsl:attribute><xsl:value-of select="metadataList/metadata[@name='Title']"/></a></td>
    157157</xsl:otherwise></xsl:choose>
    158158</xsl:template>
    159159
    160160<!-- processing for the recursive bit -->
    161 <!-- if interleave=true, process all child nodes and resources, else just do nodes -->
     161<!-- if interleave=true, process all child nodes and documents, else just do nodes -->
    162162
    163163
    … …  
    167167<td><p/>
    168168<xsl:choose><xsl:when test='@type="vertical"'>
    169 <table><xsl:for-each select='node|resource'>
     169<table><xsl:for-each select='node|document'>
    170170<xsl:choose><xsl:when test='name()="node"'><tr valign='top'><xsl:apply-templates select='.' mode='current-node'><xsl:with-param name='link' select='$link'/><xsl:with-param name='collName' select='$collName'/></xsl:apply-templates></tr><tr valign='top'><td></td><xsl:apply-templates select='.' mode='process-all-children'><xsl:with-param name='collName' select='$collName'/><xsl:with-param name='link' select='$link'/></xsl:apply-templates></tr>
    171171</xsl:when>
    … …  
    175175</xsl:when>
    176176<xsl:otherwise>
    177 <table><tr valign='top'><xsl:for-each select='node|resource'>
     177<table><tr valign='top'><xsl:for-each select='node|document'>
    178178<xsl:choose><xsl:when test='name()="node"'><xsl:apply-templates select='.' mode='current-node'><xsl:with-param name='link' select='$link'/><xsl:with-param name='collName' select='$collName'/></xsl:apply-templates><xsl:apply-templates select='.' mode='process-all-children'><xsl:with-param name='collName' select='$collName'/><xsl:with-param name='link' select='$link'/></xsl:apply-templates>
    179179</xsl:when>
    … …  
    203203
    204204</xsl:stylesheet>
     205
     206
     207
     208

  • trunk/gsdl3/interfaces/default/transform/home.xsl

    r3474 r3655  
    4949<xsl:template match="serviceClusterList">
    5050<xsl:for-each select="serviceCluster">
    51 <p/><a><xsl:attribute name='href'><xsl:value-of select="ancestor::page/config/library_name"/>?a=p&amp;sa=about&amp;sc=<xsl:value-of select='@name'/></xsl:attribute><xsl:value-of select='@name'/></a>
     51<p/><a><xsl:attribute name='href'><xsl:value-of select="ancestor::page/config/library_name"/>?a=p&amp;sa=about&amp;c=<xsl:value-of select='@name'/></xsl:attribute><xsl:value-of select='@name'/></a>
    5252</xsl:for-each>
    5353<xsl:call-template name="greenBar"/>
    5454</xsl:template>
     55
    5556</xsl:stylesheet> 
    5657

  • trunk/gsdl3/interfaces/default/transform/service-params.xsl

    r3596 r3655  
    103103  </xsl:template>
    104104
    105 
     105 
    106106</xsl:stylesheet> 

  • trunk/gsdl3/interfaces/default/transform/style.xsl

    r3564 r3655  
    7474<xsl:variable name="library" select="ancestor::page/config/library_name"/>
    7575<table width="537">
    76 <tr><td align="left"><a href="{$library}?a=p&amp;sa=about&amp;sc={$clusterName}"><xsl:value-of select="$clusterName"/></a></td><td align="right"><a href="{$library}?a=p&amp;sa=home"><xsl:call-template name="text"><xsl:with-param name="key">home</xsl:with-param></xsl:call-template></a></td></tr></table>
     76<tr><td align="left"><a href="{$library}?a=p&amp;sa=about&amp;c={$clusterName}"><xsl:value-of select="$clusterName"/></a></td><td align="right"><a href="{$library}?a=p&amp;sa=home"><xsl:call-template name="text"><xsl:with-param name="key">home</xsl:with-param></xsl:call-template></a></td></tr></table>
    7777
    7878<xsl:call-template name="greenBar"/>
Note: See TracChangeset for help on using the changeset viewer.