svn commit: r591758 - in /lenya/sandbox/pubs/docu: lenya/modules/sitetree/xslt/navigation/menu.xsl resources/shared/css/page.css resources/shared/images/corner.png xslt/page2xhtml.xsl
[email protected] Sun, 04 Nov 2007 10:53:57 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: andreas
Date: Sun Nov 4 02:53:56 2007
New Revision: 591758
URL: http://svn.apache.org/viewvc?rev=591758&view=rev
Log:
Layout update (experimental)
Added:
lenya/sandbox/pubs/docu/resources/shared/images/corner.png (with props)
Modified:
lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl
lenya/sandbox/pubs/docu/resources/shared/css/page.css
lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl
Modified: lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl?rev=591758&r1=591757&r2=591758&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl (original)
+++ lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/menu.xsl Sun Nov 4 02:53:56 2007
@@ -28,14 +28,23 @@
<xsl:import href="template-fallback://lenya/modules/sitetree/xslt/navigation/menu.xsl"/>
- <xsl:template match="nav:site/nav:node">
+ <xsl:template match="nav:site">
+ <ul id="menu">
+ <xsl:apply-templates select="nav:node[descendant-or-self::nav:node[@current = 'true']]/nav:node"/>
+ </ul>
+ </xsl:template>
+
+ <!--
+ <xsl:template match="nav:site/nav:node">
+ <xsl:call-template name="item"/>
<xsl:if test="parent::nav:site and descendant-or-self::nav:node[@current = 'true']">
- <xsl:call-template name="children"/>
+ <xsl:call-template name="children"/>
</xsl:if>
- </xsl:template>
+ </xsl:template>
+ -->
- <xsl:template match="nav:node/nav:node">
+ <xsl:template match="nav:node">
<xsl:param name="parent-id"/>
<xsl:variable name="id" select="concat($parent-id, position())"/>
<xsl:call-template name="item">
Modified: lenya/sandbox/pubs/docu/resources/shared/css/page.css
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/resources/shared/css/page.css?rev=591758&r1=591757&r2=591758&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/resources/shared/css/page.css (original)
+++ lenya/sandbox/pubs/docu/resources/shared/css/page.css Sun Nov 4 02:53:56 2007
@@ -28,50 +28,75 @@
/* tabs */
ul#tabs {
+ border-bottom: solid 5px #BBBBCC;
+ /*
+ background-color: #EEEEEFF;
+ border-top: solid 2px #EEEEFF;
+ border-bottom: solid 2px #CCCCDD;
background-color: #DDDDEE;
+ border-top: solid .5em #DDDDEE;
+ border-bottom: solid .5em #CCCCDD;
+ */
clear: left;
font-weight: bold;
font-size: 11pt;
+ margin: 0;
+ border-collapse: collapse;
+ padding: 0 0 0 19px;
}
#tabs a {
text-decoration: none;
- color: #555588;
+ color: #999999;
}
#tabs li {
- display: table-cell;
+ display: table-cell;
+ vertical-align: middle;
+ border-left: solid 3px #FFFFFF;
+ border-right: solid 3px #FFFFFF;
+ background-color: #DDDDDD;
}
.tab a, .tab-selected a {
- display: block;
+ display: block;
+}
+
+.tab-selected a {
}
.tab a span, .tab-selected a span {
- padding: .5em 1em;
- display: block;
+ padding: .3em 1.2em .3em .8em;
+ display: block;
+ background: url('/docu/live/images/corner.png') right top no-repeat;
}
-.tab a:hover {
- background-color: #BBBBCC;
+.tab a:hover span {
+ background-color: #D0D0D0;
+ color: #888888;
}
.tab-selected a span {
background-color: #BBBBCC;
- color: black;
+ color: #333344;
}
/* menu */
#menu {
- padding: .5em 1em;
+ list-style-type: none;
+ padding: .5em 1em .5em 1em;
+ margin: 0 0 0 20px;
+ font-size: 10pt;
+ background-color: #EEEEF0;
+ /*
+ */
}
#menu ul {
list-style-type: none;
margin: 0;
padding: 0 0 0 .5em;
- font-size: 10pt;
}
#menu li {
@@ -80,11 +105,11 @@
}
#menu li.open {
- background: url('/docu/live/images/bullet-open.png') left .2em no-repeat;
+ background: url('/docu/live/images/bullet-open.png') left .3em no-repeat;
}
#menu li.closed {
- background: url('/docu/live/images/bullet-closed.png') left .2em no-repeat;
+ background: url('/docu/live/images/bullet-closed.png') left .3em no-repeat;
}
#menu li.closed ul {
@@ -166,16 +191,16 @@
#body {
border: none;
padding: 1em;
- margin-left: 10px;
+ margin-left: 2em;
+ font-size: 10pt;
}
#footer {
- border: none;
- border-top: 1px solid #BBBB99;
- padding: 0em 1em;
- margin-left: 10px;
- font-style: italic;
- color: #555588;
+ font-size: 9pt;
+ border: none;
+ border-top: 1px solid #BBBB99;
+ padding: 0em 1em;
+ margin-left: 10px;
}
#main {
@@ -258,9 +283,12 @@
}
h2 {
- color: #555588;
- border-bottom: solid 1px #BB9999;
- margin-top: 30px;
+ font-size: 13pt;
+ margin-top: 1.5em;
+}
+
+h3 {
+ font-size: 12pt;
}
.asset {
@@ -374,25 +402,32 @@
}
pre {
- border: solid 1px #BB9999;
padding: .5em 1em;
- background-color: #FFCCCC;
+ background-color: #DDDDEE;
}
-div.warningTitle, div.noteTitle, div.fixmeTitle, div.tocTitle {
+div.tocTitle {
font-size: 11pt;
font-weight: bold;
- color: black;
+ margin-bottom: .2em;
+}
+
+ul.toc {
+ padding: 0 0 0.5em 0;
+}
+
+div.warningTitle, div.noteTitle, div.fixmeTitle {
+ font-weight: bold;
+ color: Navy;
text-transform: capitalize;
- padding: .2em .5em;
- background-color: #DDDDEE;
+ white-space: nowrap;
+ padding: .5em .7em 0 .7em;
+ background-color: #EEEEFF;
}
-p.warning, p.note, p.fixme, ul.toc {
- clear: left;
- border: solid 1px #BB9999;
- padding: .5em 1em;
- background-color: #FFEEEE;
+p.warning, p.note, p.fixme {
+ background-color: #EEEEFF;
+ padding: 0 .7em .5em .7em;
margin-top: 0;
}
@@ -437,3 +472,6 @@
background: url('/modules/svg/tab-bottomRight-5-FFEEEE-BB9999.png') right bottom no-repeat;
}
+ul, ol {
+ padding-left: 1.5em;
+}
\ No newline at end of file
Added: lenya/sandbox/pubs/docu/resources/shared/images/corner.png
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/resources/shared/images/corner.png?rev=591758&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/sandbox/pubs/docu/resources/shared/images/corner.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl?rev=591758&r1=591757&r2=591758&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl (original)
+++ lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl Sun Nov 4 02:53:56 2007
@@ -97,7 +97,7 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" style="width: 230px">
- <xsl:apply-templates select="xhtml:div[@id = 'menu']"/>
+ <xsl:apply-templates select="xhtml:ul[@id = 'menu']"/>
</td>
<td valign="top">
<div id="main">