Changeset 4901

Timestamp:

2003-07-11T16:15:46+12:00 (21 years ago)

Author:

kjdon

Message:

changed where and how the display info is formatted

Location:

trunk/gsdl3/web/interfaces/nzdl/transform

Files:

• home.xsl (modified) (1 diff)
• query.xsl (modified) (4 diffs)

trunk/gsdl3/web/interfaces/nzdl/transform/home.xsl

@@ -170 +170 @@
       <tr valign='top'>
     <td align='center'>
-      <p />niupepa<xsl:apply-templates select="collection[@name='niupepa']"/> 
+      <p /><xsl:apply-templates select="collection[@name='niupepa']"/> 
       <p />howto DL<xsl:apply-templates select="collection[@name='howto']"/> 
       <p />arabic<xsl:apply-templates select="collection[@name='arabic']"/> 

trunk/gsdl3/web/interfaces/nzdl/transform/query.xsl

@@ -148 +148 @@
     </xsl:choose>
     <tr><td align='right'>
-        <input type="submit"><xsl:attribute name="value"><xsl:value-of select='../display/submit'/></xsl:attribute></input>
+        <input type="submit"><xsl:attribute name="value"><xsl:value-of select="../displayItem[@name='submit']"/></xsl:attribute></input>
       </td></tr>
       </xsl:when>
@@ -161 +161 @@
           </td></tr>
         <tr><td align='right'>
-        <input type="submit"><xsl:attribute name="value"><xsl:value-of select='../display/submit'/></xsl:attribute></input>
+        <input type="submit"><xsl:attribute name="value"><xsl:value-of select="../displayItem[@name='submit']"/></xsl:attribute></input>
           </td></tr>
       </xsl:when>
@@ -167 +167 @@
         <tr><td>
         <xsl:variable name="qs"><xsl:apply-templates select="param[@name='query']" mode="calculate-default"/></xsl:variable>
-        <nobr><xsl:apply-templates select="param[@name='query']"><xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs)"/></xsl:apply-templates><input type="submit"><xsl:attribute name="value"><xsl:value-of select='../display/submit'/></xsl:attribute></input></nobr>
+        <nobr><xsl:apply-templates select="param[@name='query']"><xsl:with-param name="default" select="java:org.greenstone.gsdl3.util.XSLTUtil.tidyWhitespace($qs)"/></xsl:apply-templates><input type="submit"><xsl:attribute name="value"><xsl:value-of select="../displayItem[@name='submit']"/></xsl:attribute></input></nobr>
           </td></tr>
       </xsl:otherwise>
@@ -182 +182 @@
     <xsl:for-each select="param">
       <xsl:variable name='pname' select='@name'/>
-      <td><xsl:value-of select="ancestor::service/display/param[@name=$pname]/name"/></td>
+      <td><xsl:value-of select="displayItem[@name='name']"/></td>
     </xsl:for-each>
       </tr>