- doc_name and doc_path were reversed for some reason.

* src/yelp-db-pager.c:
- doc_name and doc_path were reversed for some reason.

* stylesheets/db2html-html.xsl:
- Some fancification to the navbar.

4 files changed, 97 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index 128ba412..08254687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-30  Shaun McCance  <shaunm@gnome.org>
+
+	* src/yelp-db-pager.c:
+	- doc_name and doc_path were reversed for some reason.
+
 2003-12-29  Shaun McCance  <shaunm@gnome.org>
 
 	* data/toc.xml.in:
diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c
index 53def37f..8db30b55 100644
--- a/src/yelp-db-pager.c
+++ b/src/yelp-db-pager.c
@@ -268,8 +268,8 @@ db_pager_process (YelpPager *pager)
 	gtk_main_iteration ();
 
     uri_slash = g_strrstr (uri_str, "/");
-    doc_name  = g_strndup (uri_str, uri_slash - uri_str + 1);
-    doc_path  = g_strdup  (uri_slash + 1);
+    doc_name  = g_strdup  (uri_slash + 1);
+    doc_path  = g_strndup (uri_str, uri_slash - uri_str + 1);
 
     p_doc_name = g_strconcat("\"", doc_name, "\"", NULL);
     p_doc_path = g_strconcat("\"file://", doc_path, "/\"", NULL);
diff --git a/stylesheets/ChangeLog b/stylesheets/ChangeLog
index bdf4918c..443c844e 100644
--- a/stylesheets/ChangeLog
+++ b/stylesheets/ChangeLog
@@ -1,6 +1,11 @@
 2003-12-30  Shaun McCance  <shaunm@gnome.org>
 
 	* db2html-html.xsl:
+	- Some fancification to the navbar.
+
+2003-12-30  Shaun McCance  <shaunm@gnome.org>
+
+	* db2html-html.xsl:
 	- Make admonitions use the only theme color we have for now.
 
 	* db2html-list.xsl:
diff --git a/stylesheets/db2html-html.xsl b/stylesheets/db2html-html.xsl
index db62fc1f..3f92d3bc 100644
--- a/stylesheets/db2html-html.xsl
+++ b/stylesheets/db2html-html.xsl
@@ -128,7 +128,13 @@ h2 { font-size: 1.4em; font-weight: bold; }
 h3 { font-size: 1.2em; font-weight: bold; }
 
 div[class="title"] + * { margin-top: 0.8em; }
-div[class="body"] { margin-bottom: 1.6em; }
+
+body { margin: 0em; padding: 0em; }
+div[class="body"] {
+	margin-left: 0.8em;
+	margin-right: 0.8em;
+	margin-bottom: 1.6em;
+}
 
 p, div { margin: 0em; }
 p + p, p + div, div + p, div + div { margin-top: 0.8em; }
@@ -140,6 +146,16 @@ ul li { padding-left: 0.4em; }
 
 dd + dt { margin-top: 0.8em; }
 
+div[class="navbar-top"],
+div[class="navbar-bottom"],
+{
+	padding: 0.8em;
+	background-color: </xsl:text>
+<xsl:value-of select="$color_gray_background"/><xsl:text>;
+	border: solid 1px </xsl:text>
+<xsl:value-of select="$color_gray_border"/><xsl:text>;
+}
+
 div[class="example"],
 div[class="figure"],
 div[class="informalexample"],
