Author: gmcdonald
Date: Fri Jul 13 05:59:57 2007
New Revision: 555975
URL: http://svn.apache.org/viewvc?view=rev&rev=555975
Log:
MOTD repositioning, thanks to David Crossley for the xsl stylsheet changes. Fix
for FOR-605
Modified:
forrest/trunk/main/webapp/skins/pelt/css/basic.css
forrest/trunk/main/webapp/skins/pelt/css/screen.css
forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
Modified: forrest/trunk/main/webapp/skins/pelt/css/basic.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/css/basic.css?view=diff&rev=555975&r1=555974&r2=555975
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/css/basic.css (original)
+++ forrest/trunk/main/webapp/skins/pelt/css/basic.css Fri Jul 13 05:59:57 2007
@@ -39,6 +39,7 @@
}
.note, .warning, .fixme {
+ clear:right;
border: solid black 1px;
margin: 1em 3em;
}
Modified: forrest/trunk/main/webapp/skins/pelt/css/screen.css
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/css/screen.css?view=diff&rev=555975&r1=555974&r2=555975
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/css/screen.css (original)
+++ forrest/trunk/main/webapp/skins/pelt/css/screen.css Fri Jul 13 05:59:57 2007
@@ -455,11 +455,12 @@
}
#motd-area {
+ position:relative;
+ float:right;
width: 35%;
background-color: #f0f0ff;
- border-top: solid 1px #4C6C8F;
- border-bottom: solid 1px #4C6C8F;
- margin: 15px;
+ border: solid 1px #4C6C8F;
+ margin: 0px 0px 10px 10px;
padding: 5px;
}
@@ -477,6 +478,10 @@
list-style-image: url('images/current.gif');
font-weight: normal;
}
+
+.abstract{
+ text-align:justify;
+ }
li p {
margin: 0;
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl?view=diff&rev=555975&r1=555974&r2=555975
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
(original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl Fri Jul
13 05:59:57 2007
@@ -57,11 +57,15 @@
<xsl:apply-templates select="header/version"/>
</div>
-->
- <xsl:if test="header/abstract">
- <div class="abstract">
- <xsl:value-of select="header/abstract"/>
- </div>
- </xsl:if>
+ <div id="front-matter">
+ <div id="motd-page"/>
+ <xsl:if test="header/abstract">
+ <div class="abstract">
+ <xsl:value-of select="header/abstract"/>
+ </div>
+ </xsl:if>
+ <div id="skinconf-toc-page"/>
+ </div>
<xsl:apply-templates select="body"/>
<xsl:if test="header/authors">
<p align="right">
@@ -82,7 +86,6 @@
</div>
</xsl:template>
<xsl:template match="body">
- <div id="skinconf-toc-page"/>
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="@id">
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?view=diff&rev=555975&r1=555974&r2=555975
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Fri Jul 13
05:59:57 2007
@@ -751,8 +751,8 @@
</div>
</xsl:if>
</xsl:template>
- <xsl:template match="[EMAIL PROTECTED]'skinconf-toc-page']">
<!-- Message of the day -->
+ <xsl:template match="[EMAIL PROTECTED]'motd-page']">
<xsl:if test="$config/motd">
<xsl:for-each select="$config/motd/motd-option">
<xsl:choose>
@@ -793,6 +793,8 @@
</xsl:choose>
</xsl:for-each>
</xsl:if>
+ </xsl:template>
+ <xsl:template match="[EMAIL PROTECTED]'skinconf-toc-page']">
<!-- Table of Contents ToC -->
<xsl:if test="$config/toc">
<xsl:if test="contains($minitoc-location,'page')">
