Changeset 34275

Show
Ignore:
Timestamp:
20.07.2020 23:20:27 (2 weeks ago)
Author:
ak19
Message:

Bugfixes to whakatohea interface: 1. Overflow from coll or group description into footer area fixed. Strangely, a self closing divider was ending up with its following siblings as its children instead. Added a hack in home.xsl to fix this. 2. GS3 collection title on banner now. It was expanding the banner section. 2. Corrected Environment pou link name in navbar to Taiao. 4. Some spacing corrections in 2nd column of footer. 5. Tidied up some unused xsl.

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

Legend:

Unmodified
Added
Removed
  • main/trunk/model-interfaces-dev/wmtb/transform/layouts/header.xsl

    r34273 r34275  
    608608                > 
    609609                  <span class="wsite-menu-title"> 
    610                 Toi Ora | Enviroment 
     610                Taiao | Enviroment 
    611611                  </span> 
    612612                </a> 
     
    665665                         
    666666 
    667 <div class="paragraph" style="text-align:left;"><strong><font color="#fa8a00">Our People</font></strong><br /><font><font><a href="/t299puna.html"><span>&#65279;</span><span>&#65279;</span><font color="#a1a1a1">Tipuna</font></a> </font><span>&#65279;</span></font><span>&#65279;</span><font color="#a1a1a1">&#160; &#160; &#160; &#160; &#160; &#160; &#160; &#160; &#160; &#160; &#160; &#160;&#160;</font><br /><a href="/hap363-and-marae.html"><span>&#65279;</span><font color="#a1a1a1">Hapu &amp; Marae</font><span>&#65279;</span></a><br /><a href="/kaum257tua.html"><span>&#65279;</span><font color="#a1a1a1">Kaumatua</font><span>&#65279;</span></a><br />Whakatohea Pre-Settlement&#160;<br /><a href="/history-and-archives.html"><font color="#a1a1a1">History &amp; Archives</font></a></div> 
     667<div class="paragraph" style="text-align:left;"><strong><font color="#fa8a00">Our People</font></strong><br /><font><font><a href="/t299puna.html"><font color="#a1a1a1">Tipuna</font></a></font></font><br /><a href="/hap363-and-marae.html"><font color="#a1a1a1">Hapu &amp; Marae</font></a><br /><a href="/kaum257tua.html"><font color="#a1a1a1">Kaumatua</font></a><br />Whakatohea Pre-Settlement&#160;<br /><a href="/history-and-archives.html"><font color="#a1a1a1">History &amp; Archives</font></a></div> 
    668668 
    669669 
  • main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl

    r34273 r34275  
    2727    <body id="top" class="banner-overlay-on"> 
    2828      <div class="wrapper"> 
     29 
     30    <!-- Whakatohea.co.nz's navbar --> 
     31    <xsl:call-template name="whakatohea-navbar"/> 
    2932     
    30     <xsl:call-template name="whakatohea-navbar"/> 
    3133    <div class="site-canvas"> 
    3234      <div class="wrapper-old col0"> 
     
    7981        </div> 
    8082      </div> 
    81       <div class="wrapper-old col2"> 
    82  
    83             <div id="topbar"> 
    84                 <div id="topnav"> 
    85                     <ul> 
    86                         <xsl:call-template name="navBar"/> 
    87                     </ul> 
    88                 </div> 
    89                 <!--**********************************************************************--> 
    90                 <xsl:choose> 
    91                     <xsl:when test="page/pageRequest/@subaction='home'"> 
    92                         <xsl:call-template name="crossCollSearch"/> 
    93                     </xsl:when> 
    94                     <xsl:when test="page/pageRequest/paramList/param/@name='c' and /page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']"> 
    95                         <xsl:call-template name="quick-search-area"/> 
    96                     </xsl:when> 
    97                     <xsl:otherwise/> 
    98                 </xsl:choose> 
    99                 <!--**********************************************************************--> 
    100             </div> 
    101         </div> 
    102         <div class="wrapper-old"> 
    103             <div class="container" id="gs_content"> 
    104                 <xsl:apply-templates select="/page"/>                
    105             </div> 
    106             <br class="clear" /> 
    107         </div> 
    108         <xsl:call-template name="wmtb-footer"/> 
    109  
    110       </div> <!-- end site-canvas --> 
    111     </div> <!-- end wrapper--> 
    112     </body> 
     83       
     84      <div class="wrapper-old col2">         
     85        <div id="topbar"> 
     86          <div id="topnav"> 
     87        <ul> 
     88          <xsl:call-template name="navBar"/> 
     89        </ul> 
     90          </div> 
     91          <!--**********************************************************************--> 
     92          <xsl:choose> 
     93        <xsl:when test="page/pageRequest/@subaction='home'"> 
     94          <xsl:call-template name="crossCollSearch"/> 
     95        </xsl:when> 
     96        <xsl:when test="page/pageRequest/paramList/param/@name='c' and /page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery']"> 
     97          <xsl:call-template name="quick-search-area"/> 
     98        </xsl:when> 
     99        <xsl:otherwise/> 
     100          </xsl:choose> 
     101          <!--**********************************************************************--> 
     102        </div> 
     103      </div> 
     104       
     105      <div class="outer"> 
     106        <div id="gs_content"> 
     107          <xsl:apply-templates select="/page"/>              
     108        </div> 
     109        <br class="clear" /> 
     110         
     111      </div><!-- end class main-wrap--> 
     112      <xsl:call-template name="wmtb-footer"/> 
     113       
     114    </div> <!-- end site-canvas --> 
     115      </div> <!-- end wrapper--> 
     116    </body> 
    113117</html> 
    114118</xsl:template> 
  • main/trunk/model-interfaces-dev/wmtb/transform/pages/home.xsl

    r34273 r34275  
    3838    <xsl:template match="/page/pageResponse"> 
    3939      <div class="main-wrap"> 
    40          
    4140        <div id="wsite-content" class="wsite-elements wsite-not-footer"> 
    4241          <div class="wsite-section-wrap"> 
     
    4544            <div class="container"> 
    4645              <div class="wsite-section-elements"> 
    47             <div class="wsite-spacer" style="height:50px;"></div> 
    48  
     46            <!-- forced to add nbsp (which in XSL is &#160;) in div.wsite-spacer 
     47                 because otherwise text overflows from the main page into footer  
     48                 caused by html rendering of div.wsite-spacer's subsequent sibling 
     49                 divs as *children* of div.wsite-spacer instead. 
     50                 Beware that XSL errors ensue if &nbsp; is used as it's not a defined 
     51                 entity in XSL, only in HTML. Must use &#160; for nbsp in XSL, see 
     52                 https://stackoverflow.com/questions/1461649/how-to-insert-nbsp-in-xslt 
     53            --> 
     54            <div class="wsite-spacer" style="height:50px;"> 
     55              &#160; &#160; &#160; 
     56            </div> 
    4957            <div><div class="wsite-multicol"><div class="wsite-multicol-table-wrap" style="margin:0 -15px;"> 
    5058              <table class="wsite-multicol-table"> 
    5159                <tbody class="wsite-multicol-tbody"> 
    5260                  <tr class="wsite-multicol-tr"> 
    53                 <!-- 
    54                     <div class="content">                    
    55                     <img src="interfaces/perrin/images/default.jpg" alt="" /> 
    56                     </div> 
    57                 --> 
    5861                <xsl:call-template name="collectionAndGroupLinks"/> 
    5962                  </tr> 
     
    6972           
    7073        </div> 
    71          
    72       </div><!-- end main-wrap --> 
    73         <br class="clear" /> 
    74         <div id="hpage_cats"> 
    75  
    76           <!--<xsl:call-template name="collectionsList"/>--> 
    77         </div>       
     74      </div><!-- end class main-wrap--> 
    7875    </xsl:template> 
    79  
    8076 
    8177    <xsl:template name="additionalHeaderContent">