forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r180064 - /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates
Date Sun, 05 Jun 2005 02:47:28 GMT
Author: thorsten
Date: Sat Jun  4 19:47:28 2005
New Revision: 180064

URL: http://svn.apache.org/viewcvs?rev=180064&view=rev
Log:
added new contracts

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
  (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
  (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
  (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
  (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
  (with props)
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_de.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_es.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_us.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/views/default.fv
Sat Jun  4 19:47:28 2005
@@ -29,9 +29,10 @@
       </forrest:hook>
       <forrest:hook name="spacer" />
       <forrest:contract name="nav"/>
-      
+      <forrest:hook name="last-published-tagline">
+          <forrest:contract name="last-published"/>
+      </forrest:hook>
       <forrest:contract name="content">
-        <forrest:contract name="last-published"/>
         <forrest:contract name="fontsize"/>
         <!--<forrest:hook name="export-link">
 	      <forrest:contract name="txt-link"/>
@@ -40,6 +41,6 @@
       </forrest:contract>
     </forrest:hook>
     <forrest:contract name="feedback"/>
-    <forrest:contract name="last-published"/>
+    <!--<forrest:contract name="last-published"/>-->
   </forrest:view>
 </forrest:views>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_de.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_de.xml?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_de.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_de.xml
Sat Jun  4 19:47:28 2005
@@ -18,5 +18,6 @@
   <message key="Font size:">Schriftgrösse:</message>
   <message key="Last Published:">Zuletzt veröffentlicht:</message>
   <message key="Search">Suche</message>
+  <message key="More">Mehr</message>
   <message key="Search the site with">Suche auf der Seite mit</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_es.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_es.xml?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_es.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_es.xml
Sat Jun  4 19:47:28 2005
@@ -18,5 +18,6 @@
   <message key="Font size:">Tamaño de fuente:</message>
   <message key="Last Published:">Último publicado:</message>
   <message key="Search">Búsqueda</message>
+  <message key="More">Más</message>
   <message key="Search the site with">Búsqueda en</message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_us.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_us.xml?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_us.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/messages/ContractsMessages_us.xml
Sat Jun  4 19:47:28 2005
@@ -18,5 +18,6 @@
   <message  key="Font size:">Font size:</message>
   <message key="Last Published:">Last Published:</message>
   <message key="Search">Search</message>
+  <message key="More">More</message>
   <message key="Search the site with">Suche auf der Seite mit </message>
 </catalogue>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Sat Jun  4 19:47:28 2005
@@ -17,6 +17,12 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 	<map:components>
+    <map:pipes default="caching">
+	   <map:pipe name="caching"
+	    src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
+	   <map:pipe name="noncaching"
+	    src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
+	  </map:pipes>
 		<map:selectors>
       <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.forrest.sourceexists.SourceExistsSelector"
/>
     </map:selectors>
@@ -76,7 +82,7 @@
   common skining
   This is the template producing factory.
   -->
- <map:pipeline>
+ <map:pipeline type="noncaching">
   <!--
     FIXME:
     The next pipes have to be refactored and then to go into the view-interface (internal
plugin)

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft?rev=180064&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
Sat Jun  4 19:47:28 2005
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:contract 
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-abstract" type="nugget">
+  <description>
+    content-abstract - Template will output the content-abstract. 
+  </description>
+  
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false" css="false">
+     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	    <xsl:template name="content-abstract-body">
+	<xsl:comment>+
+	    |start content-abstract
+	    +</xsl:comment>
+			  <xsl:copy-of select="div[@id='content']/div[@class='abstract']"/>
+<xsl:comment>+
+    |end content-abstract
+    +</xsl:comment>
+		  </xsl:template>
+	  </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-abstract.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft?rev=180064&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
Sat Jun  4 19:47:28 2005
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:contract 
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-main" type="nugget">
+  <description>
+    content-main - Template will output the content-main. 
+  </description>
+  
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false" css="false">
+     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	    <xsl:template name="content-main-body" >
+	<xsl:comment>+
+	    |start content-main
+	    +</xsl:comment>
+			  <xsl:apply-templates select="div[@id='content']/h1[position()>1] | div[@id='content']/a"/>
+<xsl:comment>+
+    |end content-main
+    +</xsl:comment>
+		  </xsl:template>
+	  </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-main.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft?rev=180064&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
Sat Jun  4 19:47:28 2005
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:contract 
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-title" type="nugget">
+  <description>
+    content-title - Template will output the content-title. 
+  </description>
+  
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="content-title" inputFormat="xsl" body="true" head="false" css="false">
+     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	    <xsl:template name="content-title-body" match="div[@id='content']/h1[position()=1]">
+	<xsl:comment>+
+	    |start content-title
+	    +</xsl:comment>
+			  <xsl:copy-of select="div[@id='content']/h1[position()=1]"/>
+<xsl:comment>+
+    |end content-title
+    +</xsl:comment>
+		  </xsl:template>
+	  </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/content-title.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/last-published.ft
Sat Jun  4 19:47:28 2005
@@ -24,9 +24,27 @@
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="last-published" inputFormat="xsl" body="true" head="false" css="false">
+    format="xhtml" name="last-published" inputFormat="xsl" body="true" head="false" css="true">
     <xsl:stylesheet version="1.1" 
+		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        <xsl:template name="last-published-css">
+          #last-published-tagline {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    font-size: 70%;
+    text-align: right;
+    width: 50%;
+    background-color: #f0f0ff;
+    border-top: solid 1px #4C6C8F;
+    border-bottom: solid 1px #4C6C8F;
+    margin-bottom: 15px;
+    margin-left: 15px;
+    margin-right: 0;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
+        </xsl:template>
         <xsl:template name="last-published-body">
 		      <script type="text/javascript">document.write("<i18n:text >Last Published:</i18n:text>&#160;"
+ document.lastModified);</script>
 		    </xsl:template>

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft?rev=180064&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
Sat Jun  4 19:47:28 2005
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="minitoc" type="nugget">
+  <description>
+    minitoc - Template will output the minitoc. 
+  </description>
+  
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="minitoc" inputFormat="xsl" body="true" head="false" css="false">
+     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	    <xsl:template name="minitoc-body" match="div[@id='content']/div[@id='skinconf-toc-page']">
+	<xsl:comment>+
+	    |start minitoc
+	    +</xsl:comment>
+		
+		    <xsl:if test="$config/toc">
+		      <xsl:if test="contains($minitoc-location,'page')">
+		        <xsl:if test="count(//tocitems/tocitem) >= $config/toc/@min-sections">
+					<div id="minitoc-area">
+		    			<xsl:call-template name="minitoc">
+		        		    <xsl:with-param name="tocroot" select="//tocitems"/>
+			          	</xsl:call-template>
+					</div>
+			    </xsl:if>
+		      </xsl:if>
+		    </xsl:if>
+ 
+<xsl:comment>+
+    |end minitoc
+    +</xsl:comment>
+		  </xsl:template>
+      <xsl:template name="minitoc">
+		    <xsl:param name="tocroot"/>
+		    <xsl:if test="count($tocroot/tocitem) >= $config/toc/@min-sections">
+		    <xsl:if test="contains($config/toc/@location,'page')">
+		      <ul class="minitoc">
+		        <xsl:for-each select="$tocroot/tocitem">
+		          <li>
+		            <a href="{@href}">
+		              <xsl:value-of select="@title"/>
+		            </a>
+		            <xsl:if test="@level&lt;//skinconfig/toc/@max-depth+1">
+		              <xsl:call-template name="minitoc">
+		                <xsl:with-param name="tocroot" select="."/>
+		              </xsl:call-template>
+		            </xsl:if>
+		          </li>
+		        </xsl:for-each>
+		      </ul>
+		    </xsl:if>
+		    </xsl:if>
+		  </xsl:template>
+	  </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/minitoc.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft?rev=180064&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
Sat Jun  4 19:47:28 2005
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<forrest:contract 
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="motd-page" type="nugget">
+  <description>
+    motd-page - Template will output the motd-page. 
+  </description>
+  
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    format="xhtml" name="motd-page" inputFormat="xsl" body="true" head="false" css="false">
+     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	    <xsl:template name="motd-page-body" match="div[@id='content']/div[@id='skinconf-toc-page']">
+	<xsl:comment>+
+	    |start motd-page
+	    +</xsl:comment>
+			  <xsl:if test="$config/motd-page">
+		      <xsl:if test="$config/motd-page/@location='page' or $config/motd-page/@location='both'">
+ 	            <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><i18n:text >More</i18n:text></xsl:text>
+		              </a>
+		            <xsl:text>)</xsl:text>
+		          </xsl:if>
+		      </xsl:if>
+		    </xsl:if>
+<xsl:comment>+
+    |end motd-page
+    +</xsl:comment>
+		  </xsl:template>
+	  </xsl:stylesheet>
+  </forrest:template>
+</forrest:contract>
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/motd-page.ft
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft?rev=180064&r1=180063&r2=180064&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/searchbox.ft
Sat Jun  4 19:47:28 2005
@@ -22,6 +22,7 @@
   </description>
   
   <forrest:template
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   format="xhtml" name="searchbox" inputFormat="xsl" body="true" head="false" css="true">
 
@@ -53,7 +54,7 @@
                 <form method="get" action="{$root}{$lucene-search}">
                   <input type="text" id="query" name="queryString" size="25" value="Search
the site with {$config/search/@provider}:" onFocus="getBlank (this, 'Search the site with
{$config/search/@provider}:');"/>
 		  &#160;
-		  <input type="submit" value="Search" name="Search"/>
+		  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
 		 </form>
 	      </xsl:when>
 	      <xsl:otherwise>
@@ -61,7 +62,7 @@
                     <input type="hidden" 
                     name="sitesearch" value="{$config/search/@domain}"/> 
                     <input type="text" id="query" name="q" size="25"/>&#160; 
-                    <input type="submit" value="Search" name="Search"/> </form>
+                   <input type="submit" value="Search" name="Search" i18n:attr="value"/>
</form>
         </xsl:otherwise>
 </xsl:choose>
             </div>



Mime
View raw message