You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/11/02 23:07:26 UTC
svn commit: r591492 - in /lenya/sandbox/pubs/docu:
lenya/modules/sitetree/xslt/navigation/tabs.xsl
resources/shared/css/page.css xslt/page2xhtml.xsl
Author: andreas
Date: Fri Nov 2 15:07:25 2007
New Revision: 591492
URL: http://svn.apache.org/viewvc?rev=591492&view=rev
Log:
Layout update (experimental)
Modified:
lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/tabs.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/tabs.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/tabs.xsl?rev=591492&r1=591491&r2=591492&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/tabs.xsl (original)
+++ lenya/sandbox/pubs/docu/lenya/modules/sitetree/xslt/navigation/tabs.xsl Fri Nov 2 15:07:25 2007
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,69 +19,44 @@
<!-- $Id: tabs.xsl 189880 2005-06-10 02:36:09Z gregor $ -->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:nav="http://apache.org/cocoon/lenya/navigation/1.0"
- xmlns="http://www.w3.org/1999/xhtml"
- exclude-result-prefixes="nav"
- >
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:nav="http://apache.org/cocoon/lenya/navigation/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ exclude-result-prefixes="nav"
+ >
+
+ <xsl:import href="template-fallback:docu://lenya/modules/sitetree/xslt/navigation/tabs.xsl"/>
+
+ <xsl:template match="nav:site">
-<xsl:import href="template-fallback:docu://lenya/modules/sitetree/xslt/navigation/tabs.xsl"/>
-
-<xsl:template match="nav:site">
-
- <div id="tabs">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <xsl:call-template name="pre-separator"/>
- <xsl:for-each select="nav:node[nav:label[normalize-space(.) != '']]">
- <xsl:if test="position() > 1 and @visibleinnav = 'true'">
- <xsl:call-template name="separator"/>
- </xsl:if>
-
- <xsl:choose>
- <xsl:when test="@visibleinnav = 'false'"/>
- <xsl:when test="descendant-or-self::nav:node[@current = 'true']">
- <xsl:call-template name="tab-selected"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:call-template name="tab"/>
- </xsl:otherwise>
- </xsl:choose>
+ <ul id="tabs">
+ <xsl:for-each select="nav:node[nav:label[normalize-space(.) != '']]">
+ <xsl:choose>
+ <xsl:when test="@visibleinnav = 'false'"/>
+ <xsl:when test="descendant-or-self::nav:node[@current = 'true']">
+ <xsl:call-template name="tab-selected"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="tab"/>
+ </xsl:otherwise>
+ </xsl:choose>
- </xsl:for-each>
- <xsl:call-template name="post-separator"/>
- </tr>
- </table>
- </div>
-
-</xsl:template>
-
-
-<xsl:template name="tab">
- <td><div class="tab"><xsl:call-template name="label"/></div></td>
-</xsl:template>
-
-
-<xsl:template name="tab-selected">
- <td><div class="tab-selected"><xsl:call-template name="label"/></div></td>
-</xsl:template>
-
-
-<xsl:template name="separator">
- <td><div class="tab-separator"> </div></td>
-</xsl:template>
-
-
-<xsl:template name="pre-separator">
- <td><div class="tab-pre-separator"> </div></td>
-</xsl:template>
-
-
-<xsl:template name="post-separator">
- <td class="tab-post-separator"><div class="tab-separator"> </div></td>
-</xsl:template>
-
-
+ </xsl:for-each>
+ </ul>
+
+ </xsl:template>
+
+
+ <xsl:template name="tab">
+ <li class="tab"><xsl:call-template name="label"/></li>
+ </xsl:template>
+
+
+ <xsl:template name="tab-selected">
+ <li class="tab-selected"><xsl:call-template name="label"/></li>
+ </xsl:template>
+
+
<xsl:template name="label">
<xsl:param name="suffix"/>
<a class="tab{$suffix}">
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=591492&r1=591491&r2=591492&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/resources/shared/css/page.css (original)
+++ lenya/sandbox/pubs/docu/resources/shared/css/page.css Fri Nov 2 15:07:25 2007
@@ -22,32 +22,25 @@
#page {
padding: 0px;
margin: 0px;
+ font-family: 'Lucida Grande', Verdana, Arial, Sans-serif;
}
/* tabs */
-#tabs {
+ul#tabs {
+ background-color: #DDDDEE;
clear: left;
- border-bottom: solid 5px #DDBBBB;
- color: Maroon;
+ font-weight: bold;
+ font-size: 11pt;
}
#tabs a {
text-decoration: none;
- color: Maroon;
-}
-
-#tabs table {
- font-family: Verdana, Arial, Sans-serif;
- font-size: 80%;
+ color: #555588;
}
-#tabs td {
- vertical-align: bottom;
-}
-
-#tabs div {
- white-space: nowrap;
+#tabs li {
+ display: table-cell;
}
.tab a, .tab-selected a {
@@ -55,71 +48,34 @@
}
.tab a span, .tab-selected a span {
- padding: .3em .6em;
+ padding: .5em 1em;
display: block;
}
-.tab a span {
- background: url('/modules/svg/tab-topRight-5-FFEEEE-BB9999.png') right top no-repeat;
- border-bottom: solid 1px #BB9999;
-}
-
-.tab a {
- background: url('/modules/svg/tab-topLeft-5-FFEEEE-BB9999.png') left top no-repeat;
-}
-
-.tab a:hover span {
- background: url('/modules/svg/tab-topRight-5-EECCCC-BB9999.png') right top no-repeat;
- border-bottom: solid 1px #BB9999;
-}
-
.tab a:hover {
- background: url('/modules/svg/tab-topLeft-5-EECCCC-BB9999.png') left top no-repeat;
+ background-color: #BBBBCC;
}
.tab-selected a span {
- background: url('/modules/svg/tab-topRight-5-DDBBBB-BB9999.png') right top no-repeat;
- border-bottom: solid 1px #DDBBBB;
-}
-
-.tab-selected a {
- background: url('/modules/svg/tab-topLeft-5-DDBBBB-BB9999.png') left top no-repeat;
-}
-
-.tab-separator {
- border-bottom: solid 1px #BB9999;
-}
-
-.tab-pre-separator {
- width: 25px;
- border-bottom: solid 1px #BB9999;
-}
-
-td.tab-post-separator {
- width: 100%;
+ background-color: #BBBBCC;
+ color: black;
}
/* menu */
#menu {
- font-family: Verdana, Arial, Sans-serif;
- border: solid 1px #BB9999;
- border-left: none;
- border-top: none;
- color: Maroon;
- padding: 5px 0px 5px .5em;
- background-color: #FFCCCC;
+ padding: .5em 1em;
}
#menu ul {
list-style-type: none;
- padding: 0;
- margin: 0 1em .3em .5em;
- font-size: medium;
+ margin: 0;
+ padding: 0 0 0 .5em;
+ font-size: 10pt;
}
#menu li {
- background: url('/docu/live/images/bullet.png') left .2em no-repeat;
+ /* background: url('/docu/live/images/bullet.png') left .2em no-repeat; */
padding-left: .7em;
}
@@ -143,52 +99,50 @@
#menu a {
text-decoration: none;
- color: Maroon;
+ color: #555588;
cursor: pointer;
}
#menu a:hover {
- text-decoration: underline;
+ color: black;
}
#menu li.selected span {
- background-color: #FFEEEE;
+ color: black;
+ font-weight: bold;
}
/* breadcrumb */
#breadcrumb {
+ display: none;
padding: 3px 0px 3px 30px;
- background-color: #FFEEEE;
- border-top: solid 1px #BB9999;
- border-bottom: solid 1px #BB9999;
- font-family: Verdana, Arial, Sans-serif;
- font-size: 80%;
+ font-size: small;
}
#breadcrumb a {
text-decoration: none;
- color: Maroon;
+ color: #555588;
}
#search {
font-family: Verdana, Arial, Sans-serif;
- font-size: 100%;
margin-right: 10px;
float: right;
- position:relative;
- top:-20px
+}
+
+#search form {
+ padding: 0;
+ margin: 0;
}
input.searchfield {
- font-size: 80%;
background-color: #ffffff;
border: 1px solid #BB9999;
}
input.searchsubmit {
- font-size: 80%;
- color: Maroon;
+ color: #555588;
background-color: #FFEEEE;
border: 1px solid #BB9999;
}
@@ -200,14 +154,13 @@
/*
#search a {
text-decoration: none;
- color: Maroon;
+ color: #555588;
}
*/
/* body */
body {
- font-family: Verdana, Arial, Sans-serif;
}
#body {
@@ -222,7 +175,7 @@
padding: 0em 1em;
margin-left: 10px;
font-style: italic;
- color: Maroon;
+ color: #555588;
}
#main {
@@ -232,13 +185,9 @@
*/
}
-h1 { font-size: 140%; }
-h2 { font-size: 100%; }
-h3 { font-size: 80%; }
-p { font-size: 80%; }
-li { font-size: 80%; }
-
-.crossheading { font-weight: bold; font-size: 110%; }
+.crossheading {
+ font-weight: bold;
+}
table.simple {
border-collapse: collapse;
@@ -250,11 +199,9 @@
}
div#body td {
- font-size: small;
}
td.simple {
- font-size: 80%;
padding: 3px;
background-color: White;
border: solid 1px Navy;
@@ -262,7 +209,6 @@
}
th.vertical {
- font-size: small;
font-weight: normal;
text-align: right;
padding-right: 1em;
@@ -272,18 +218,8 @@
img.simple {
}
-#publication-title {
- font-family: verdana, arial, sans-serif;
- font-weight: bold;
- font-size: 20px;
- vertical-align: bottom;
- padding-left: 25px;
- padding-bottom: 15px;
- color: Maroon;
-}
-
#projectLogo {
- padding: 15px 0 10px 25px;
+ padding: 15px 0 5px 50px;
}
#projectLogo img {
@@ -296,8 +232,9 @@
}
#tagline {
+ display: none;
font-weight: bold;
- color: Maroon;
+ color: Navy;
padding-top: 57px;
}
@@ -310,7 +247,6 @@
padding: 5px;
text-align: center;
font-style: italic;
- font-size: 80%;
}
.abstract {
@@ -318,13 +254,11 @@
}
h1 {
- font-size: 120%;
- color: Maroon;
+ font-size: 15pt;
}
h2 {
- font-size: 100%;
- color: Maroon;
+ color: #555588;
border-bottom: solid 1px #BB9999;
margin-top: 30px;
}
@@ -333,7 +267,6 @@
display: block;
color: #000;
margin: 10px 10px 10px 5px;
- font-size: small;
}
.asset img {
@@ -344,7 +277,6 @@
border: solid 1px #CCCCCC;
width: auto;
max-width: 100%;
- font-size: small;
margin-bottom: 10px;
}
@@ -381,31 +313,26 @@
font-weight: bold;
padding: 3px 10px;
text-align: left;
- font-size: small;
}
table.search-table td {
background-color: #F5F4E9;
border: solid 1px #CCCCCC;
padding: 3px 10px;
- font-size: small;
color: Black;
}
table.search-table-noborder td {
border: 0px;
padding: 3px 10px;
- font-size: small;
}
table.search-table-noborder-nopadding td {
border: 0px;
padding: 0px;
- font-size: small;
}
table.search-table-noborder-nopadding th {
- font-size: small;
}
/* Broken Internal Links in Authoring area */
@@ -428,7 +355,6 @@
}
.search-result-score {
- font-size: 90%;
font-weight: normal;
}
@@ -454,18 +380,12 @@
}
div.warningTitle, div.noteTitle, div.fixmeTitle, div.tocTitle {
- float: left;
- color: Maroon;
- font-size: 80%;
+ font-size: 11pt;
+ font-weight: bold;
+ color: black;
text-transform: capitalize;
- position: relative;
- top: 1px;
- background: url('/modules/svg/tab-topLeft-5-FFCCCC-BB9999.png') left top no-repeat;
-}
-
-div.warningTitle div, div.noteTitle div, div.fixmeTitle div, div.tocTitle div {
- padding: .2em 1em;
- background: url('/modules/svg/tab-topRight-5-FFCCCC-BB9999.png') right top no-repeat;
+ padding: .2em .5em;
+ background-color: #DDDDEE;
}
p.warning, p.note, p.fixme, ul.toc {
@@ -477,7 +397,6 @@
}
dl {
- font-size: 80%;
}
dt {
@@ -495,7 +414,6 @@
}
ul.toc {
- font-size: medium;
margin: 0 0 1em 0;
list-style-type: none;
}
Modified: lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl?rev=591492&r1=591491&r2=591492&view=diff
==============================================================================
--- lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl (original)
+++ lenya/sandbox/pubs/docu/xslt/page2xhtml.xsl Fri Nov 2 15:07:25 2007
@@ -92,7 +92,8 @@
<a href="{$root}/"><img src="{$root}/images/project-logo-small.png" alt="project logo"/></a>
</div>
<div id="tagline">Open Source Content Management</div>
- <xsl:apply-templates select="xhtml:div[@id = 'tabs']"/>
+ <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">
@@ -101,7 +102,6 @@
<td valign="top">
<div id="main">
<xsl:apply-templates select="xhtml:div[@id = 'breadcrumb']"/>
- <xsl:apply-templates select="xhtml:div[@id = 'search']"/>
<xsl:apply-templates select="xhtml:div[@id = 'body']"/>
<xsl:if test="xhtml:html">
<xsl:apply-templates select="xhtml:html/xhtml:body/*"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org