Changeset 32600

Show
Ignore:
Timestamp:
14.11.2018 09:57:03 (4 weeks ago)
Author:
davidb
Message:

Change to allow HList nodes that aren't at the top-level to be displayed; HList is still done as a static link rather than an AJAX toggle link. An improvement would be to make these also be AJAX toggle, and (in the case of an HList) have it auto-close any other HList node in that layer as part of the operation

Files:
1 modified

Legend:

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

    r31890 r32600  
    137137 
    138138    <xsl:choose> 
    139       <xsl:when test="@childType = 'VList' or @childType = 'DateList'"> 
     139       
     140      <xsl:when test="@childType = 'VList' or @childType = 'DateList'"> 
     141      <!--   
     142          <xsl:when test="@childType = 'VList' or @childType = 'HList' or @childType = 'DateList'"> - - **** mod ???? - - 
     143          --> 
     144         
    140145    <xsl:value-of select="util:storeString('prevMonth', '')"/> 
    141146    <xsl:for-each select='classifierNode|documentNode'> 
     
    164169        </td> 
    165170          </xsl:when> 
    166           <xsl:when test="name()='classifierNode' and @childType = 'VList'"> 
     171          <xsl:when test="name()='classifierNode' and (@childType = 'VList' or @childType = 'HList')"><!-- *** mod --> 
    167172        <td> 
    168173          <table id="title{@nodeID}"><tr> 
     
    199204        </xsl:if> 
    200205          </xsl:when> 
    201           <xsl:otherwise>Unknown classifier style specified</xsl:otherwise> 
     206          <xsl:otherwise><td>Unknown classifier style specified: <xsl:value-of select="name()"/></td></xsl:otherwise> 
    202207        </xsl:choose> 
    203208      </tr> 
     
    219224    <xsl:param name="collName"/> 
    220225    <xsl:param name="serviceName"/> 
     226 
     227    <!-- 
     228    ***mod: previous, simpler version 
    221229    <xsl:call-template name="processNodeChildren"> 
    222230      <xsl:with-param name='collName' select='$collName'/> 
    223231      <xsl:with-param name='serviceName' select='$serviceName'/> 
    224232    </xsl:call-template> 
     233    --> 
     234 
     235      <xsl:choose> 
     236    <xsl:when test="@childType = 'HList'"> 
     237        <xsl:call-template name="HList"> 
     238          <xsl:with-param name='collName' select='$collName'/> 
     239          <xsl:with-param name='serviceName' select='$serviceName'/> 
     240        </xsl:call-template> 
     241    </xsl:when> 
     242    <xsl:otherwise> 
     243        <xsl:call-template name="processNodeChildren"> 
     244          <xsl:with-param name='collName' select='$collName'/> 
     245          <xsl:with-param name='serviceName' select='$serviceName'/> 
     246        </xsl:call-template> 
     247    </xsl:otherwise> 
     248      </xsl:choose> 
     249 
     250     
    225251  </xsl:template> 
    226252