@@ -252,31 +268,34 @@ div[class="attribution"] {
 			<xsl:with-param name="node" select="$node"/>
 		</xsl:call-template>
 	</xsl:param>
-	<table width="100%" cellpadding="0" cellspacing="0">
-		<tr width="100%">
-			<td width="50%" style="text-align: left;">
-				<xsl:choose>
-					<xsl:when test="$prev = 'titlepage'">
-						<xsl:call-template name="xref">
-							<xsl:with-param name="linkend" select="$prev"/>
-							<xsl:with-param name="target" select="/*/*[&is-info;]"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:call-template name="xref">
-							<xsl:with-param name="linkend" select="$prev"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</td>
-			<td width="50%" style="text-align: right;">
-				<xsl:call-template name="xref">
-					<xsl:with-param name="linkend" select="$next"/>
-				</xsl:call-template>
-			</td>
-		</tr>
-	</table>
-	<hr/>
+	<!--
+	<div class="navbar-top">
+		<table width="100%" cellpadding="0" cellspacing="0">
+			<tr width="100%">
+				<td width="50%" style="text-align: left;">
+					<xsl:choose>
+						<xsl:when test="$prev = 'titlepage'">
+							<xsl:call-template name="xref">
+								<xsl:with-param name="linkend" select="$prev"/>
+								<xsl:with-param name="target" select="/*/*[&is-info;]"/>
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:call-template name="xref">
+								<xsl:with-param name="linkend" select="$prev"/>
+							</xsl:call-template>
+						</xsl:otherwise>
+					</xsl:choose>
+				</td>
+				<td width="50%" style="text-align: right;">
+					<xsl:call-template name="xref">
+						<xsl:with-param name="linkend" select="$next"/>
+					</xsl:call-template>
+				</td>
+			</tr>
+		</table>
+	</div>
+	-->
 </xsl:template>
 
 <xsl:template name="html.navbar.bottom">
@@ -296,46 +315,47 @@ div[class="attribution"] {
 			<xsl:with-param name="node" select="$node"/>
 		</xsl:call-template>
 	</xsl:param>
-	<hr/>
-	<table width="100%" cellpadding="0" cellspacing="0">
-		<tr width="100%">
-			<td width="40%" style="text-align: left;">
-				<xsl:choose>
-					<xsl:when test="$prev = 'titlepage'">
-						<xsl:call-template name="xref">
-							<xsl:with-param name="linkend" select="$prev"/>
-							<xsl:with-param name="target" select="/*/*[&is-info;]"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:call-template name="xref">
-							<xsl:with-param name="linkend" select="$prev"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</td>
-			<td width="20%" style="text-align: center;">
-				<xsl:if test="$top != ''">
-					<a>
-						<xsl:attribute name="href">
-							<xsl:call-template name="xref.target">
-								<xsl:with-param name="linkend" select="$top"/>
-								<xsl:with-param name="target" select="/*"/>
+	<div class="navbar-bottom">
+		<table width="100%" cellpadding="0" cellspacing="0">
+			<tr width="100%">
+				<td width="40%" style="text-align: left;">
+					<xsl:choose>
+						<xsl:when test="$prev = 'titlepage'">
+							<xsl:call-template name="xref">
+								<xsl:with-param name="linkend" select="$prev"/>
+								<xsl:with-param name="target" select="/*/*[&is-info;]"/>
 							</xsl:call-template>
-						</xsl:attribute>
-						<xsl:call-template name="gettext">
-							<xsl:with-param name="key" select="'Contents'"/>
-						</xsl:call-template>
-					</a>
-				</xsl:if>
-			</td>
-			<td width="40%" style="text-align: right;">
-				<xsl:call-template name="xref">
-					<xsl:with-param name="linkend" select="$next"/>
-				</xsl:call-template>
-			</td>
-		</tr>
-	</table>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:call-template name="xref">
+								<xsl:with-param name="linkend" select="$prev"/>
+							</xsl:call-template>
+						</xsl:otherwise>
+					</xsl:choose>
+				</td>
+				<td width="20%" style="text-align: center;">
+					<xsl:if test="$top != ''">
+						<a>
+							<xsl:attribute name="href">
+								<xsl:call-template name="xref.target">
+									<xsl:with-param name="linkend" select="$top"/>
+									<xsl:with-param name="target" select="/*"/>
+								</xsl:call-template>
+							</xsl:attribute>
+							<xsl:call-template name="gettext">
+								<xsl:with-param name="key" select="'Contents'"/>
+							</xsl:call-template>
+						</a>
+					</xsl:if>
+				</td>
+				<td width="40%" style="text-align: right;">
+					<xsl:call-template name="xref">
+						<xsl:with-param name="linkend" select="$next"/>
+					</xsl:call-template>
+				</td>
+			</tr>
+		</table>
+	</div>
 </xsl:template>
 
 </xsl:stylesheet>