Changeset 31398


Ignore:
Timestamp:
2017-02-09T21:42:05+13:00 (6 years ago)
Author:
Georgiy Litvinov
Message:

Revert "Moved li inside templates to get rid of empty li elements in html"

This reverts commit af353a33714b48cc064b39c5ddace927c5943406.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

    r31386 r31398  
    277277  <xsl:template name="home-help-preferences">
    278278    <ul id="bannerLinks">
    279       <xsl:call-template name="RSSLink"/>
    280       <xsl:call-template name="PrefsLink"/>
    281       <xsl:call-template name="HelpLink"/>
    282       <xsl:call-template name="LoginoutLink"/>
    283       <xsl:call-template name="DebugLink"/>
     279      <li><xsl:call-template name="RSSLink"/></li>
     280      <li><xsl:call-template name="PrefsLink"/></li>
     281      <li><xsl:call-template name="HelpLink"/></li>
     282      <li id="userMenuButton"><xsl:call-template name="LoginoutLink"/></li>
     283      <li><xsl:call-template name="DebugLink"/></li>
    284284      <xsl:call-template name="buttonStyling"/>
    285285    </ul>
     
    291291     If it's present in any format statement, display the RSS link in the bannerlinks section. -->
    292292    <xsl:if test="/page/pageResponse/format[@type='display' or @type='browse' or @type='search' or not(@type)]/gsf:option[@name='RSS']/@value = 'true'">
    293      <li>
    294293      <gsf:link type="rss"><gsf:icon file="rssicon.png"/></gsf:link>
    295      </li>
    296294    </xsl:if>
    297295  </xsl:template>
    298296 
    299297  <xsl:template name="PrefsLink">
    300     <li>
    301298    <a href="{$library_name}/collection/{$collNameChecked}/page/pref">
    302299      <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_tip')"/></xsl:attribute>
    303300      <span id="preferencesButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></span>
    304301    </a>
    305     </li>
    306302  </xsl:template>
    307303 
    308304  <xsl:template name="HelpLink">
    309    <li>
    310305    <a href="{$library_name}/collection/{$collNameChecked}/page/help">
    311306      <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_tip')"/></xsl:attribute>
    312307      <span id="helpButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></span>
    313308    </a>
    314    </li>
    315309  </xsl:template>
    316310 
     
    436430 
    437431  <xsl:template name="LoginoutLink">
    438    <li id="userMenuButton">
    439432    <!-- login/logout -->
    440433    <xsl:choose>
     
    455448      </xsl:otherwise>
    456449    </xsl:choose>
    457    </li>
    458450  </xsl:template>
    459451 
     
    461453    <!-- debuginfo (doesn't use class="ui-state-error" since the text is not legible due to inherited text-colour) -->
    462454    <xsl:if test="/page/pageRequest/paramList/param[(@name='debug') and (@value='on' or @value='true' or @value='1' or @value='yes')]">
    463      <li>
    464455      <a href="{$library_name}/collection/{$collNameChecked}/page/debug">
    465456    <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_tip')"/></xsl:attribute>
    466457    <span id="debugButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_b')"/></span>
    467458      </a>
    468      </li>
    469459    </xsl:if>
    470460  </xsl:template>
Note: See TracChangeset for help on using the changeset viewer.