Changeset 34212 for main/trunk/model-interfaces-dev/opotiki/transform/layouts/main.xsl

Timestamp:

2020-06-20T03:59:05+12:00 (4 years ago)

Author:

ak19

Message:

1. Opotiki interface needs the index level dropdown to appear when there's more than one. 2. Also putting in the non-basic search form links and adjusting the styling for them.

File:

• main/trunk/model-interfaces-dev/opotiki/transform/layouts/main.xsl (modified) (5 diffs)

main/trunk/model-interfaces-dev/opotiki/transform/layouts/main.xsl

@@ -281 +281 @@
     <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']">
       <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/>
+
       <div id="quicksearcharea">
     <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']">
@@ -290 +291 @@
         <input type="hidden" name="qs" value="1"/>
         <input type="hidden" name="rt" value="rd"/>
-        <input type="hidden" name="s1.level">
+        <!-- don't hide indexing levels: code further down will hide it if there's only 1 indexing level.
+             and display a dropdown if the collection's configured with more than 1 index level available -->
+        <!--<input type="hidden" name="s1.level">
           <xsl:attribute name="value">
             <xsl:value-of select="/page/pageResponse/collection/serviceList/service[@name='TextQuery']/paramList/param[@name = 'level']/@default"/>
           </xsl:attribute>
         </input>
+        -->
         <xsl:choose>
           <xsl:when test="/page/pageResponse/service[@name = 'TextQuery']/paramList/param[@name = 'startPage']">
@@ -342 +346 @@
             </xsl:apply-templates>
           </span>
-        </xsl:if>   
+        </xsl:if>
+
+        <!-- The index level selection list. hideSingle=true to hide the dropdown if there's only 1 level (the default). -->                        
+        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='level']/@type = 'enum_single'">
+          <span class="textselect">
+            <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='level']">
+              <xsl:with-param name="default">
+            <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='level']" mode="calculate-default"/>
+              </xsl:with-param>
+              <xsl:with-param name="hideSingle">true</xsl:with-param>
+              <xsl:with-param name="quickSearch">true</xsl:with-param>
+            </xsl:apply-templates>
+          </span>
+        </xsl:if>                           
+
         <!-- The language selection list -->                        
         <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='indexLanguage']/@type = 'enum_single'">
@@ -369 +387 @@
       </xsl:choose>         
     </xsl:if>
-    <!-- The list of other search types -->
-    <!--
+    
+      </div>
+      <!--<br class="clear" />-->
+      <!--<span id="advanced">-->
+
+      <!-- The list of other search types -->
+      <div class="query-form-links">
     <ul>
       <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']">
         <xsl:if test="/page/pageRequest/paramList/param[@name='qs']/@value = 1 or not(@name = /page/pageRequest/paramList/param[@name='s']/@value)">
           <li class="ui-state-default ui-corner-all">
-            <a>
+            <a class="query-form-links">
               <xsl:attribute name="href">
             <xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="$collNameChecked"/>/search/<xsl:value-of select="@name"/>
@@ -385 +408 @@
       </xsl:for-each>
     </ul>
-    -->
       </div>
     </xsl:if>
+    <!--<br class="clear" />
+    <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/TextQuery">form search</a></div>
+    <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/AdvancedFieldQuery">advanced search</a></div>
+    -->
   </xsl:template>