You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/03/23 09:13:01 UTC
svn commit: r158747 - in forrest/trunk: docs-author/status.xml
main/fresh-site/src/documentation/skinconf.xml
main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd
main/webapp/skins/pelt/css/screen.css
main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
Author: crossley
Date: Wed Mar 23 00:12:54 2005
New Revision: 158747
URL: http://svn.apache.org/viewcvs?view=rev&rev=158747
Log:
Added rudimentary Message of the Day facility. Only in pelt skin at this stage.
Modified:
forrest/trunk/docs-author/status.xml
forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd
forrest/trunk/main/webapp/skins/pelt/css/screen.css
forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
Modified: forrest/trunk/docs-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/docs-author/status.xml?view=diff&r1=158746&r2=158747
==============================================================================
--- forrest/trunk/docs-author/status.xml (original)
+++ forrest/trunk/docs-author/status.xml Wed Mar 23 00:12:54 2005
@@ -51,6 +51,12 @@
Added document to facilitate
<link href="site:upgrading_07">upgrading to v0.7</link>
</action>
+ <action dev="DC" type="add" context="core">
+ Added rudimentary Message of the Day facility.
+ See skinconf.xml from a "seed" site for configuration details.
+ Append a small text string after html title.
+ Add text to a panel on the page.
+ </action>
<action dev="RDG" type="update" context="core">
Moved status "changes" and "todo" page generation to the
org.apache.forrest.plugin.projectInfo plugin.
Modified: forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/skinconf.xml?view=diff&r1=158746&r2=158747
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/skinconf.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/skinconf.xml Wed Mar 23 00:12:54 2005
@@ -133,6 +133,24 @@
href="mailto:webmaster@foo.com?subject=Feedback " >
Send feedback about the website to:
</feedback>
+
+ <!-- Optional message of the day.
+ motd-title : This text will be added in brackets after the <html><title>
+ motd-page : This text will be added in a panel on the face of the page,
+ with the "motd-page-url" being the hyperlink "More".
+ Values for the "location" attribute are:
+ page : on the face of the page, e.g. in the spare space of the toc
+ alt : at the bottom of the left-hand navigation panel
+ both : both
+ -->
+ <!--
+ <motd-title>v0.7</motd-title>
+ <motd-page location="alt">
+ This is documentation for the current release v0.7
+ </motd-page>
+ <motd-page-url>/docs/</motd-page-url>
+ -->
+
<!--
extra-css - here you can define custom css-elements that are
a. overriding the fallback elements or
Modified: forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd?view=diff&r1=158746&r2=158747
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd (original)
+++ forrest/trunk/main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd Wed Mar 23 00:12:54 2005
@@ -46,7 +46,8 @@
project-name?, project-description?, project-url?, project-logo,
group-name?, group-description?, group-url?, group-logo?,
host-url?, host-logo?, favicon-url?, year?, vendor?, copyright-link?, trail?,
- toc?, headings?,feedback?, extra-css?, colors?, pdf?, credits?)>
+ toc?, headings?, feedback?, motd-title?, motd-page?, motd-page-url?,
+ extra-css?, colors?, pdf?, credits?)>
<!ELEMENT search EMPTY>
<!ATTLIST search name CDATA #IMPLIED
@@ -107,6 +108,10 @@
<!ELEMENT feedback (#PCDATA)>
<!ATTLIST feedback href CDATA #IMPLIED
to CDATA #IMPLIED>
+ <!ELEMENT motd-title (#PCDATA)>
+ <!ELEMENT motd-page (#PCDATA)>
+ <!ATTLIST motd-page location CDATA #IMPLIED>
+ <!ELEMENT motd-page-url (#PCDATA)>
<!ELEMENT colors (color*)>
<!ELEMENT color EMPTY>
<!ATTLIST color name CDATA #IMPLIED
Modified: forrest/trunk/main/webapp/skins/pelt/css/screen.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/css/screen.css?view=diff&r1=158746&r2=158747
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/pelt/css/screen.css Wed Mar 23 00:12:54 2005
@@ -404,6 +404,19 @@
padding: 0;
}
+#motd-area {
+ position: relative; /* IE bugfix cont'd */
+ float: right;
+ background-color: #f0f0ff;
+ border-top: solid 1px #4C6C8F;
+ border-bottom: solid 1px #4C6C8F;
+ margin-bottom: 15px;
+ margin-left: 15px;
+ margin-right: 10%;
+ padding-bottom: 5px;
+ padding-top: 5px;
+}
+
#minitoc-area {
border-top: solid 1px #4C6C8F;
border-bottom: solid 1px #4C6C8F;
@@ -417,6 +430,7 @@
list-style-image: url('images/current.gif');
font-weight: normal;
}
+
li p {
margin: 0;
padding: 0;
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl?view=diff&r1=158746&r2=158747
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl Wed Mar 23 00:12:54 2005
@@ -57,6 +57,11 @@
+-->
<title>
<xsl:value-of select="div[@id='content']/h1"/>
+ <xsl:if test="$config/motd-title">
+ <xsl:text> (</xsl:text>
+ <xsl:value-of select="$config/motd-title"/>
+ <xsl:text>)</xsl:text>
+ </xsl:if>
</title>
<!--+
|stylesheets
@@ -308,7 +313,6 @@
</a>
</xsl:for-each>
</xsl:if>
-
</div>
</xsl:if>
<xsl:if test="$config/host-logo and not($config/host-logo = '')">
@@ -411,6 +415,22 @@
</a>
</xsl:for-each>
</xsl:if>
+ <xsl:if test="$config/motd-page">
+ <xsl:if test="$config/motd-page/@location='alt' or $config/motd-page/@location='both'">
+ <hr />
+ <xsl:value-of select="$config/motd-page"/>
+ <xsl:if test="$config/motd-page-url">
+ <xsl:text> (</xsl:text>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="$config/motd-page-url"/>
+ </xsl:attribute>
+ <xsl:text>More</xsl:text>
+ </a>
+ <xsl:text> ...)</xsl:text>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
</div>
<div id="roundbottom">
<img
@@ -568,7 +588,26 @@
</div>
</xsl:if>
</xsl:template>
+
<xsl:template match="div[@id='skinconf-toc-page']">
+ <xsl:if test="$config/motd-page">
+ <xsl:if test="$config/motd-page/@location='page' or $config/motd-page/@location='both'">
+ <div id="motd-area">
+ <xsl:value-of select="$config/motd-page"/>
+ <xsl:if test="$config/motd-page-url">
+ <xsl:text> (</xsl:text>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:value-of select="$config/motd-page-url"/>
+ </xsl:attribute>
+ <xsl:text>More</xsl:text>
+ </a>
+ <xsl:text> ...)</xsl:text>
+ </xsl:if>
+ </div>
+ </xsl:if>
+ </xsl:if>
+
<xsl:if test="$config/toc">
<xsl:if test="contains($minitoc-location,'page')">
<xsl:if test="count(//tocitems/tocitem) >= $config/toc/@min-sections">