Changeset 4900


Ignore:
Timestamp:
2003-07-11T16:14:13+12:00 (21 years ago)
Author:
kjdon
Message:

documentType att now docType, changed where and how the display info is formatted

Location:
trunk/gsdl3/web/interfaces/default/transform
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r4880 r4900  
    1414  <xsl:template name="pageHead">
    1515    <head>
    16       <title>
     16      <title>x
    1717    <xsl:value-of select="/page/pageRequest/paramList/param[@name='c']/@value"/>
    1818      </title>

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

    r4883 r4900  
    4343    <table width='537'><tr>
    4444    <xsl:for-each select="classifier">
    45       <xsl:variable name="cname" select="@name"/>
    4645      <xsl:choose>
    4746        <xsl:when test="@name=$selected">
    48           <td align='center'><xsl:value-of select="ancestor::service/display/classifier[@name=$cname]/name"/></td>
     47          <td align='center'><xsl:value-of select="displayItem[@name='name']"/></td>
    4948        </xsl:when>
    5049        <xsl:otherwise>
    51           <td align='center'><a href="{$library_name}?a=b&amp;rt=r&amp;s={$serviceName}&amp;c={$collName}&amp;cl={@name}"><xsl:value-of select="ancestor::service/display/classifier[@name=$cname]/name"/></a></td></xsl:otherwise></xsl:choose>
     50          <td align='center'><a href="{$library_name}?a=b&amp;rt=r&amp;s={$serviceName}&amp;c={$collName}&amp;cl={@name}"><xsl:value-of select="displayItem[@name='name']"/></a></td></xsl:otherwise></xsl:choose>
    5251    </xsl:for-each>
    5352      </tr></table>

  • trunk/gsdl3/web/interfaces/default/transform/classifiertools.xsl

    r4883 r4900  
    7878  <xsl:template match="documentNode">
    7979    <xsl:param name="collName"/>
    80     <td><a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@nodeID}&amp;dt={@documentType}"><xsl:apply-templates select="." mode="displayNodeIcon"/></a></td><td align='left'><xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/></td>
     80    <td><a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@nodeID}&amp;dt={@docType}"><xsl:apply-templates select="." mode="displayNodeIcon"/></a></td><td align='left'><xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/></td>
    8181  </xsl:template>
    8282 

  • trunk/gsdl3/web/interfaces/default/transform/config_format.xsl

    r4866 r4900  
    3939      </xsl:when>
    4040      <xsl:otherwise> <!-- a document link -->
    41     <a><xslt:attribute name="href"><xslt:value-of select='$library_name'/>?a=d&amp;c=<xslt:value-of select='$collName'/>&amp;d=<xslt:value-of select='@nodeID'/>&amp;dt=<xslt:value-of select='@documentType'/><xslt:if test="@nodeType='leaf'">&amp;sib=1</xslt:if></xslt:attribute><xsl:apply-templates/></a>
     41    <a><xslt:attribute name="href"><xslt:value-of select='$library_name'/>?a=d&amp;c=<xslt:value-of select='$collName'/>&amp;d=<xslt:value-of select='@nodeID'/>&amp;dt=<xslt:value-of select='@docType'/><xslt:if test="@nodeType='leaf'">&amp;sib=1</xslt:if></xslt:attribute><xsl:apply-templates/></a>
    4242      </xsl:otherwise>
    4343    </xsl:choose>

  • trunk/gsdl3/web/interfaces/default/transform/document.xsl

    r4877 r4900  
    8888    <xsl:param name="collName"/>
    8989    <xsl:choose>
    90       <xsl:when test="@documentType='hierarchy'">
     90      <xsl:when test="@docType='hierarchy'">
    9191    <xsl:call-template name="hierarchicalContents">
    9292      <xsl:with-param name="collName" select="$collName"/>
    9393    </xsl:call-template>
    9494      </xsl:when>
    95       <xsl:when test="@documentType='paged'">
     95      <xsl:when test="@docType='paged'">
    9696    <xsl:call-template name="pagedContents">
    9797      <xsl:with-param name="collName" select="$collName"/>
    … …  
    243243      <table border='1' cellspacing='0'>
    244244    <tr><td>
    245         <p /><xsl:value-of select="display/name"/><p/>
     245        <p /><xsl:value-of select="displayItem[@name='name']"/><p/>
    246246        <form name="EnrichForm" method="get" action="/gsdl3/{$library_name}">
    247247          <xsl:apply-templates select="paramList"/>
    … …  
    252252        <input type='hidden' name='sib'><xsl:attribute name='value'><xsl:value-of select='/page/pageRequest/paramList/param[@name="sib"]/@value'/></xsl:attribute></input></xsl:if>
    253253          <input type='hidden' name='s' value='{@name}'/>
    254           <input type="submit"><xsl:attribute name="value"><xsl:value-of select='display/submit'/></xsl:attribute></input>
     254          <input type="submit"><xsl:attribute name="value"><xsl:value-of select="displayItem[@name='submit']"/></xsl:attribute></input>
    255255        </form>
    256256      </td></tr>
    … …  
    275275      </xsl:when>
    276276      <xsl:otherwise>
    277         <xsl:variable name="pname" select="@name"/>
    278         <tr><td><xsl:value-of select='ancestor::service/display/param[@name=$pname]/name'/></td><td align="right"><xsl:apply-templates select="."/></td></tr>
     277        <tr><td><xsl:value-of select="displayItem[@name='name']"/></td><td align="right"><xsl:apply-templates select="."/></td></tr>
    279278      </xsl:otherwise>
    280279    </xsl:choose>

  • trunk/gsdl3/web/interfaces/default/transform/process.xsl

    r4730 r4900  
    3939    <xsl:variable name='action' select="/page/pageRequest/@action"/>
    4040    <xsl:variable name='lang' select="/page/@lang"/>
    41     <h3><xsl:value-of select="display/name"/></h3><p/>
     41    <h3><xsl:value-of select="displayItem[@name='name']"/></h3><p/>
    4242    <form name="BuildForm" method="get" action="/gsdl3/{$library_name}">
    4343      <xsl:apply-templates select="paramList"/>
    … …  
    4848      <input type="hidden" name="s" value="{@name}"/>
    4949      <input type="hidden" name="rt" value="r"/>
    50       <input type="submit"><xsl:attribute name="value"><xsl:value-of select='display/submit'/></xsl:attribute></input>
     50      <input type="submit"><xsl:attribute name="value"><xsl:value-of select="displayItem[@name='submit']"/></xsl:attribute></input>
    5151    </form>
    5252    <xsl:call-template name="greenBar"/>

  • trunk/gsdl3/web/interfaces/default/transform/query.xsl

    r4869 r4900  
    6666    <xsl:param name="collName"/>
    6767    <xsl:variable name="subaction" select="../pageRequest/@subaction"/>
    68     <h3><xsl:value-of select="display/name"/></h3><p/>
     68    <h3><xsl:value-of select="displayItem[@name='name']"/></h3><p/>
    6969    <form name="QueryForm" method="get" action="/gsdl3/{$library_name}">
    7070      <input type="hidden" name="a" value="q"/>
    … …  
    7575      <input type="hidden" name="hn" value="1"/>
    7676      <xsl:apply-templates select="paramList"/>
    77       <input type="submit"><xsl:attribute name="value"><xsl:value-of select='display/submit'/></xsl:attribute></input>
     77      <input type="submit"><xsl:attribute name="value"><xsl:value-of select="displayItem[@name='submit']"/></xsl:attribute></input>
    7878    </form>
    7979  </xsl:template>

  • trunk/gsdl3/web/interfaces/default/transform/querytools.xsl

    r4879 r4900  
    3838    <xsl:param name="collName"/>
    3939    <td>
    40       <a><xsl:attribute name="href"><xsl:value-of select='$library_name'/>?a=d&amp;c=<xsl:value-of select='$collName'/>&amp;d=<xsl:value-of select='@nodeID'/><xsl:if test="@nodeType='leaf'">&amp;sib=1</xsl:if>&amp;dt=<xsl:value-of select='@documentType'/></xsl:attribute>
     40      <a><xsl:attribute name="href"><xsl:value-of select='$library_name'/>?a=d&amp;c=<xsl:value-of select='$collName'/>&amp;d=<xsl:value-of select='@nodeID'/><xsl:if test="@nodeType='leaf'">&amp;sib=1</xsl:if>&amp;dt=<xsl:value-of select='@docType'/></xsl:attribute>
    4141    <xsl:apply-templates select="." mode="displayNodeIcon"/>
    4242      </a>

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

    r4878 r4900  
    2020        <xsl:variable name="pname" select="@name"/>
    2121        <xsl:variable name="pvalue"><xsl:apply-templates select="." mode="calculate-default"/></xsl:variable>
    22         <tr><td><xsl:value-of select='ancestor::service/display/param[@name=$pname]/name'/></td><td align="right"><xsl:apply-templates select="."><xsl:with-param name="default" select="$pvalue"/></xsl:apply-templates></td></tr>
     22        <tr><td><xsl:value-of select="displayItem[@name='name']"/></td><td align="right"><xsl:apply-templates select="."><xsl:with-param name="default" select="$pvalue"/></xsl:apply-templates></td></tr>
    2323      </xsl:otherwise>
    2424    </xsl:choose>
    … …  
    3636    <xsl:param name="default"/>
    3737    <xsl:variable name="pname" select='@name'/>
    38     <xsl:variable name='pdisplay' select='ancestor::service/display/param[@name=$pname]'/>
    3938    <select name='{@shortname}'>
    40       <option value="0"><xsl:if test="$default='0'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select='$pdisplay/option[@name="0"]'/></option>
    41       <option value="1"><xsl:if test="$default='1'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select='$pdisplay/option[@name="1"]'/></option>
     39      <option value="0"><xsl:if test="$default='0'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="option[@name='0']/displayItem[@name='name']"/></option>
     40      <option value="1"><xsl:if test="$default='1'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="option[@name='1']/displayItem[@name='name']"/></option>
    4241    </select>
    4342  </xsl:template>
    … …  
    5352    <xsl:param name="default"/>
    5453    <xsl:variable name="pname"><xsl:value-of select='@name'/></xsl:variable>
    55     <xsl:variable name='pdisplay' select='ancestor::service/display/param[@name=$pname]'/>
    5654    <xsl:choose>
    5755      <xsl:when test="count(option) = 1">
    58     <xsl:value-of select='$pdisplay/option'/>
     56    <xsl:value-of select="option/displayItem[@name='name']"/>
    5957    <input type='hidden' name='{@shortname}'><xsl:attribute name='value'><xsl:value-of  select='option/@name'/></xsl:attribute></input>
    6058      </xsl:when>
    … …  
    6260    <select name="{@shortname}">
    6361      <xsl:for-each select="option">
    64         <xsl:variable name='op_name' select='@name'/>
    65         <option value="{@name}"><xsl:if test="@name=$default"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select='$pdisplay/option[@name=$op_name]'/></option>
     62        <option value="{@name}"><xsl:if test="@name=$default"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="displayItem[@name='name']"/></option>
    6663      </xsl:for-each>
    6764    </select>
    … …  
    7572  <xsl:template match="param[@type='enum_multi']">
    7673    <xsl:variable name="pname" select='@name'/>
    77     <xsl:variable name='pdisplay' select='ancestor::service/display/param[@name=$pname]'/>
    7874    <select name="{@shortname}" size='2'><xsl:attribute name="multiple"></xsl:attribute>
    7975      <xsl:for-each select="option">
    80     <xsl:variable name='op_name' select='@name'/>
    81     <option value="{@name}"><xsl:value-of select='$pdisplay/option[@name=$op_name]'/></option>
     76    <option value="{@name}"><xsl:value-of select="displayItem[@name='name']"/></option>
    8277      </xsl:for-each>
    8378    </select>
    … …  
    10095    <xsl:variable name="parent" select="@name"/>
    10196    <table>
    102       <tr><td colspan='10'><xsl:value-of select="ancestor::service/display/param[@name=$parent]/name"/></td></tr>
     97      <tr><td colspan='10'><xsl:value-of select="displayItem[@name='name']"/></td></tr>
    10398      <tr>
    10499    <xsl:for-each select="param">
    105       <xsl:variable name='pname' select='@name'/>
    106      
    107       <td><xsl:value-of select="ancestor::service/display/param[@name=$pname]/name"/></td>
     100      <td><xsl:value-of select="displayItem[@name='name']"/></td>
    108101    </xsl:for-each>
    109102      </tr>
    … …  
    114107  <xsl:template match="param[@type='multi']" mode="contents">
    115108    <xsl:param name="occurs">1</xsl:param>
    116     <xsl:variable name="pos" select="@occurs - $occurs"/>
     109    <xsl:variable name="pos" select="@occurs - $occurs"/>   
    117110    <tr><xsl:for-each select="param">
    118111    <xsl:variable name="pname" select="@name"/>
Note: See TracChangeset for help on using the changeset viewer.