Changeset 25714

Show
Ignore:
Timestamp:
30.05.2012 09:58:46 (7 years ago)
Author:
sjm84
Message:

Fixed the preferences being bugged on the gs2 skin

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/gs2/transform/pref.xsl

    r20230 r25714  
    129129    <xsl:param name="formstatus"/> 
    130130    <xsl:param name="advancedstatus"/> 
    131      
     131 
    132132    <!-- extract service parameters, avoid hard coding params in this xslt -->  
    133133    <!-- mode specific options --> 
     
    136136    <!-- <xsl:if test="$mode='form'"><xsl:apply-templates select="/page/pageResponse//service[@name='FieldQuery']"/></xsl:if> -->     
    137137    <xsl:call-template name="advanced-search-prefs"><xsl:with-param name="display"><xsl:if test="$mode='advanced'">y</xsl:if><xsl:if test="$mode='text' or $mode='form'">n</xsl:if></xsl:with-param></xsl:call-template> 
    138      
     138 
    139139    <!-- search type specific options --> 
    140140    <xsl:apply-templates select="/page/pageResponse//service[@name='TextQuery']"> 
     
    215215  <xsl:template match="service"> 
    216216    <xsl:param name="display">n</xsl:param> 
    217     <xsl:param name="prefix"/>     
    218     <xsl:apply-templates select="paramList/param[not(@type='invisible')]"><xsl:with-param name="display" select="$display"/><xsl:with-param name="prefix" select="$prefix"/></xsl:apply-templates> 
    219   </xsl:template> 
    220    
    221   <xsl:template match="param">  
     217    <xsl:param name="prefix"/>   
     218    <for-each select="paramList/param[not(@type='invisible')]"> 
     219        <xsl:call-template name="displayParam"><xsl:with-param name="display" select="$display"/><xsl:with-param name="prefix" select="$prefix"/></xsl:call-template> 
     220    </for-each> 
     221  </xsl:template> 
     222   
     223  <xsl:template name="displayParam"> 
    222224    <xsl:param name="ns">s1.</xsl:param> 
    223225    <xsl:param name="display">n</xsl:param> 
    224226    <xsl:param name="prefix"/> 
    225      
    226     <xsl:if test="not(@name='matchMode') and not(@name='level') and not(@name='index') and not(@name='sortBy') and not(@name='indexSubcollection') and not(@name='indexLanguage') and (@type='boolean' or @type='enum_single')"><xsl:apply-templates select="." mode="radio"><xsl:with-param name="display" select="$display"/><xsl:with-param name="prefix" select="$prefix"/><xsl:with-param name="paramIdx" select="position()"/></xsl:apply-templates></xsl:if>     
    227   </xsl:template> 
    228    
    229   <xsl:template match="param" mode="radio">  
     227 
     228    <xsl:if test="not(@name='matchMode') and not(@name='level') and not(@name='index') and not(@name='sortBy') and not(@name='indexSubcollection') and not(@name='indexLanguage') and (@type='boolean' or @type='enum_single')"><xsl:call-template name="displayRadioParam"><xsl:with-param name="display" select="$display"/><xsl:with-param name="prefix" select="$prefix"/><xsl:with-param name="paramIdx" select="position()"/></xsl:call-template></xsl:if>     
     229  </xsl:template> 
     230   
     231  <xsl:template name="displayRadioParam"> 
    230232    <xsl:param name="ns">s1.</xsl:param> 
    231233    <xsl:param name="display">n</xsl:param>