svn commit: r591824 - in /lenya/sandbox/modules/docustyle: resources/css/page.css resources/images/corner-bottom-left.png resources/images/search.png xslt/page2xhtml.xsl
[email protected] Sun, 04 Nov 2007 19:56:56 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: andreas
Date: Sun Nov 4 11:56:55 2007
New Revision: 591824
URL: http://svn.apache.org/viewvc?rev=591824&view=rev
Log:
Layout update
Added:
lenya/sandbox/modules/docustyle/resources/images/corner-bottom-left.png (with props)
lenya/sandbox/modules/docustyle/resources/images/search.png (with props)
Modified:
lenya/sandbox/modules/docustyle/resources/css/page.css
lenya/sandbox/modules/docustyle/xslt/page2xhtml.xsl
Modified: lenya/sandbox/modules/docustyle/resources/css/page.css
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/resources/css/page.css?rev=591824&r1=591823&r2=591824&view=diff
==============================================================================
--- lenya/sandbox/modules/docustyle/resources/css/page.css (original)
+++ lenya/sandbox/modules/docustyle/resources/css/page.css Sun Nov 4 11:56:55 2007
@@ -20,34 +20,26 @@
@import url("news.css");
#page {
- padding: 0px;
- margin: 0px;
- font-family: 'Lucida Grande', Verdana, Arial, Sans-serif;
+ padding: 0px;
+ margin: 0px;
+ font-family: 'Lucida Grande', Verdana, Arial, Sans-serif;
}
/* 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;
+ border-bottom: solid 5px #BBBBCC;
+ clear: left;
+ font-weight: bold;
+ font-size: 11pt;
+ margin: 0;
+ border-collapse: collapse;
+ padding: 0 0 0 19px;
}
#tabs a {
- text-decoration: none;
- color: #999999;
+ text-decoration: none;
+ color: #999999;
}
#tabs li {
@@ -66,42 +58,61 @@
}
.tab a span, .tab-selected a span {
- padding: .3em 1.2em .3em .8em;
+ padding: .3em 1.2em .3em 15px;
display: block;
background: url('/modules/docustyle/images/corner.png') right top no-repeat;
}
.tab a:hover span {
- background-color: #D0D0D0;
- color: #888888;
+ background-color: #D0D0D0;
+ color: #888888;
}
.tab-selected a span {
- background-color: #BBBBCC;
- color: #333344;
+ background-color: #BBBBCC;
+ color: #333344;
}
/* menu */
+#menu, #body {
+ display: table-cell;
+ vertical-align: top;
+}
+
#menu {
+ width: 13em;
list-style-type: none;
- padding: .5em 1em .5em 1em;
- margin: 0 0 0 20px;
+ padding: 2em 1em .5em 20px;
+ margin: 0 0 0 21px;
font-size: 10pt;
- background-color: #EEEEF0;
/*
+ background-color: #EEEEEE;
+ border-right: 5px solid #EEEEEE;
*/
}
#menu ul {
list-style-type: none;
margin: 0;
- padding: 0 0 0 .5em;
+ padding: 0 0 0 0;
+}
+
+#menu li#menuTitle {
+ font-size: 11pt;
+ font-weight: bold;
+ margin-bottom: .5em;
+ padding-left: 0;
+}
+
+li#menuTitle span {
+ margin-left: 0;
+ padding-left: 0;
}
#menu li {
/* background: url('/modules/docustyle/images/bullet.png') left .2em no-repeat; */
- padding-left: .7em;
+ padding-left: 1em;
}
#menu li.open {
@@ -119,7 +130,6 @@
#menu span, #menu a {
display: block;
margin: 0 0 .2em 0;
- padding: 0 .3em;
}
#menu a {
@@ -151,37 +161,36 @@
}
#search {
- font-family: Verdana, Arial, Sans-serif;
- margin-right: 10px;
- float: right;
+ float: right;
+ background-color: #DDDDDD;
+ /*
+ */
}
-#search form {
+#search form, #search p {
padding: 0;
margin: 0;
+ font-size: 10pt;
+ font-weight: bold;
+}
+
+#search p {
+ padding: .5em 2em;
+ background: url('/modules/docustyle/images/corner-bottom-left.png') left bottom no-repeat;
}
input.searchfield {
- background-color: #ffffff;
- border: 1px solid #BB9999;
+ background-color: #ffffff;
+ border: solid 1px #BBBBCC;
+ /*
+ border: solid 2px #BBBBCC;
+ */
}
input.searchsubmit {
- color: #555588;
- background-color: #FFEEEE;
- border: 1px solid #BB9999;
-}
-
-input.searchsubmit:hover {
- background-color: #DDBBBB;
-}
-
-/*
-#search a {
- text-decoration: none;
- color: #555588;
+ margin-left: .3em;
+ vertical-align: top;
}
-*/
/* body */
@@ -189,25 +198,20 @@
}
#body {
- border: none;
- padding: 1em;
- margin-left: 2em;
- font-size: 10pt;
+ border: none;
+ padding: 1em 2em;
+ font-size: 10pt;
+ background-color: white;
}
#footer {
- font-size: 9pt;
- border: none;
- border-top: 1px solid #BBBB99;
- padding: 0em 1em;
- margin-left: 10px;
+ font-size: 10pt;
+ margin-top: 2em;
+ border-top: 1px solid #DDDDDD;
+ color: #999999;
}
#main {
-/*
- float: left;
- width: 80%;
-*/
}
.crossheading {
@@ -216,10 +220,6 @@
table.simple {
border-collapse: collapse;
-/*
- background-color: #909090;
- border-color: #909090;
-*/
width: auto;
}
@@ -243,24 +243,38 @@
img.simple {
}
+#apacheBreadcrumb {
+ font-size: 10pt;
+ background-color: #DDDDDD;
+ /*
+ border-bottom: solid 1px #D0D0D0;
+ */
+ padding: .3em 1em;
+ float: left;
+}
+
+#header {
+ clear: left;
+ font-size: 11pt;
+ margin: 0 0 .5em 20px;
+}
+
#projectLogo {
- padding: 15px 0 5px 50px;
+ padding-left: .8em;
}
#projectLogo img {
- vertical-align: baseline;
- border: none;
+ border: none;
}
#projectLogo, #tagline {
- float: left;
+ display: table-cell;
+ vertical-align: bottom;
}
#tagline {
- display: none;
font-weight: bold;
- color: Navy;
- padding-top: 57px;
+ padding-bottom: 7px;
}
.media {
@@ -283,12 +297,12 @@
}
h2 {
- font-size: 13pt;
+ font-size: 12pt;
margin-top: 1.5em;
}
h3 {
- font-size: 12pt;
+ font-size: 11pt;
}
.asset {
@@ -403,7 +417,7 @@
pre {
padding: .5em 1em;
- background-color: #DDDDEE;
+ background-color: #EEEEEE;
}
div.tocTitle {
@@ -422,11 +436,11 @@
text-transform: capitalize;
white-space: nowrap;
padding: .5em .7em 0 .7em;
- background-color: #EEEEFF;
+ background-color: #EEEEEE;
}
p.warning, p.note, p.fixme {
- background-color: #EEEEFF;
+ background-color: #EEEEEE;
padding: 0 .7em .5em .7em;
margin-top: 0;
}
@@ -474,4 +488,9 @@
ul, ol {
padding-left: 1.5em;
+}
+
+
+#apacheBreadcrumb a {
+ text-decoration: none;
}
Added: lenya/sandbox/modules/docustyle/resources/images/corner-bottom-left.png
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/resources/images/corner-bottom-left.png?rev=591824&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/sandbox/modules/docustyle/resources/images/corner-bottom-left.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lenya/sandbox/modules/docustyle/resources/images/search.png
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/resources/images/search.png?rev=591824&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lenya/sandbox/modules/docustyle/resources/images/search.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lenya/sandbox/modules/docustyle/xslt/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/modules/docustyle/xslt/page2xhtml.xsl?rev=591824&r1=591823&r2=591824&view=diff
==============================================================================
--- lenya/sandbox/modules/docustyle/xslt/page2xhtml.xsl (original)
+++ lenya/sandbox/modules/docustyle/xslt/page2xhtml.xsl Sun Nov 4 11:56:55 2007
@@ -61,7 +61,7 @@
<xsl:choose>
<xsl:when test="$document-type">
<!-- Looking into the pub e.g. {$yourPub}/resources/shared/css/{$document-type}.css -->
- <link rel="stylesheet" href="{$root}/modules/docustyle/css/{$document-type}.css" type="text/css"/>
+ <link rel="stylesheet" href="/modules/docustyle/css/{$document-type}.css" type="text/css"/>
<xsl:copy-of select="xhtml:html/xhtml:head/*"/>
</xsl:when>
<xsl:otherwise>
@@ -88,34 +88,47 @@
</head>
<body>
<div id="page">
- <div id="projectLogo">
- <a href="{$root}/"><img src="{$root}/images/project-logo-small.png" alt="project logo"/></a>
+ <xsl:apply-templates select="xhtml:div[@id = 'search']"/>
+ <div id="apacheBreadcrumb">
+ <a href="http://www.apache.org">Apache</a> » <a href="http://lenya.apache.org">Lenya</a>
+ </div>
+ <div id="header">
+ <div id="projectLogo">
+ <a href="{$root}/"><img src="/modules/docustyle/images/project-logo-small.png" alt="project logo"/></a>
+ </div>
+ <div id="tagline">Open Source Content Management</div>
</div>
- <div id="tagline">Open Source Content Management</div>
<xsl:apply-templates select="xhtml:ul[@id = 'tabs']"/>
- <xsl:apply-templates select="xhtml:div[@id = 'search']"/>
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td valign="top" style="width: 230px">
- <xsl:apply-templates select="xhtml:ul[@id = 'menu']"/>
- </td>
- <td valign="top">
- <div id="main">
- <xsl:apply-templates select="xhtml:div[@id = 'breadcrumb']"/>
- <xsl:apply-templates select="xhtml:div[@id = 'body']"/>
- <xsl:if test="xhtml:html">
- <xsl:apply-templates select="xhtml:html/xhtml:body/*"/>
- </xsl:if>
- <xsl:call-template name="footer"/>
- </div>
- </td>
- </tr>
- </table>
+ <!--
+ -->
+ <div id="main">
+ <xsl:apply-templates select="xhtml:ul[@id = 'menu']"/>
+ <xsl:apply-templates select="xhtml:div[@id = 'breadcrumb']"/>
+ <div id="body">
+ <xsl:apply-templates select="xhtml:div[@id = 'body']/*"/>
+ <xsl:if test="xhtml:html">
+ <xsl:apply-templates select="xhtml:html/xhtml:body/xhtml:div[@id = 'body']/*"/>
+ </xsl:if>
+ <xsl:call-template name="footer"/>
+ </div>
+ </div>
</div>
</body>
</html>
</xsl:template>
+
+ <xsl:template match="xhtml:div[@id = 'search']//xhtml:p">
+ <xsl:copy>
+ Search:
+ <xsl:apply-templates select="node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="xhtml:input[@class = 'searchsubmit']">
+ <input class="searchsubmit" type="image" src="/modules/docustyle/images/search.png"/>
+ </xsl:template>
<xsl:template match="xhtml:div[@id = 'breadcrumb']">
<xsl:if test="*">