cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From un...@apache.org
Subject cvs commit: cocoon-2.2/src/webapp/samples/flow/prefs sitemap.xmap
Date Sun, 22 Feb 2004 19:34:26 GMT
unico       2004/02/22 11:34:26

  Modified:    src/webapp/samples/flow/prefs sitemap.xmap
  Added:       src/webapp/samples/flow/prefs/screens welcome.xml login.xml
                        registrationSuccessful.xml userInfo.xml
  Removed:     src/webapp/samples/flow/prefs/screens login.xsp userInfo.xsp
                        registrationSuccessful.xsp welcome.xsp
  Log:
  make flow samples work with jx template instead of xsp
  
  Revision  Changes    Path
  1.1                  cocoon-2.2/src/webapp/samples/flow/prefs/screens/welcome.xml
  
  Index: welcome.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  
  <!--+
      | CVS: $Id: welcome.xml,v 1.1 2004/02/22 19:34:26 unico Exp $
      | Author: Ovidiu Predescu "ovidiu@apache.org"
      | Date: August 30, 2002
      +-->
  
  <page>
    <resources>
      <resource type="file" href="prefs.js">Flowscript</resource>
    </resources>
    <title>Welcome!</title>
    <content>
      <para>Welcome back,
        <strong>
          ${user.firstName} ${user.lastName}
        </strong>!
      </para>
      <para>| <link href="edit">Edit my preferences</link> | <link href="logout">Logout</link>
|</para>
    </content>
  </page>
  
  
  
  1.1                  cocoon-2.2/src/webapp/samples/flow/prefs/screens/login.xml
  
  Index: login.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  
  <!--+
      | CVS: $Id: login.xml,v 1.1 2004/02/22 19:34:26 unico Exp $
      | Author: Ovidiu Predescu "ovidiu@apache.org"
      | Date: August 30, 2002
      +-->
  
  <page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
    <resources>
      <resource type="file" href="prefs.js">Flowscript</resource>
    </resources>
    <title>Login</title>
    <content>
      <jx:if test="errorMsg">
        <strong>${errorMsg}</strong>
      </jx:if>
      <form action="continue.${continuation.id}">
        <para>
          Login name:
          <input type="text" name="login" value="${login}"/>
        </para>
        <para>Password: <input type="password" name="password"/></para>
        <input type="submit" name="submit" value="Login"/>
        <para>Not yet registered? <link href="register">Register now!</link></para>
      </form>
    </content>
  </page>
  
  
  
  1.1                  cocoon-2.2/src/webapp/samples/flow/prefs/screens/registrationSuccessful.xml
  
  Index: registrationSuccessful.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  
  <!--+
      | CVS: $Id: registrationSuccessful.xml,v 1.1 2004/02/22 19:34:26 unico Exp $
      | Author: Ovidiu Predescu "ovidiu@apache.org"
      | Date: August 30, 2002
      +-->
  
  <page>
    <resources>
      <resource type="file" href="prefs.js">Flowscript</resource>
    </resources>
    <title>Registration successful!</title>
    <content>
      <para>
        Congratulations 
        <strong>${user/firstName} ${user/lastName}</strong>!
        You've successfully registered as a new user.
      </para>
      <para>| <link href="edit">Edit my preferences</link> | <link href="logout">Logout</link>
|</para>
    </content>
  </page>
  
  
  
  1.1                  cocoon-2.2/src/webapp/samples/flow/prefs/screens/userInfo.xml
  
  Index: userInfo.xml
  ===================================================================
  <?xml version="1.0" encoding="iso-8859-1"?>
  
  <!--+
      | CVS: $Id: userInfo.xml,v 1.1 2004/02/22 19:34:26 unico Exp $
      | Author: Ovidiu Predescu "ovidiu@apache.org"
      | Date: August 30, 2002
      |
      | Page to show the user information.
      |
      | This page is used for both user registration and editing the user
      | information, depending on the information passed down in the page.
      +-->
  
  <page xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
    <resources>
      <resource type="file" href="prefs.js">Flowscript</resource>
    </resources>
    <title>${title}></title>
    <content>
      <jx:choose>
        <jx:when test="errorMsg">
          <para><strong>${errorMsg}</strong></para>
        </jx:when>
        <jx:otherwise>
          <para>Please enter the following data</para>
        </jx:otherwise>
      </jx:choose>
       <form method="post" action="continue.${continuation.id}">
        <para>
          <jx:choose>
            <jx:when test="check and firstName = ''">
              <strong>First name cannot be empty</strong>
            </jx:when>
            <jx:otherwise>
              First name:
            </jx:otherwise>
          </jx:choose>
          <input type="text" name="firstName" value="${firstName}"/>
        </para>
        <para>
          <jx:choose>
            <jx:when test="check and lastName = ''">
              <strong>Last name cannot be empty</strong>
            </jx:when>
            <jx:otherwise>
              Last name:
            </jx:otherwise>
          </jx:choose>
          <input type="text" name="lastName" value="${lastName}"/>
        </para>
        <para>
          <jx:choose>
            <jx:when test="check and email = ''">
              <strong>Email address cannot be empty</strong>
            </jx:when>
            <jx:otherwise>
              Email address:
            </jx:otherwise>
          </jx:choose>
          <input type="text" name="email" value="${email}"/>
        </para>
        <para>
          <jx:choose>
            <jx:when test="check and login = ''">
              <strong>Login name cannot be empty</strong>
            </jx:when>
            <jx:otherwise>
              Login name:
            </jx:otherwise>
          </jx:choose>
          <input type="text" name="login" value="${login}"/>
        </para>
        <para>
          <jx:choose>
            <jx:when test="check and password = ''">
              <strong>Password cannot be empty</strong>
            </jx:when>
            <jx:otherwise>
              Password:
            </jx:otherwise>
          </jx:choose>
          <input type="password" name="password" value="${password}"/>
        </para>
        <input type="submit" name="submit" value="${button}"/>
         <jx:if test="cancel">
          <input type="submit" name="cancel" value="Cancel"/>
        </jx:if>
      </form>
    </content>
  </page>
  
  
  
  1.5       +2 -2      cocoon-2.2/src/webapp/samples/flow/prefs/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/flow/prefs/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	14 Jul 2003 09:30:46 -0000	1.4
  +++ sitemap.xmap	22 Feb 2004 19:34:26 -0000	1.5
  @@ -15,7 +15,7 @@
             | Produces the views called by the flowscript
             +-->      
         <map:match pattern="page/*">
  -        <map:generate type="serverpages" src="screens/{1}.xsp"/>
  +        <map:generate type="jx" src="screens/{1}.xml"/>
           <map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
             <map:parameter name="servletPath" value="{request:servletPath}"/>
             <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
  
  
  

Mime
View raw message