Ignore:
Timestamp:
2020-07-20T23:20:27+12:00 (4 years 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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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>
Note: See TracChangeset for help on using the changeset viewer.