Changeset 34212

Show
Ignore:
Timestamp:
20.06.2020 03:59:05 (3 weeks 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.

Location:
main/trunk/model-interfaces-dev/opotiki
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/model-interfaces-dev/opotiki/styles/gs3-core-min.css

    r34087 r34212  
    313313 
    314314 
    315 .col2{color:#FFFFFF; background-color:#F6F6F6;height:67px;} 
     315.col2{color:#FFFFFF; background-color:#F6F6F6;height:90px;} 
    316316 
    317317 
  • main/trunk/model-interfaces-dev/opotiki/styles/layout.css

    r34143 r34212  
    4646.col0, .col0 a{color:#FFFFFF; background-color:#666666;} 
    4747.col2{color:#FFFFFF; background-color:#F6F6F6;} 
    48  
     48div.query-form-links{float:right;} 
     49div.query-form-links a{font-size:16px;background-color:transparent;} 
     50div.query-form-links li{display:inline;padding-left:10px} 
     51div.query-form-links ul{padding-right:20px;} 
    4952/* ----------------------------------------------Generalise------------------------------------- */ 
    5053 
  • main/trunk/model-interfaces-dev/opotiki/transform/layouts/main.xsl

    r34148 r34212  
    281281    <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']"> 
    282282      <xsl:variable name="subaction" select="/page/pageRequest/@subaction"/> 
     283 
    283284      <div id="quicksearcharea"> 
    284285    <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']"> 
     
    290291        <input type="hidden" name="qs" value="1"/> 
    291292        <input type="hidden" name="rt" value="rd"/> 
    292         <input type="hidden" name="s1.level"> 
     293        <!-- don't hide indexing levels: code further down will hide it if there's only 1 indexing level. 
     294             and display a dropdown if the collection's configured with more than 1 index level available --> 
     295        <!--<input type="hidden" name="s1.level"> 
    293296          <xsl:attribute name="value"> 
    294297            <xsl:value-of select="/page/pageResponse/collection/serviceList/service[@name='TextQuery']/paramList/param[@name = 'level']/@default"/> 
    295298          </xsl:attribute> 
    296299        </input> 
     300        --> 
    297301        <xsl:choose> 
    298302          <xsl:when test="/page/pageResponse/service[@name = 'TextQuery']/paramList/param[@name = 'startPage']"> 
     
    342346            </xsl:apply-templates> 
    343347          </span> 
    344         </xsl:if>    
     348        </xsl:if> 
     349 
     350        <!-- The index level selection list. hideSingle=true to hide the dropdown if there's only 1 level (the default). -->                         
     351        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='level']/@type = 'enum_single'"> 
     352          <span class="textselect"> 
     353            <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='level']"> 
     354              <xsl:with-param name="default"> 
     355            <xsl:apply-templates select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='level']" mode="calculate-default"/> 
     356              </xsl:with-param> 
     357              <xsl:with-param name="hideSingle">true</xsl:with-param> 
     358              <xsl:with-param name="quickSearch">true</xsl:with-param> 
     359            </xsl:apply-templates> 
     360          </span> 
     361        </xsl:if>                            
     362 
    345363        <!-- The language selection list -->                         
    346364        <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']/paramList/param[@name='indexLanguage']/@type = 'enum_single'"> 
     
    369387      </xsl:choose>          
    370388    </xsl:if> 
    371     <!-- The list of other search types --> 
    372     <!-- 
     389     
     390      </div> 
     391      <!--<br class="clear" />--> 
     392      <!--<span id="advanced">--> 
     393 
     394      <!-- The list of other search types --> 
     395      <div class="query-form-links"> 
    373396    <ul> 
    374397      <xsl:for-each select="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='query']"> 
    375398        <xsl:if test="/page/pageRequest/paramList/param[@name='qs']/@value = 1 or not(@name = /page/pageRequest/paramList/param[@name='s']/@value)"> 
    376399          <li class="ui-state-default ui-corner-all"> 
    377             <a> 
     400            <a class="query-form-links"> 
    378401              <xsl:attribute name="href"> 
    379402            <xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="$collNameChecked"/>/search/<xsl:value-of select="@name"/> 
     
    385408      </xsl:for-each> 
    386409    </ul> 
    387     --> 
    388410      </div> 
    389411    </xsl:if> 
     412    <!--<br class="clear" /> 
     413    <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/TextQuery">form search</a></div> 
     414    <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/AdvancedFieldQuery">advanced search</a></div> 
     415    --> 
    390416  </xsl:template> 
    391417