Changeset 33260 for main/trunk/greenstone3

Timestamp:

2019-07-02T12:01:12+12:00 (5 years ago)

Author:

davidb

Message:

Tweak to how verify/terms and conditions works

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/verify.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/pages/verify.xsl

@@ -27 +27 @@
       <xsl:variable name="site_key" select="/page/pageResponse/security/@siteKey"/>
       <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>
-      <xsl:variable name="coll_specific_terms"><xsl:value-of select="util:getCollectionText($collName, $site_name, /page/@lang,'verify.terms_content')"/></xsl:variable>
+      <xsl:variable name="coll_specific_terms"><xsl:copy-of select="util:getCollectionText($collName, $site_name, /page/@lang,'verify.terms_content')" /></xsl:variable>
       <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>
-      <xsl:otherwise><xsl:value-of select="$coll_specific_terms" disable-output-escaping="yes"/></xsl:otherwise>
+      <xsl:otherwise><xsl:copy-of select="$coll_specific_terms" /></xsl:otherwise>
     </xsl:choose></xsl:variable>
       <div id="queryform">
@@ -36 +36 @@
         <tr><td>
           <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'verify.terms_title')"/></td>
-          <td><div style="height:120px;  border: 1px solid; overflow:auto;"><xsl:value-of select="$terms" disable-output-escaping="yes"/>
+          <td><div style="  border: 1px solid; overflow:auto;"><xsl:copy-of select="$terms"/>
 </div></td></tr>
 <tr><td><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'verify.terms_accept')"/></td>