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 2005/09/25 04:03:31 UTC

svn commit: r291360 [2/2] - in /forrest/trunk/whiteboard/plugins: org.apache.forrest.plugin.internal.view/ org.apache.forrest.plugin.internal.view/resources/stylesheets/ org.apache.forrest.plugin.internal.view/resources/stylesheets/common/xslt/html/ or...

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-feedback.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-feedback.ft?rev=291360&r1=291359&r2=291360&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-feedback.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-feedback.ft Sat Sep 24 19:02:48 2005
@@ -16,38 +16,48 @@
   limitations under the License.
 -->
 
-<forrest:contract name="siteinfo-feedback" type="nugget"
+<forrest:contract name="siteinfo-feedback" type="nugget" 
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    This function will output the html siteinfo-feedback information.
+    <p>siteinfo-feedback<br/> The feedback element will be used to construct a 
+      feedback link in the page appending: &lt;a href="@href">{@to}&lt;/a> </p>
   </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-feedback"/>]]></usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="siteinfo-feedback" inputFormat="xsl" body="true" head="false">
-
-      <xsl:stylesheet version="1.1" 
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        
-	    <xsl:template name="siteinfo-feedback-body">
-		    <div id="siteinfo-feedback">
-		      <xsl:value-of select="$config/feedback"/>
-		      <xsl:choose>
-		        <xsl:when test="$config/feedback/@href and not($config/feedback/@href='')">
-		          <a id="feedbackto">
-		            <xsl:attribute name="href">
-		              <xsl:value-of select="$config/feedback/@href"/>
-		              <xsl:value-of select="$path"/>
-		            </xsl:attribute>
-		            <xsl:value-of select="$config/feedback/@to"/>
-		          </a>
-		        </xsl:when>
-		        <xsl:otherwise>
-		          <xsl:value-of select="$config/feedback/@to"/>
-		        </xsl:otherwise>
-		      </xsl:choose>
-		    </div>
-			</xsl:template>
+  <usage><![CDATA[<forrest:contract name="siteinfo-feedback">
+  <forrest:properties contract="siteinfo-feedback">
+    <forrest:property name="siteinfo-feedback">
+      <feedback to="webmaster@foo.com"
+        href="mailto:webmaster@foo.com?subject=Feedback&#160;" >
+        Send feedback about the website to:
+      </feedback>
+    </forrest:property>
+  </forrest:properties>
+</forrest:contract>]]></usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
+    format="xhtml" name="siteinfo-feedback" inputFormat="xsl" body="true" 
+    head="false">
+    <xsl:stylesheet version="1.1" 
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="siteinfo-feedback-body">
+        <xsl:param name="siteinfo-feedback"/>
+        <div id="siteinfo-feedback">
+          <xsl:value-of select="$siteinfo-feedback/feedback"/>
+          <xsl:choose>
+            <xsl:when 
+              test="$siteinfo-feedback/feedback/@href and not($siteinfo-feedback/feedback/@href='')">
+              <a id="feedbackto">
+                <xsl:attribute name="href">
+                  <xsl:value-of select="$siteinfo-feedback/feedback/@href"/>
+                  <xsl:value-of select="$path"/>
+                </xsl:attribute>
+                <xsl:value-of select="$siteinfo-feedback/feedback/@to"/>
+              </a>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$siteinfo-feedback/feedback/@to"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </div>
+      </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft?rev=291360&r1=291359&r2=291360&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-last-published-net.ft Sat Sep 24 19:02:48 2005
@@ -15,26 +15,32 @@
 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="siteinfo-last-published-net" type="nugget">
-    <description>
-        siteinfo-last-published-net will output the last published date of the 
-        site with the help of a timeserver. Note: You need to be able to reach 
-        http://xobjex.com/service/date.xsl!!! If you are not, it will crash views.
-    </description>
-    <usage><![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]></usage>
-    <forrest:template 
-        xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-        xmlns:forrest="http://apache.org/forrest/templates/1.0"
-        format="xhtml" name="siteinfo-last-published-net" inputFormat="xsl" body="true" head="false">
-        <xsl:stylesheet version="1.1" 
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-            <xsl:template name="siteinfo-last-published-net-body">
-                <xsl:variable name="date"
-                    select="document('http://xobjex.com/service/date.xsl')/date"/>
-                <xsl:variable name="dt" select="$date/utc/@rfc-822"/>
-                <i18n:text >Last Published:</i18n:text>&#160; <xsl:value-of select="$dt"/>
-            </xsl:template>
-        </xsl:stylesheet>
-    </forrest:template>
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0" 
+  name="siteinfo-last-published-net" type="nugget">
+  <description>
+    <p> siteinfo-last-published-net<br/> will output the last published date of 
+      the site with the help of a timeserver.</p>
+    <div class="warning">
+      <div class="label">Warning</div>
+      <div class="content">You need to be able to reach 
+        http://xobjex.com/service/date.xsl!!! If you are not, it will crash 
+        views.</div>
+    </div>
+  </description>
+  <usage><![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]>
+    </usage>
+  <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
+    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="xhtml" 
+    name="siteinfo-last-published-net" inputFormat="xsl" body="true" 
+    head="false">
+    <xsl:stylesheet version="1.1" 
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:template name="siteinfo-last-published-net-body"> <xsl:variable 
+        name="date" 
+        select="document('http://xobjex.com/service/date.xsl')/date"/> 
+        <xsl:variable name="dt" select="$date/utc/@rfc-822"/> <i18n:text >Last 
+        Published:</i18n:text>&#160; <xsl:value-of select="$dt"/> 
+        </xsl:template>
+    </xsl:stylesheet>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft?rev=291360&r1=291359&r2=291360&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft Sat Sep 24 19:02:48 2005
@@ -20,10 +20,17 @@
   name="siteinfo-meta-icon"
   type="nugget">
   <description>
