Changeset 33260

Show
Ignore:
Timestamp:
02.07.2019 12:01:12 (2 weeks ago)
Author:
davidb
Message:

Tweak to how verify/terms and conditions works

Files:
1 modified

Legend:

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

    r32983 r33260  
    2727      <xsl:variable name="site_key" select="/page/pageResponse/security/@siteKey"/> 
    2828      <xsl:variable name="use_recaptcha"><xsl:choose><xsl:when test="/page/pageResponse/security/@siteKey">true</xsl:when><xsl:otherwise>false</xsl:otherwise></xsl:choose></xsl:variable> 
    29       <xsl:variable name="coll_specific_terms"><xsl:value-of select="util:getCollectionText($collName, $site_name, /page/@lang,'verify.terms_content')"/></xsl:variable> 
     29      <xsl:variable name="coll_specific_terms"><xsl:copy-of select="util:getCollectionText($collName, $site_name, /page/@lang,'verify.terms_content')" /></xsl:variable> 
    3030      <xsl:variable name="terms"><xsl:choose><xsl:when test="$coll_specific_terms = concat('text:',$collName, ':verify.terms_content')"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'verify.terms_content')"/></xsl:when> 
    31       <xsl:otherwise><xsl:value-of select="$coll_specific_terms" disable-output-escaping="yes"/></xsl:otherwise> 
     31      <xsl:otherwise><xsl:copy-of select="$coll_specific_terms" /></xsl:otherwise> 
    3232    </xsl:choose></xsl:variable> 
    3333      <div id="queryform"> 
     
    3636        <tr><td> 
    3737          <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'verify.terms_title')"/></td> 
    38           <td><div style="height:120px;  border: 1px solid; overflow:auto;"><xsl:value-of select="$terms" disable-output-escaping="yes"/> 
     38          <td><div style="  border: 1px solid; overflow:auto;"><xsl:copy-of select="$terms"/> 
    3939</div></td></tr> 
    4040<tr><td><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'verify.terms_accept')"/></td>