Changeset 30169 for main/trunk/greenstone3/web/interfaces/default/transform

Timestamp:

2015-09-02T13:36:28+12:00 (9 years ago)

Author:

kjdon

Message:

changing the filtering algorithm. Can choose between pagenum and title. pagenum is numeric by default, title is string matching.

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/toc.xsl (modified) (3 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/toc.xsl

@@ -89 +89 @@
                                         {
                                             retrieveTableOfContentsAndTitles();
+                                                <!--setUpFilterButtons();-->
                                         });
                                     </xsl:text>
@@ -96 +97 @@
                                     <img src="{util:getInterfaceText($interface_name, /page/@lang, 'loading_image')}"/><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.loading')"/><xsl:text>...</xsl:text>
                                 </div>
-                                <table style="width:100%;"><tbody><tr>
-                                    <td><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.filter_pages')"/><xsl:text>: </xsl:text><input id="filterText" type="text" size="27"/></td>
+                                <label for="filterText"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.filter_pages')"/><xsl:text>: </xsl:text></label><span id="filterOnButtons" style="float: right;">xx</span><input id="filterText" type="text" style="width: 100%;"/>
+                                <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true'">
+                                  <a href="javascript:extractFilteredPagesToOwnDocument();"><button id="extractDocButton">Extract these pages to document</button></a>
+                                </xsl:if>
+                                  
+                            <!--    <table style="width:100%;"><tbody><tr>
+                                    <td><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.filter_pages')"/><xsl:text>: </xsl:text><input id="filterText" type="text"/></td>
                                 </tr>
                                 <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true'">
                                     <tr><td><a href="javascript:extractFilteredPagesToOwnDocument();"><button id="extractDocButton">Extract these pages to document</button></a></td></tr>
                                 </xsl:if>
-                                </tbody></table>
+                                </tbody></table>-->
                             </xsl:when>
                             <xsl:when test="not(/page/pageRequest/paramList/param[@name = 'ed']/@value = '1')">
@@ -202 +208 @@
                     <a id="toclink{@nodeID}" href="javascript:focusSection('{@nodeID}');">
                         <xsl:if test="util:hashToSectionId(@nodeID)">
-                            <xsl:value-of select="util:hashToSectionId(@nodeID)"/>
-                            <xsl:text> </xsl:text>
-                        </xsl:if>
-                        <xsl:call-template name="sectionHeading"/>
+                          <span class="tocSectionNumber"><xsl:value-of select="util:hashToSectionId(@nodeID)"/><!--<xsl:text> </xsl:text>--></span></xsl:if><xsl:call-template name="sectionHeading"/>
                     </a>
                 </td>