You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by gm...@apache.org on 2007/03/05 08:31:25 UTC
svn commit: r514586 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes:
common/html/branding-fontsize.ft pelt/css/pelt.screen.css
pelt/html/pelt-html.vt.xml
Author: gmcdonald
Date: Sun Mar 4 23:31:24 2007
New Revision: 514586
URL: http://svn.apache.org/viewvc?view=rev&rev=514586
Log:
More enhancements to Pelt Theme, FOR-811. Fixing branding fontsize revealed CSS changes needed.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-html.vt.xml
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft?view=diff&rev=514586&r1=514585&r2=514586
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft Sun Mar 4 23:31:24 2007
@@ -15,31 +15,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<forrest:contract name="branding-fontsize" type="nugget"
+<forrest:contract name="branding-fontsize"
xmlns:forrest="http://apache.org/forrest/templates/1.0"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
<description>
branding-fontsize lets users change the size of the font via javascript.
</description>
<usage><![CDATA[<forrest:contract name="branding-fontsize"/>]]></usage>
- <forrest:template
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- format="html" name="branding-fontsize" inputFormat="xsl" body="true" head="true">
- <xsl:stylesheet version="1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template name="branding-fontsize-head">
- <script type="text/javascript"
- src="{$root}themes/fontsize.js"> </script>
- </xsl:template>
-
- <xsl:template name="branding-fontsize-body">
- <script type="text/javascript">ndeSetTextSize();</script>
- <i18n:text >Font size:</i18n:text>
-  <input type="button" onclick="ndeSetTextSize('reset'); return false;" title="Reset text" class="resetfont" value="Reset"/>
-  <input type="button" onclick="ndeSetTextSize('decr'); return false;" title="Shrink text" class="smallerfont" value="-a"/>
-  <input type="button" onclick="ndeSetTextSize('incr'); return false;" title="Enlarge text" class="biggerfont" value="+a"/>
- </xsl:template>
-
- </xsl:stylesheet>
- </forrest:template>
+ <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" name="branding-fontsize" inputFormat="xsl">
+<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:param name="defaultVariables"/>
+ <xsl:variable name="root" select="$defaultVariables/*/*[@name='root']/@value"/>
+ <xsl:template match="/">
+ <forrest:content>
+ <forrest:part xpath="/html/head">
+ <script type="text/javascript" src="{$root}themes/fontsize.js"> </script>
+ </forrest:part>
+ <forrest:part>
+ <script type="text/javascript">ndeSetTextSize();</script>
+ <i18n:text >Font size:</i18n:text>
+  <input type="button" onclick="ndeSetTextSize('reset'); return false;" title="Reset text" class="resetfont" value="Reset"/>
+  <input type="button" onclick="ndeSetTextSize('decr'); return false;" title="Shrink text" class="smallerfont" value="-a"/>
+  <input type="button" onclick="ndeSetTextSize('incr'); return false;" title="Enlarge text" class="biggerfont" value="+a"/>
+ </forrest:part>
+ </forrest:content>
+ </xsl:template>
+</xsl:stylesheet>
+</forrest:template>
</forrest:contract>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css?view=diff&rev=514586&r1=514585&r2=514586
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/css/pelt.screen.css Sun Mar 4 23:31:24 2007
@@ -19,7 +19,7 @@
margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif;
background-color: #FFFFFF;
color: #000000;
- font-size: 80%;
+ font-size: 75%;
}
p {
@@ -53,7 +53,7 @@
padding: 20px 20px 20px 200px;
margin: 0;
font-family : Verdana, Helvetica, sans-serif;
- font-size: 0.95em;
+ font-size: 0.75em;
}
#content ul {
@@ -72,7 +72,7 @@
#content .attribution {
text-align: right;
font-style: italic;
- font-size: 0.9em;
+ font-size: 0.75em;
margin-top: 1em;
}
@@ -137,7 +137,7 @@
float: left;
width: 100%;
background-color: #294563;
- background-image: url(../themes/images/header_white_line.gif);
+ background-image: url('../themes/images/header_white_line.gif');
background-position: bottom left;
background-repeat: repeat-x;
}
@@ -204,7 +204,7 @@
/* Navigation - Top Horizontal Tabbed Navigation */
#nav-main {
- font-size: 0.9em;
+ font-size: 0.7em;
clear: both;
padding-left: 10px;
margin: 0;
@@ -272,7 +272,7 @@
padding-top: 3px;
padding-bottom:3px;
color: #fff;
- font-size : 0.8em;
+ font-size : 0.6em;
font-weight: bold;
text-align:right;
min-height:10px;
@@ -381,7 +381,7 @@
z-index: 20;
border-color: #000000;
background-color: #4A6D8C;
- font-size: 0.9em;
+ font-size: 0.75em;
color: #000000;
}
@@ -441,6 +441,7 @@
background-position: center left;
font-weight : normal;
margin-left: 10px;
+ font-size: 0.9em;
}
#nav-section .menupage {
@@ -456,12 +457,13 @@
color: #000000;
padding: 0px 0px 0px 6px;
font-style : normal;
- font-weight : normal;
+ font-weight : normal;
border-style: solid;
border-width: 1px;
margin-right: 10px;
border-color: #999999;
background-color: #CFDCED;
+ font-size: 0.9em;
}
#nav-section .menupageitemgroup {
@@ -480,7 +482,7 @@
font-style : normal;
font-weight : normal;
border-width: 0px;
- font-size: 0.9em;
+ font-size: 0.75em;
}
#nav-section .menupageitem a:link { color: #000000;}
#nav-section .menupageitem a:visited { color: #000000;}
@@ -519,7 +521,7 @@
margin-top: 5px;
}
#feedback #feedbackto {
- font-size: 0.9em;
+ font-size: 0.75em;
color: black;
}
#footer {
@@ -567,7 +569,9 @@
.trail {
position: relative; /* IE bugfix cont'd */
- float: left;
+ font-size: 75%;
+ text-align: right;
+ float: right;
margin: -10px 5px 0px 5px;
padding: 0;
}
@@ -658,12 +662,12 @@
color: #0F3660;
border-bottom: solid 1px white;
padding: 3px 10px;
- font-size: 0.8em;
+ font-size: 0.75em;
min-height:12px;
}
-.breadtrail a:link { color: #0F3660; }
-.breadtrail a:visited { color: #0F3660; }
-.breadtrail a:hover { color: #000066; }
+.breadtrail a:link { color: black; }
+.breadtrail a:visited { color: black; }
+.breadtrail a:hover { color: black; }
#page .breadtrail {
clear:both;
@@ -711,7 +715,7 @@
background: #F0F0FF;
color: black;
line-height: 120%;
- font-size: 0.9em;
+ font-size: 0.75em;
}
/*
* Notes, Warnings, Fixme ...
@@ -746,4 +750,5 @@
font-size: 0.9em;
padding: 5px 10px;
}
+
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-html.vt.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-html.vt.xml?view=diff&rev=514586&r1=514585&r2=514586
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-html.vt.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/pelt-html.vt.xml Sun Mar 4 23:31:24 2007
@@ -175,7 +175,7 @@
</forrest:contract>
<forrest:contract name="nav-section-round-bottom"/>
<!-- This content displays below the navigation. the below example displays
- ApacheCon logos and links, but can be used for whatever, or commented out -->
+ ApacheCon logos and links, but can be used for whatever, or commented out
<forrest:hook name="below-nav">
<forrest:contract name="siteinfo-credits">
<forrest:property name="box-location">credit2</forrest:property>
@@ -200,17 +200,17 @@
</credits>
</forrest:property>
</forrest:contract>
-</forrest:hook>
+</forrest:hook>-->
<!-- end of below-nav content -->
</forrest:hook>
- <forrest:hook name="export-link">
+ <forrest:hook name="content">
+ <forrest:hook name="export-link">
<forrest:contract name="content-pdf-link"/>
</forrest:hook>
- <forrest:hook name="content">
<!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
- <!-- <forrest:hook class="trail">
+ <forrest:hook class="trail">
<forrest:contract name="branding-fontsize"/>
- </forrest:hook>-->
+ </forrest:hook>
<forrest:contract name="content-title"
dataURI="cocoon://#{$getRequest}.title.xml"/>
<forrest:contract name="content-abstract"