Ignore:
Timestamp:
2021-08-05T20:32:50+12:00 (3 years ago)
Author:
anupama
Message:
  1. Less vertical space (but more horizontal space) used now for the browse and search bar/area. Reduced space between this and the following elements too. 2. Moved login/prefs/help links into xsl:template, not called. 3. Moved the links to all search forms into xsl:template, not called, now only the link to the advanced search form is provided. 4. Better layout of advanced form. 5. Tried not to break mobile css settings. Remember: need to still Publish weebly site after making and saving change of iframe's min-height from 900px 100vh in embedded-dl.html.
Location:
main/trunk/model-interfaces-dev/wmtb
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/model-interfaces-dev/wmtb/styles/gs-wmtb-custom.css

    r35245 r35257  
    4040
    4141
    42 /* hardcoded values copied from weebly site theme's variables.less file called in header.less */
     42/* Mobile settings
     43Hardcoded values copied from weebly site theme's variables.less file called in header.less */
    4344@media screen and (max-width: 1024px) { /* bp-small-max */
    4445    body {
     
    8889}
    8990
     91/*
     92   Non-mobile settings.
     93 */
    9094@media screen and (min-width: 1025px) { /* bp-small */
    9195    div.crop-bg {
     
    109113    }
    110114
     115    #gs_content {
     116    max-width: 70vw;
     117    }
    111118}
    112119
     
    138145}
    139146
     147/*
    140148.container {   
    141149    clear: right;
     
    143151    padding-top: 0;
    144152}
     153*/
    145154
    146155#gs_content pre {
     
    149158
    150159#gs_content {
     160    clear: both;
    151161    line-height: 1.3rem;
    152162}
     
    212222}
    213223
     224/*
    214225div#topnav li, .query-form-links li {
    215226    line-height: 2rem;   
    216227}
     228*/
    217229
    218230div#wizardContainer {
     
    232244    float: right;
    233245}
    234 div.query-form-links ul {
     246div.query-form-links ul, #advanced {
    235247    clear: right;
    236248    float: right;
     
    253265}
    254266
     267
     268#quickSearchSubmitButton {
     269    width: 3rem;
     270}
     271
     272#browse-search-bars {
     273    max-width: 100vw;
     274    padding: 1rem;
     275    /*height: 10vh;*/ /* useful for selecting div in dev tools */
     276    /* max-height: 10vh; */
     277}
     278
     279#browse-search-bars #topbar {
     280    line-height: 2rem;
     281}
     282
     283div.paramLabel, div.paramValue {
     284    display: inline;
     285    line-height: 2rem;
     286}
     287
     288/* overriding main_style.css */
     289.main-wrap .wsite-section-wrap:first-child .container {
     290    padding-top: 0;
     291}
     292
  • main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl

    r35244 r35257  
    1414    extension-element-prefixes="java util result exsl"
    1515    exclude-result-prefixes="util java util">
    16 
     16  <!--
    1717  <xsl:import href="footer.xsl"/>
     18  -->
     19 
    1820<!-- The main layout is defined here -->
    1921<!-- Every page in our library uses this template -->
     
    8688      </div>
    8789
    88       <div class="container wrapper-old col0" style="margin:10px auto"> <!-- used to be 10px 30px -->
    89         <div id="topline">
    90           <ul>
    91         <xsl:call-template name="loginLinks"/>                 
    92         <li><a href="{$library_name}/collection/{$collNameChecked}/page/pref">Preferences</a></li>
    93         <xsl:choose>
    94           <xsl:when test="/page/pageResponse/collection">
    95             <li><a href="{$library_name}/collection/{$collNameChecked}/page/help">Help</a></li>
    96           </xsl:when> 
    97           <xsl:otherwise>
    98             <li><a href="{$library_name}/page/help">Help</a></li>
    99           </xsl:otherwise>     
    100         </xsl:choose>
    101           </ul>
    102           <br class="clear" />
    103         </div>
    104       </div>
     90      <!--<xsl:call-template name="login-prefs-help-links"/>-->
    10591     
    106       <div class="container wrapper-old col2">     
     92      <div class="container wrapper-old col2" id="browse-search-bars">
    10793        <div id="topbar">
    10894          <div id="topnav">
     
    164150<!--<li><a href="{$currentPage}">Browse</a>-->
    165151<li>Browse by:
    166 <ul>
     152<ul class="drop-down-list">
    167153<xsl:call-template name="Browsing"/>
    168154</ul>
     
    445431              </xsl:attribute>
    446432              </input>-->
    447           <input type="submit" id="quickSearchSubmitButton" value="&#160;&#160;&#160;&#160;Go&#160;&#160;&#160;&#160;"/>
     433
     434          <input type="submit" id="quickSearchSubmitButton" value="Go"/>
     435
    448436          <br/>
    449437        </xsl:if>
    450438          </form>
     439         
     440          <div class="query-form-links" id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/AdvancedFieldQuery">Advanced search</a></div>
     441         
    451442        </xsl:when>
    452443        <xsl:otherwise><br/></xsl:otherwise>
    453444      </xsl:choose>         
    454445    </xsl:if>
    455    
     446
    456447      </div>
    457448      <!--<br class="clear" />-->
    458449      <!--<span id="advanced">-->
    459450
    460       <!-- The list of other search types -->
     451      <!-- The list of other search types -->     
     452      <!--<xsl:call-template name="all-other-search-form-links"/>-->
     453
     454     
     455    </xsl:if>
     456
     457   
     458    <!--<br class="clear" />
     459    <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/TextQuery">form search</a></div>
     460    <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/AdvancedFieldQuery">advanced search</a></div>
     461    -->
     462  </xsl:template>
     463
     464  <!-- Bar that links to other search forms -->
     465  <xsl:template name="all-other-search-form-links">
     466      <!-- The list of other search types -->     
    461467      <div class="query-form-links">
    462468    <ul>
     
    471477            </a>
    472478          </li>
    473         </xsl:if>
     479        </xsl:if>
    474480      </xsl:for-each>
    475481    </ul>
    476482      </div>
    477     </xsl:if>
    478     <!--<br class="clear" />
    479     <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/TextQuery">form search</a></div>
    480     <div id="advanced"><a href="{$library_name}/collection/{$collNameChecked}/search/AdvancedFieldQuery">advanced search</a></div>
    481     -->
     483   
    482484  </xsl:template>
    483    
     485
     486  <!-- navigation bar for login, preferences and help links -->
     487  <xsl:template name="login-prefs-help-links">
     488      <div class="container wrapper-old col0" style="margin:10px auto"> <!-- used to be 10px 30px -->
     489        <div id="topline">
     490          <ul>
     491        <xsl:call-template name="loginLinks"/>                 
     492        <li><a href="{$library_name}/collection/{$collNameChecked}/page/pref">Preferences</a></li>
     493        <xsl:choose>
     494          <xsl:when test="/page/pageResponse/collection">
     495            <li><a href="{$library_name}/collection/{$collNameChecked}/page/help">Help</a></li>
     496          </xsl:when> 
     497          <xsl:otherwise>
     498            <li><a href="{$library_name}/page/help">Help</a></li>
     499          </xsl:otherwise>     
     500        </xsl:choose>
     501          </ul>
     502          <br class="clear" />
     503        </div>
     504      </div>   
     505  </xsl:template>
     506 
    484507</xsl:stylesheet>
Note: See TracChangeset for help on using the changeset viewer.