Navigational links: Back again to table layout for version 5.1.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/b5_1/BOOK@3588 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 69 insertions, 157 deletions

diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index c7cc75d32..16782c4f2 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -3,49 +3,13 @@ body {
   font-size: medium;
   font-family: verdana, tahoma, helvetica, arial, sans-serif;
   text-align: left;
+  background: #fff;
 }
 
 .toc ul, .index ul {
 	list-style: none;
 }
 
-.navheader, .navfooter {
-  font-size: smaller;
-  text-align: center;
-}
-
-.headerlinks {
-  border-bottom : solid 2px green;
-  padding-bottom: 0.5em;
-}
-
-.navfooter {
-  border-top : solid 2px green;
-  padding-top: 0.5em;
-  margin-top: 0.5em;
-}
-
-.prev {
-   float     : left;
-   text-align: left;
-   /* border    : solid 1px #ddd; */
-   padding-left: 2em;
-}
-
-.next {
-   float     : right;
-   text-align: right;
-   /* border    : solid 1px #0dd; */
-   padding-right: 2em;
-}
-
-.up {
-   /* border : solid 1px #ff0; */
-   width  : 10em;
-   /* background-color: #bbb; */
-   margin: 0px auto;
-}
-
 li.preface {
 	margin-left: 2.5em;
 }
diff --git a/stylesheets/xhtml/lfs-navigational.xsl b/stylesheets/xhtml/lfs-navigational.xsl
index 766f2a9ef..8e06c8c60 100644
--- a/stylesheets/xhtml/lfs-navigational.xsl
+++ b/stylesheets/xhtml/lfs-navigational.xsl
@@ -26,125 +26,73 @@
             and generate-id($up) != generate-id($home)) or count($next) > 0"/>
     <xsl:if test="$row and $home != .">
       <div class="navheader">
-        <xsl:if test="$home != .">
-          <div class="headertitles">
-            <p>
-              <xsl:apply-templates select="$home" mode="object.title.markup"/>
-              <xsl:text> - </xsl:text>
-              <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
-            </p>
-            <xsl:if test="$up != $home">
-              <p><b>
-                <xsl:apply-templates select="$up" mode="object.title.markup"/>
-              </b></p>
-            </xsl:if>
-          </div>
-        </xsl:if>
-        <div class="headerlinks">
-          <xsl:if test="count($prev)&gt;0 and $prev != $home">
-            <div class='prev'>
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$prev"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Prev</xsl:text>
-              </a>
-            </div>
-          </xsl:if>
-          <xsl:if test="count($next)&gt;0">
-            <div class='next'>
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$next"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Next</xsl:text>
-              </a>
-            </div>
-          </xsl:if>
-          <div class='home'>
-            <a accesskey="h">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$home"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:text>Home</xsl:text>
-            </a>
-          </div>
-        </div>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-  	<!-- Footer Navigation-->
-  <xsl:template name="footer.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:param name="nav.context"/>
-    <xsl:variable name="home" select="/*[1]"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="row" select="count($prev) &gt; 0 or count($up) &gt; 0
-            or count($next) &gt; 0 or generate-id($home) != generate-id(.)"/>
-    <xsl:if test="$row">
-      <div class="navfooter">
-          <xsl:if test="count($prev)&gt;0 and $prev != $home">
-            <div class='prev'>
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$prev"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Prev</xsl:text>
-              </a><br/>
-              <xsl:text> </xsl:text>
-              <xsl:apply-templates select="$prev" mode="object.title.markup"/>
-            </div>
-          </xsl:if>
-          <xsl:if test="count($next)&gt;0">
-            <div class='next'>
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$next"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Next</xsl:text>
-              </a><br/>
-              <xsl:text> </xsl:text>
-              <xsl:apply-templates select="$next" mode="object.title.markup"/>
-            </div>
-          </xsl:if>
-          <xsl:if test="count($up)&gt;0 and $up != $home">
-            <div class='up'>
-              <a accesskey="u">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$up"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:text>Up</xsl:text>
-               </a>
-               <xsl:if  test="$home != .">
-                 <div class='home'>
-                   <a accesskey="h">
-                     <xsl:attribute name="href">
-                       <xsl:call-template name="href.target">
-                         <xsl:with-param name="object" select="$home"/>
-                       </xsl:call-template>
-                     </xsl:attribute>
-                     <xsl:text>Home</xsl:text>
-                   </a>
-                 </div>
-               </xsl:if>
-            </div>
-          </xsl:if>
-      </div>
-    </xsl:if>
-  </xsl:template>
+				<xsl:if test="$home != .">
+					<table width="100%" summary="Navigation header">
+						<tr>
+							<th colspan="3" align="center">
+								<h4>
+									<xsl:apply-templates select="$home" mode="object.title.markup"/>
+									<xsl:text> - </xsl:text>
+                  <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
+								</h4>
+							</th>
+						</tr>
+						<xsl:if test="$up != $home">
+							<tr>
+								<th colspan="3" align="center">
+									<h3>
+										<xsl:apply-templates select="$up" mode="object.title.markup"/>
+									</h3>
+								</th>
+							</tr>
+						</xsl:if>
+						<tr>
+							<td width="33%" align="left">
+								<a accesskey="p">
+									<xsl:attribute name="href">
+										<xsl:call-template name="href.target">
+											<xsl:with-param name="object" select="$prev"/>
+										</xsl:call-template>
+									</xsl:attribute>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'prev'"/>
+									</xsl:call-template>
+								</a>
+								<xsl:text>&#160;</xsl:text>
+							</td>
+							<td width="34%" align="center">
+								<a accesskey="h">
+                	<xsl:attribute name="href">
+										<xsl:call-template name="href.target">
+											<xsl:with-param name="object" select="$home"/>
+										</xsl:call-template>
+									</xsl:attribute>
+									<xsl:call-template name="navig.content">
+										<xsl:with-param name="direction" select="'home'"/>
+									</xsl:call-template>
+								</a>
+							</td>
+							<td width="33%" align="right">
+								<xsl:text>&#160;</xsl:text>
+								<xsl:if test="count($next)&gt;0">
+									<a accesskey="n">
+										<xsl:attribute name="href">
+											<xsl:call-template name="href.target">
+												<xsl:with-param name="object" select="$next"/>
+											</xsl:call-template>
+										</xsl:attribute>
+										<xsl:call-template name="navig.content">
+											<xsl:with-param name="direction" select="'next'"/>
+										</xsl:call-template>
+									</a>
+								</xsl:if>
+							</td>
+						</tr>
+					</table>
+					<hr/>
+				</xsl:if>
+			</div>
+		</xsl:if>
+	</xsl:template>
 
 </xsl:stylesheet>