Changeset 28558 for main

Timestamp:

2013-10-30T16:52:29+13:00 (10 years ago)

Author:

jlwhisler

Message:

Fixed an idiosyncrasy so that when there is only one search index, the index field name will appear in the quick search box -- demonstrated in the Simple Image Collection. This looks better when the index is listed before the search box, so this was fixed too. Now the index label (or index drop box with 2+ indexes) appears before the search box.

File:

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

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

@@ -498 +498 @@
                             <input type="hidden" name="s1.maxDocs" value="100"/>
                         </xsl:if>
+                        <!-- The index selection list -->
+                        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='index']/@type = 'enum_single'">
+                            <span class="textselect">
+                                <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='index']">
+                                    <xsl:with-param name="default">
+                                        <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='index']" mode="calculate-default"/>
+                                    </xsl:with-param>
+                                    <xsl:with-param name="hideSingle">false</xsl:with-param>
+                                </xsl:apply-templates>
+                            </span>
+                        </xsl:if>
                         <!-- The query text box -->
                         <span class="querybox">
@@ -509 +520 @@
                             </nobr>
                         </span>
-                        <!-- The index selection list -->
-                        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='index']/@type = 'enum_single'">
-                            <span class="textselect">
-                                <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='index']">
-                                    <xsl:with-param name="default">
-                                        <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='index']" mode="calculate-default"/>
-                                    </xsl:with-param>
-                                    <xsl:with-param name="hideSingle">true</xsl:with-param>
-                                </xsl:apply-templates>
-                            </span>
-                        </xsl:if>
+                        
                         <!-- The submit button (for TextQuery) -->
                         <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']">