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/23 20:39:42 UTC
svn commit: rev 23194 - in forrest/trunk/src/core/context/skins/css-style-dev: . css xslt/html
Author: thorsten
Date: Fri Jul 23 11:39:41 2004
New Revision: 23194
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:
Done some points from the note.txt! Mainly footer and credit!
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 23 11:39:41 2004
@@ -62,11 +62,14 @@
<xsl:template match="color[@name='subheading']">
.subheading { background-color: <xsl:value-of select="@value"/>;}
-</xsl:template>
+</xsl:template-->
<xsl:template match="color[@name='published']">
-.published { color: <xsl:value-of select="@value"/>;}
-</xsl:template-->
+#published {
+ color: <xsl:value-of select="@font"/>;
+ background: <xsl:value-of select="@value"/>;
+}
+</xsl:template>
<xsl:template match="color[@name='navstrip']">
#main .breadtrail {background: <xsl:value-of select="@value"/>; }
@@ -118,11 +121,11 @@
color:<xsl:value-of select="@vlink"/>}
.menupage a:hover { background-color: <xsl:value-of select="@value"/>;
color:<xsl:value-of select="@hlink"/>}
-</xsl:template>
+</xsl:template-->
<xsl:template match="color[@name='footer']">
-.footer { background-color: <xsl:value-of select="@value"/>;}
-</xsl:template-->
+#footer { background-color: <xsl:value-of select="@value"/>;}
+</xsl:template>
<!-- ==================== other colors ============================ -->
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 23 11:39:41 2004
@@ -141,12 +141,12 @@
background-position: top left;
}
#published {
-padding-right: 10px;
-color: #ffffff;
-font-size : 60%;
-text-align: right;
-white-space:nowrap;
-background-color: #4C6C8F;
+ padding-right: 10px;
+ color: #ffffff;
+ font-size : 60%;
+ text-align: right;
+ white-space:nowrap;
+ background-color: #4C6C8F;
}
/*
@@ -266,7 +266,9 @@
font-weight: bold;
font-size: 90%;
}
-
+#menu #credit {
+ text-align: center;
+}
#content {
padding: 20px 20px 20px 180px;
margin: 0;
@@ -307,32 +309,6 @@
margin-right: 5px;
}
-/**
- * Tables
- */
-
-#content .ForrestTable {
- background-color: #7099C5;
- color: black;
- margin-bottom: 1em;
-}
-#content .ForrestTable th a:link { color: white; }
-#content .ForrestTable th a:visited { color: #cfdced; }
-#content .ForrestTable th a:active { color: #000066; }
-#content .ForrestTable th a:hover { color: #000066; }
-#content .ForrestTable caption { text-align: left; color: black; font-weight: bold; }
-#content .ForrestTable th { text-align: center; color: #ffffff; }
-#content .ForrestTable td { text-align: center; background-color: #f0f0ff; color: black; padding: 5px 10px; }
-
-#content .activities th {
- font-weight: bold;
- text-align: left;
- width: 25%;
-}
-#content .activities td {
- vertical-align: top;
- padding-bottom: 1em;
-}
/**
* Misc Styles
@@ -364,8 +340,8 @@
.pdflink img {
display: block;
- height: 32px;
- width: 32px;
+ height: 16px;
+ width: 16px;
}
.printlink {
float: right;
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 23 11:39:41 2004
@@ -25,17 +25,17 @@
Like <div id="published"/>
-> DONE
, but make it configurable.
--> TODO
+-> DONE
- footer needs some attention
--> TODO
+-> TODO/HALFWAY
-- the footer do not have the color profile! Enable it!
--> TODO
+-> DONE
-- the footer should as well contain a feedback link.
See http://issues.apache.org/eyebrowse/ReadMsg?listName=forrest-user@xml.apache.org&msgNo=71
-> TODO
- introduce credits alternativ location
--> TODO
+-> DONE
- border for published / breadtrail / menu /tab divs
-> TODO
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 23 11:39:41 2004
@@ -265,8 +265,28 @@
<div class="logos">
<!-- W3C logos -->
<xsl:call-template name="compliancy-logos"/>
-
- <xsl:if test="$config/credits">
+ <xsl:if test="$filename = 'index.html' and $config/credits and not ($config/credits/credit/@box-location = 'alt')">
+ <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+ <xsl:variable name="name" select="name"/>
+ <xsl:variable name="url" select="url"/>
+ <xsl:variable name="image" select="image"/>
+ <xsl:variable name="width" select="width"/>
+ <xsl:variable name="height" select="height"/>
+ <a href="{$url}">
+ <img alt="{$name} logo" border="0">
+ <xsl:attribute name="src">
+ <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
+ <xsl:value-of select="$image"/>
+ </xsl:attribute>
+ <xsl:attribute name="style">
+ <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
+ <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
+ </xsl:attribute>
+ </img>
+ </a>
+ </xsl:for-each>
+ </xsl:if>
+ <xsl:if test="$config/credits and not ($config/credits/credit/@box-location = 'alt')">
<xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
<xsl:variable name="name" select="name"/>
<xsl:variable name="url" select="url"/>
@@ -328,12 +348,38 @@
+</xsl:comment>
<div id="menu">
<xsl:apply-templates select="div[@id='menu']/*"/>
+<div id="credit">
+ <xsl:if test="$filename = 'index.html' and $config/credits and ($config/credits/credit/@box-location = 'alt')">
+ <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+ <xsl:variable name="name" select="name"/>
+ <xsl:variable name="url" select="url"/>
+ <xsl:variable name="image" select="image"/>
+ <xsl:variable name="width" select="width"/>
+ <xsl:variable name="height" select="height"/>
+ <a href="{$url}">
+ <img alt="{$name} logo" border="0">
+ <xsl:attribute name="src">
+ <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
+ <xsl:value-of select="$image"/>
+ </xsl:attribute>
+ <xsl:attribute name="style">
+ <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
+ <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
+ </xsl:attribute>
+ </img>
+ </a>
+ </xsl:for-each>
+ </xsl:if>
+</div>
<div id="roundbottom">
<img
src="{$skin-img-dir}/rc-b-l-15-1body-2menu-3menu.png"
alt="" width="15" height="15" class="corner"
style="display: none" />
</div>
+ <xsl:comment>+
+ |alternativ credits
+ +</xsl:comment>
</div>
<xsl:comment>+
|end Menu