Changeset 30778

Timestamp:

2016-09-01T14:29:38+12:00 (7 years ago)

Author:

kjdon

Message:

removing hard coded text fragments from xsl/js files

Location:

main/trunk/greenstone3/web/interfaces/default/transform/pages

Files:

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

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

@@ -120 +120 @@
                             </xsl:for-each>
                             <xsl:if test="count(count) > $countSize">
-                                <li class="expandCollapseFacetList{$indexShortName}">
-                                    <a class="expandCollapseFacetListLink{$indexShortName}" href="javascript:expandFacetList('{$indexShortName}', {$countSize});">See more...</a>
+                                <li class="expandFacetList{$indexShortName}">
+                                    <a class="expandFacetListLink{$indexShortName}" href="javascript:expandFacetList('{$indexShortName}', {$countSize});"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.facet.more')"/></a>
+                                </li>
+                                <li class="collapseFacetList{$indexShortName}" style="display: none;">
+                                    <a  class="collapseFacetListLink{$indexShortName}" href="javascript:collapseFacetList('{$indexShortName}', {$countSize});"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.facet.less')"/></a>
                                 </li>
                             </xsl:if>
@@ -428 +431 @@
                     <xsl:value-of select="/page/pageRequest/paramList/param[@name='s1.hitsPerPage']/@value" />
                 </xsl:when>
-                <xsl:when test="$usesS1 = 'true' and /page/pageResponse/service/paramList/param[@name='hitsPerPage']">
+                <xsl:when test="/page/pageResponse/service/paramList/param[@name='hitsPerPage']">
                   <xsl:value-of select="/page/pageResponse/service/paramList/param[@name='hitsPerPage']/@default" />
                   </xsl:when>
@@ -454 +457 @@
                 <td id="prevTD">
                     <xsl:if test="$currentPage != 1">
-                        <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">Previous</a>
+                        <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/@subaction}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage - 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.results.previous')"/></a>
                     </xsl:if>
                 </td>
@@ -507 +510 @@
                 <td id="nextTD">
                     <xsl:if test="$docsPerPage &gt; 0 and ($currentPage * $docsPerPage + 1) &lt; $docMax">
-                        <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}">Next</a>
+                        <a href="{$library_name}?a=q&amp;sa={/page/pageRequest/paramList/param[@name = 'sa']/@value}&amp;c={$collName}&amp;s={/page/pageResponse/service/@name}&amp;rt=rd&amp;{$startPageName}={$currentPage + 1}&amp;qs={/page/pageRequest/paramList/param[@name='qs']/@value}"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'query.results.next')"/></a>
                     </xsl:if>
                 </td>

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

@@ -6 +6 @@
   <xsl:output method="xml" version="1.0" encoding="utf-8"/>
   
-  <!-- set page title -->
-  <xsl:template name="pageTitle">RSS feed</xsl:template>
 
   <!-- select only the rss child of /page/pageResponse and then copy all its attributes and