You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2004/07/10 02:28:13 UTC
svn commit: rev 22769 - in forrest/trunk/src/core/context/skins/css-style-dev: . css xslt/html
Author: thorsten
Date: Fri Jul 9 17:28:13 2004
New Revision: 22769
Modified:
forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt
forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css
forrest/trunk/src/core/context/skins/css-style-dev/note.txt
forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl
Log:
Introduced the publish div, still have to make it config.
Modified: forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt (original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt Fri Jul 9 17:28:13 2004
@@ -33,7 +33,6 @@
#top .header .current a:link { color: <xsl:value-of select="@link"/>; }
#top .header .current a:visited { color: <xsl:value-of select="@vlink"/>; }
#top .header .current a:hover { color: <xsl:value-of select="@hlink"/>; }
-#main { border-top: solid <xsl:value-of select="@value"/> 15px; }
</xsl:template>
<xsl:template match="color[@name='tab-unselected']">
Modified: forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css (original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css Fri Jul 9 17:28:13 2004
@@ -63,24 +63,22 @@
#top .searchbox {
position: absolute;
right: 10px;
- top: 100px;
+ top: 90px;
+ height: 42px;
font-size: 70%;
white-space: nowrap;
text-align: right;
color: white;
- background-image: url(images/rc-t-r-5-1header-2searchbox-3searchbox.png);
- background-repeat: no-repeat;
- background-position: top right;
+ background-color: #000000;
+ z-index:0;
bottom: -1px; /* compensate for IE rendering issue */
}
html>body #top .searchbox {
bottom: 0px;
}
#top .searchbox form {
- display: block;
- background-image: url(images/rc-t-l-5-1header-2searchbox-3searchbox.png);
- background-repeat: no-repeat;
- background-position: top left;
+
+
padding: 5px 10px;
margin: 0;
}
@@ -142,21 +140,33 @@
background-repeat: no-repeat;
background-position: top left;
}
+#published {
+padding-right: 10px;
+color: #ffffff;
+font-size : 60%;
+text-align: right;
+white-space:nowrap;
+background-color: #4C6C8F;
+}
+/*
+* border-top: solid #4C6C8F 15px;
+*/
#main {
position: relative;
clear: both;
background: white;
- border-top: solid #4C6C8F 15px;
+
}
#main .breadtrail {
position: relative;
background: #CFDCED;
color: black;
- border-bottom: solid 1px white;
+ border-bottom: solid 1px black;
+ border-top: solid 1px black;
padding: 0px 180px;
font-size: 75%;
- z-index:2;
+ z-index:10;
}
/**
@@ -181,7 +191,7 @@
display: block !important;
}
#roundtopsmall {
- background-image: url(images/rc-t-r-5-1header-2tab-selected-3tab-selected.png);
+ background-image: url(images/rc-t-r-5-1header-2searchbox-3searchbox.png);
background-repeat: no-repeat;
background-position: top right;
}
@@ -205,10 +215,10 @@
position: relative;
float: left;
width: 160px;
- padding-top: 15px;
- top:-15px;
+ padding-top: 0px;
+ top:-16px;
left:10px;
- z-index: 10;
+ z-index: 20;
background-color: #f90;
}
#menu h1 {
@@ -217,9 +227,10 @@
background-color: #cfdced;
color: black;
font-size: 110%;
- border-top: solid white 1px;
+ border-top: solid #336699 1px;
border-bottom: 1px solid #336699;
- border-right: solid #336699 1px;
+ border-right: solid #336699 2px;
+ border-left: solid #336699 2px;
}
#menu ul {
width: 160px;
@@ -336,13 +347,19 @@
.pdflink {
float: right;
+ margin: 0;
+ padding: 0;
+}
+.pdflink br {
+ margin-top: -10px;
+ padding-left: 1px;
}
-
.pdflink a {
display: block;
- font-size: 90%;
+ font-size: 70%;
text-align: center;
- margin: 0 5px;
+ margin: 0;
+ padding: 0;
}
.pdflink img {
Modified: forrest/trunk/src/core/context/skins/css-style-dev/note.txt
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/note.txt (original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/note.txt Fri Jul 9 17:28:13 2004
@@ -22,9 +22,10 @@
-> TODO
- the publish note should be where now only a border is.
-Like <div id="published"/>, but make it configurable.
+Like <div id="published"/>
+-> DONE
+, but make it configurable.
-> TODO
-
- footer needs some attention
-> TODO
-- the footer do not have the color profile! Enable it!
Modified: forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl Fri Jul 9 17:28:13 2004
@@ -172,6 +172,12 @@
|start Search
+</xsl:comment>
<div class="searchbox">
+ <div id="roundtopsmall">
+ <img
+ src="{$skin-img-dir}/rc-t-l-5-1body-2searchbox-3searchbox.png"
+ alt="" width="5" height="5" class="cornersmall"
+ style="display: none" />
+ </div>
<form method="get" action="http://www.google.com/search">
<input type="hidden"
name="sitesearch" value="{$config/searchsite-domain}"/>
@@ -179,6 +185,12 @@
value="Search the site:"
onFocus="getBlank (this, 'Search the site:');"/> 
<input type="submit" value="Search" name="Search"/> </form>
+ <div id="roundbottomsmall">
+ <img
+ src="{$skin-img-dir}/rc-b-l-5-1body-2menu-3menu.png"
+ alt="" width="5" height="5" class="cornersmall"
+ style="display: none" />
+ </div>
</div>
<xsl:comment>+
|end search
@@ -198,6 +210,11 @@
|centerstrip with menu and mainarea
+-->
<div id="main">
+ <div id="published">
+ <script language="JavaScript" type="text/javascript"><![CDATA[<!--
+ document.write("Published: " + document.lastModified);
+ // -->]]></script>
+ </div>
<xsl:choose>
<xsl:when test="$config/trail/@location='alt'">
<!--breadtrail location='alt'-->
@@ -323,7 +340,85 @@
|end Menu
+</xsl:comment>
</xsl:template>
- <!-- Generates the PDF link -->
+
+ <xsl:template name="innermenuli">
+ <xsl:param name="id"/>
+ <xsl:variable name="tagid">
+ <xsl:choose>
+ <xsl:when test="descendant-or-self::node()/li/span/@class='sel'"><xsl:value-of select="concat('menu_selected_',$id)"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="concat('menu_',concat(font,$id))"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="whichGroup">
+ <xsl:choose>
+ <xsl:when test="descendant-or-self::node()/li/span/@class='sel'">selectedmenuitemgroup</xsl:when>
+ <xsl:otherwise>menuitemgroup</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+
+ <div class="menutitle" id="{$tagid}Title" onclick="SwitchMenu('{$tagid}')"><xsl:value-of select="span"/></div>
+ <div class="{$whichGroup}" id="{$tagid}">
+ <xsl:for-each select= "ul/li">
+
+ <xsl:choose>
+ <xsl:when test="a">
+ <div class="menuitem"><a href="{a/@href}"><xsl:value-of select="a" /></a></div>
+ </xsl:when>
+ <xsl:when test="span/@class='sel'">
+ <div class="menupage">
+ <div class="menupagetitle"><xsl:value-of select="span" /></div>
+ <xsl:if test="//tocitems/tocitem and contains($config/toc/@location,'dd')">
+ <xsl:value-of select="$config/toc/@location"/>
+ <div class="menupageitemgroup">
+ <xsl:for-each select = "//tocitems/tocitem">
+ <div class="menupageitem">
+ <xsl:choose>
+ <xsl:when test="string-length(@title)>15">
+ <a href="{@href}" title="{@title}"><xsl:value-of select="substring(@title,0,20)" />...</a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{@href}"><xsl:value-of select="@title" /></a>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:if test="tocitem">
+ <!-- nicolaken: this enables double-nested page links-->
+ <ul>
+ <xsl:for-each select = "tocitem">
+
+ <xsl:choose>
+ <xsl:when test="string-length(@title)>15">
+ <li><a href="{@href}" title="{@title}"><xsl:value-of select="substring(@title,0,20)" />...</a></li>
+ </xsl:when>
+ <xsl:otherwise>
+ <li><a href="{@href}"><xsl:value-of select="@title" /></a></li>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:for-each>
+ </ul>
+ <!-- nicolaken: ...till here -->
+ </xsl:if>
+ </div>
+ </xsl:for-each>
+ </div>
+ </xsl:if>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name = "innermenuli">
+ <xsl:with-param name="id" select="concat($id, '.', position())"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:for-each>
+ </div>
+ </xsl:template>
+<!--+
+ |Generates the PDF link
+ +-->
<xsl:template match="div[@id='skinconf-pdflink']">
<xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 'false'">
<div class="pdflink"><a href="{$filename-noext}.pdf" class="dida">