-    siteinfo-meta-icon will output the html additional shortcut icon in head element.
-    This icon is generally displayed by browser at the beginning of the URL.
+    <p><strong>siteinfo-meta-icon</strong> <br/>will output the html 
+      additional shortcut icon in head element. This icon is generally 
+      displayed by browser at the beginning of the URL. </p>
   </description>
-  <usage><![CDATA[<forrest:contract name="siteinfo-meta-icon"/>]]></usage>
+  <usage><![CDATA[<forrest:contract name="siteinfo-meta-icon">
+  <forrest:properties contract="siteinfo-meta-icon">
+    <forrest:property name="siteinfo-meta-icon">
+      <favicon-url></favicon-url>
+    </forrest:property>
+  </forrest:properties>
+</forrest:contract>]]></usage>
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -32,13 +39,15 @@
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="siteinfo-meta-icon-head">
+        <xsl:param name="siteinfo-meta-icon"/>
 <!--+
   |favicon
   +-->
-        <xsl:if test="//skinconfig/favicon-url">
+        <xsl:if test="$siteinfo-meta-icon/favicon-url">
           <link rel="shortcut icon">
             <xsl:attribute name="href">
-              <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
+              <xsl:value-of 
+                select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
             </xsl:attribute>
           </link>
         </xsl:if>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-navigation.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-navigation.ft?rev=291360&r1=291359&r2=291360&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-navigation.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-navigation.ft Sat Sep 24 19:02:48 2005
@@ -15,16 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract name="siteinfo-meta-navigation" type="nugget"
+<forrest:contract name="siteinfo-meta-navigation" type="nugget" 
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    This functions will output the html additional navigation in head element. 
-    Implemented forrest version/skin name.
+    <p> <strong>siteinfo-meta-navigation</strong> <br/>This functions will 
+      output the html additional navigation in head element. Implemented 
+      forrest version/skin name. </p>
   </description>
   <usage><![CDATA[<forrest:contract name="siteinfo-meta-navigation"/>]]></usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="siteinfo-meta-navigation" inputFormat="xsl" body="false" head="true">
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
+    format="xhtml" name="siteinfo-meta-navigation" inputFormat="xsl" 
+    body="false" head="true">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="siteinfo-meta-navigation-head">
@@ -93,5 +94,5 @@
         </link>
       </xsl:template>
     </xsl:stylesheet>
-	</forrest:template>
+  </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta.ft?rev=291360&r1=291359&r2=291360&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta.ft Sat Sep 24 19:02:48 2005
@@ -18,7 +18,11 @@
 <forrest:contract name="siteinfo-meta" type="nugget"
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    This functions will output the html meta information. Implemented forrest version/skin name.
+    <p>This functions will output the html meta information.</p>
+    <div class="note">
+      <div class="label">Note</div>
+      <div class="content">Implemented forrest version/skin name.</div>
+    </div>
   </description>
   <usage><![CDATA[<forrest:contract name="siteinfo-meta">
     <forrest:properties contract="siteinfo-meta">
@@ -45,15 +49,6 @@
 		      </xsl:attribute>
 		    </meta>
 		  </xsl:template>
-       <!--<xsl:template name="siteinfo-meta-body">
-        <xsl:param name="siteinfo-meta" select="'test'"/>
-        <xsl:copy-of select="$siteinfo-meta"/>xx
-        <p name="Forrest-skin-name">
-		      <xsl:attribute name="content">
-		        <xsl:value-of select="$siteinfo-meta/project-skin"/>
-		      </xsl:attribute>
-		    </p>
-        </xsl:template>-->
 		</xsl:stylesheet>
 	</forrest:template>
 </forrest:contract>