Changeset 31398 for main/trunk/greenstone3/web/interfaces/default/transform

Timestamp:

2017-02-09T21:42:05+13:00 (7 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:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (5 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -277 +277 @@
   <xsl:template name="home-help-preferences">
     <ul id="bannerLinks">
-      <xsl:call-template name="RSSLink"/>
-      <xsl:call-template name="PrefsLink"/>
-      <xsl:call-template name="HelpLink"/>
-      <xsl:call-template name="LoginoutLink"/>
-      <xsl:call-template name="DebugLink"/>
+      <li><xsl:call-template name="RSSLink"/></li>
+      <li><xsl:call-template name="PrefsLink"/></li>
+      <li><xsl:call-template name="HelpLink"/></li>
+      <li id="userMenuButton"><xsl:call-template name="LoginoutLink"/></li>
+      <li><xsl:call-template name="DebugLink"/></li>
       <xsl:call-template name="buttonStyling"/>
     </ul>
@@ -291 +291 @@
      If it's present in any format statement, display the RSS link in the bannerlinks section. -->
     <xsl:if test="/page/pageResponse/format[@type='display' or @type='browse' or @type='search' or not(@type)]/gsf:option[@name='RSS']/@value = 'true'">
-     <li>
       <gsf:link type="rss"><gsf:icon file="rssicon.png"/></gsf:link>
-     </li>
     </xsl:if>
   </xsl:template>
   
   <xsl:template name="PrefsLink">
-    <li>
     <a href="{$library_name}/collection/{$collNameChecked}/page/pref">
       <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_tip')"/></xsl:attribute>
       <span id="preferencesButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></span>
     </a>
-    </li>
   </xsl:template>
   
   <xsl:template name="HelpLink">
-   <li>
     <a href="{$library_name}/collection/{$collNameChecked}/page/help">
       <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_tip')"/></xsl:attribute>
       <span id="helpButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></span>
     </a>
-   </li>
   </xsl:template>
   
@@ -436 +430 @@
   
   <xsl:template name="LoginoutLink">
-   <li id="userMenuButton">
     <!-- login/logout -->
     <xsl:choose>
@@ -455 +448 @@
       </xsl:otherwise>
     </xsl:choose>
-   </li>
   </xsl:template>
   
@@ -461 +453 @@
     <!-- debuginfo (doesn't use class="ui-state-error" since the text is not legible due to inherited text-colour) -->
     <xsl:if test="/page/pageRequest/paramList/param[(@name='debug') and (@value='on' or @value='true' or @value='1' or @value='yes')]">
-     <li>
       <a href="{$library_name}/collection/{$collNameChecked}/page/debug">
     <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_tip')"/></xsl:attribute>
     <span id="debugButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_b')"/></span>
       </a>
-     </li>
     </xsl:if>
   </xsl:template>