cmlenz 2004/04/13 01:50:12
Modified: documentation/docs/skins/jakarta.apache.org/css apache.css
documentation/docs/skins/jakarta.apache.org/stylesheets
document2html.xsl
Log:
- Fix the navigation/content overlap problem when font size is increased on IE/Win
- Process alt attributes on imagemap shapes
- Avoid classitis in navigation menu
Revision Changes Path
1.18 +19 -18
jakarta-cactus/documentation/docs/skins/jakarta.apache.org/css/apache.css
Index: apache.css
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/css/apache.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- apache.css 29 Feb 2004 16:22:02 -0000 1.17
+++ apache.css 13 Apr 2004 08:50:12 -0000 1.18
@@ -39,8 +39,14 @@
width: 100%;
}
#header td.logo { padding: 3px }
-#projectLogo { text-align: left }
-#subprojectLogo { text-align: right }
+#projectLogo {
+ text-align: left;
+ width: 50%;
+}
+#subprojectLogo {
+ text-align: right;
+ width: 50%;
+}
#contextBar td {
background-color: whitesmoke;
border: solid silver;
@@ -65,31 +71,25 @@
/* Styles for the left sidebar */
#sidebar {
- float: left;
- margin-left: 2px;
padding: 2px 4px;
+ vertical-align: top;
width: 160px;
}
-#navigation {
- font: normal small Arial,Helvetica,sans-serif;
- margin-left: 0;
-}
#navigation ul {
+ font: normal 100% Arial,Helvetica,sans-serif;
list-style: none;
- margin: 0 0 1em .5em;
+ margin: 0 0 1em;
padding: 0;
}
-#navigation > ul { margin-left: 0em }
-#navigation li { margin-bottom: 0.25em }
-#navigation li.menu {
- font-size: larger;
- font-weight: bolder;
+#navigation ul ul { margin-left: .5em }
+#navigation li {
+ font-weight: bold;
+ margin-bottom: 0.25em;
white-space: nowrap;
}
-#navigation li.menuItem {
+#navigation li li {
font-size: smaller;
- font-weight: lighter;
- white-space: nowrap;
+ font-weight: normal;
}
#navigation a:link, #navigation a:visited {
text-decoration: none;
@@ -105,7 +105,8 @@
/* Styles for the main content area */
#content {
- margin: 0 6px 0 166px;
+ /*margin: 0 6px 0 6px;*/
+ vertical-align: top;
}
#content .figure {
text-align: center;
1.52 +28 -27
jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file:
/home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- document2html.xsl 24 Mar 2004 18:39:44 -0000 1.51
+++ document2html.xsl 13 Apr 2004 08:50:12 -0000 1.52
@@ -91,12 +91,12 @@
<xsl:text>css/apache.css</xsl:text>
</xsl:attribute>
</link>
- <link rel="stylesheet" type="text/css" media="print">
- <xsl:attribute name="href">
- <xsl:value-of select="$basedir"/>
- <xsl:text>css/print.css</xsl:text>
- </xsl:attribute>
- </link>
+ <link rel="stylesheet" type="text/css" media="print">
+ <xsl:attribute name="href">
+ <xsl:value-of select="$basedir"/>
+ <xsl:text>css/print.css</xsl:text>
+ </xsl:attribute>
+ </link>
<!-- Add the document title -->
<title><xsl:call-template name="get-title"/></title>
@@ -111,7 +111,7 @@
<table id="header" cellspacing="0" width="100%">
<tr>
- <td class="logo" id="projectLogo" width="50%">
+ <td class="logo" id="projectLogo">
<a href="http://jakarta.apache.org/";>
<img>
<xsl:attribute name="alt">
@@ -124,7 +124,7 @@
</img>
</a>
</td>
- <td class="logo" id="subprojectLogo" width="50%">
+ <td class="logo" id="subprojectLogo">
<a href="http://jakarta.apache.org/cactus/";>
<img>
<xsl:attribute name="alt">
@@ -138,7 +138,7 @@
</a>
</td>
</tr>
- <tr id="contextBar">
+ <tr id="contextBar">
<td id="breadCrumbs">
<xsl:call-template name="generate-breadcrumbs"/>
</td>
@@ -166,27 +166,29 @@
</td>
</tr>
</table>
- <div id="main">
+ <table id="main">
+ <tr>
<!-- ======================================================== -->
<!-- Sidebar -->
<!-- ======================================================== -->
- <div id="sidebar">
- <div id="navigation">
- <xsl:call-template name="apply-navigation"/>
- </div>
- </div>
+ <td id="sidebar">
+ <div id="navigation">
+ <xsl:call-template name="apply-navigation"/>
+ </div>
+ </td>
<!-- ======================================================== -->
<!-- Content -->
<!-- ======================================================== -->
- <div id="content">
- <xsl:apply-templates/>
- </div>
+ <td id="content">
+ <xsl:apply-templates/>
+ </td>
- </div>
+ </tr>
+ </table>
<!-- ============================================================== -->
<!-- Footer -->
@@ -218,7 +220,7 @@
<!-- ==================================================================== -->
<xsl:template match="menu//item">
- <li class="menuItem">
+ <li>
<xsl:call-template name="generate-navigation-entry">
<xsl:with-param name="node" select="."/>
</xsl:call-template>
@@ -226,7 +228,7 @@
</xsl:template>
<xsl:template match="menu">
- <li class="menu">
+ <li>
<xsl:choose>
<xsl:when test="@id">
<xsl:call-template name="generate-navigation-entry">
@@ -495,7 +497,7 @@
<div class="figure">
<xsl:choose>
<xsl:when test="@width">
- <img alt="[EMAIL PROTECTED]" border="0" width="[EMAIL PROTECTED]"
height="[EMAIL PROTECTED]">
+ <img alt="[EMAIL PROTECTED]" width="[EMAIL PROTECTED]" height="[EMAIL
PROTECTED]">
<xsl:attribute name="src">
<xsl:call-template name="get-base-directory"/>
<xsl:value-of select="@src"/>
@@ -505,11 +507,10 @@
<xsl:value-of select="@usemap"/>
</xsl:attribute>
</xsl:if>
- <xsl:apply-templates/>
</img>
</xsl:when>
<xsl:otherwise>
- <img alt="[EMAIL PROTECTED]" border="0">
+ <img alt="[EMAIL PROTECTED]">
<xsl:attribute name="src">
<xsl:call-template name="get-base-directory"/>
<xsl:value-of select="@src"/>
@@ -519,10 +520,10 @@
<xsl:value-of select="@usemap"/>
</xsl:attribute>
</xsl:if>
- <xsl:apply-templates/>
</img>
</xsl:otherwise>
</xsl:choose>
+ <xsl:apply-templates/>
</div>
</xsl:template>
@@ -533,7 +534,7 @@
</xsl:template>
<xsl:template match="figure/map/area">
- <area shape="[EMAIL PROTECTED]" coords="[EMAIL PROTECTED]">
+ <area shape="[EMAIL PROTECTED]" alt="[EMAIL PROTECTED]" coords="[EMAIL
PROTECTED]">
<xsl:attribute name="href">
<xsl:call-template name="get-link-href">
<xsl:with-param name="href" select="@href"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
