You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2003/05/16 16:25:38 UTC

cvs commit: cocoon-2.1/src/blocks/woody/samples welcome.xml sitemap.xmap welcome.html

stevenn     2003/05/16 07:25:38

  Modified:    src/blocks/woody/samples/forms form1_template.xml
                        registration_template.xml
               src/blocks/woody/samples sitemap.xmap
  Added:       src/blocks/woody/samples welcome.xml
  Removed:     src/blocks/woody/samples welcome.html
  Log:
  corporate look&feel for Woody
  
  Revision  Changes    Path
  1.4       +5 -7      cocoon-2.1/src/blocks/woody/samples/forms/form1_template.xml
  
  Index: form1_template.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/forms/form1_template.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- form1_template.xml	14 May 2003 11:36:46 -0000	1.3
  +++ form1_template.xml	16 May 2003 14:25:37 -0000	1.4
  @@ -1,9 +1,7 @@
   <?xml version="1.0"?>
  -<html xmlns:wt="http://apache.org/cocoon/woody/template/1.0">
  -  <head>
  -    <title>Form 1 sample</title>
  -  </head>
  -  <body>
  +<page xmlns:wt="http://apache.org/cocoon/woody/template/1.0">
  +  <title>Sample form</title>
  +  <content>
       <form action="form1" method="POST">
         <table border="1">
           <tr>
  @@ -84,5 +82,5 @@
   
         <input type="submit"/>
       </form>
  -  </body>
  -</html>
  +  </content>
  +</page>
  
  
  
  1.3       +5 -8      cocoon-2.1/src/blocks/woody/samples/forms/registration_template.xml
  
  Index: registration_template.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/forms/registration_template.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- registration_template.xml	30 Apr 2003 08:38:45 -0000	1.2
  +++ registration_template.xml	16 May 2003 14:25:37 -0000	1.3
  @@ -1,10 +1,7 @@
   <?xml version="1.0"?>
  -<html xmlns:wt="http://apache.org/cocoon/woody/template/1.0">
  -  <head>
  -    <title>Registration form</title>
  -  </head>
  -  <body>
  -    <h1>Registration</h1>
  +<page xmlns:wt="http://apache.org/cocoon/woody/template/1.0">
  +  <title>Registration</title>
  +  <content>
       <form action="registration" method="POST">
         <wt:widget-label id="name"/>
         <wt:widget id="name"/>
  @@ -27,5 +24,5 @@
   
         <input type="submit"/>
       </form>
  -  </body>
  -</html>
  +  </content>
  +</page>
  
  
  
  1.4       +35 -1     cocoon-2.1/src/blocks/woody/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/samples/sitemap.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sitemap.xmap	14 May 2003 11:36:46 -0000	1.3
  +++ sitemap.xmap	16 May 2003 14:25:37 -0000	1.4
  @@ -33,11 +33,31 @@
   
    </map:components>
   
  + <map:views>
  +  <map:view name="content" from-label="content">
  +   <map:serialize type="xml"/>
  +  </map:view>
  +
  +  <map:view name="pretty-content" from-label="data">
  +   <map:transform src="context://stylesheets/system/xml2html.xslt"/>
  +   <map:serialize type="html"/>
  +  </map:view>
  +
  +  <map:view name="links" from-position="last">
  +   <map:serialize type="links"/>
  +  </map:view>
  + </map:views>
  +
  +
    <map:pipelines>
      <map:pipeline>
   
        <map:match pattern="">
  -       <map:read src="welcome.html"/>
  +      <map:generate src="welcome.xml"/>
  +      <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
  +         <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
  +      <map:serialize/>
        </map:match>
   
        <!--
  @@ -85,6 +105,13 @@
          <map:transform type="i18n">
            <map:parameter name="locale" value="en-US"/>
          </map:transform>
  +       <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  +         <map:parameter name="contextPath" value="{request:contextPath}"/>
  +         <map:parameter name="servletPath" value="{request:servletPath}"/>
  +         <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  +         <map:parameter name="file" value="forms/form1_template.xml"/>
  +         <map:parameter name="remove" value="{0}"/>
  +       </map:transform>
          <map:serialize/>
        </map:match>
   
  @@ -120,6 +147,13 @@
          <map:transform src="xsl/html/woody-default.xsl"/>
          <map:transform type="i18n">
            <map:parameter name="locale" value="en-US"/>
  +       </map:transform>
  +       <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
  +         <map:parameter name="contextPath" value="{request:contextPath}"/>
  +         <map:parameter name="servletPath" value="{request:servletPath}"/>
  +         <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  +         <map:parameter name="file" value="forms/registration_template.xml"/>
  +         <map:parameter name="remove" value="{0}"/>
          </map:transform>
          <map:serialize/>
        </map:match>
  
  
  
  1.1                  cocoon-2.1/src/blocks/woody/samples/welcome.xml
  
  Index: welcome.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  <samples xmlns:xlink="http://www.w3.org/1999/xlink">
  
   <group name="Main examples page.">
    <sample name="Back" href="..">to Cocoon examples main page</sample>
    <note>
      Woody is a new form framework for Cocoon.
      Woody is currently still alpha software and under active development. Your
      feedback is very much welcome on the Cocoon mailing lists.
    </note>
    <sample name="Woody Documentation" href="http://wiki.cocoondev.org/Wiki.jsp?page=Woody">
      Currently the documentation is available on the Cocoon Wiki.</sample>
   </group>
  
   <group name="Woody Samples">
    <sample name="Various" href="form1">This sample shows validation, event handling and various Woody features.</sample>
  
    <sample name="Registration" href="registration">A simple registration form.</sample>
   </group>
  
  </samples>