cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From step...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/profiler/samples profile2page.xsl sitemap.xmap test2page.xsl page2html.xsl
Date Wed, 07 May 2003 16:50:41 GMT
stephan     2003/05/07 09:50:41

  Modified:    src/blocks/chaperon/samples sitemap.xmap
               src/blocks/chaperon/samples/misc mathexp.xsp wiki.xsp
               src/blocks/chaperon/samples/stylesheets mathexp2html.xsl
               src/blocks/slide/samples description2html4content.xsl
                        description2html4locks.xsl
                        description2html4permissions.xsl
                        description2html4properties.xsl
                        principal2html4users.xsl sitemap.xmap
               src/blocks/profiler/samples profile2page.xsl sitemap.xmap
                        test2page.xsl
  Added:       src/webapp/samples/common/style/xsl/html
                        complex-page2html.xsl
               src/blocks/chaperon/samples/misc patterntext.xml
               src/blocks/chaperon/samples/stylesheets quote2page.xsl
               src/blocks/slide/samples login-failed.xml login.xml
                        logout.xml
  Removed:     src/blocks/chaperon/samples/misc patterntext.xhtml
               src/blocks/chaperon/samples/stylesheets quote2html.xsl
               src/blocks/slide/samples login-failed.xhtml login.xhtml
                        logout.xhtml
               src/blocks/profiler/samples page2html.xsl
  Log:
  Tried to do some corporate design ;-)
  
  Revision  Changes    Path
  1.1                  cocoon-2.1/src/webapp/samples/common/style/xsl/html/complex-page2html.xsl
  
  Index: complex-page2html.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <!--+
      | Covert samples file to the HTML page. Uses styles/main.css stylesheet.
      |
      | Author: Nicola Ken Barozzi "nicolaken@apache.org"
      | Author: Vadim Gritsenko "vgritsenko@apache.org"
      | Author: Christian Haul "haul@apache.org"
      | CVS $Id: complex-page2html.xsl,v 1.1 2003/05/07 16:50:39 stephan Exp $
      +-->
  
  <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink">
  
    <xsl:param name="contextPath" select="string('/cocoon')"/>
  
   <xsl:template match="/">
    <html>
     <head>
       <title>Apache Cocoon @version@</title>
       <link rel="SHORTCUT ICON" href="favicon.ico"/>
       <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
       <xsl:apply-templates select="document/header/style"/>
       <xsl:apply-templates select="document/header/script"/>
     </head>
     <body>
      <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
        <tr>
          <td width="*">The Apache Software Foundation is proud to present...</td>
          <td width="40%" align="center"><img border="0" src="{$contextPath}/images/cocoon.gif"/></td>
          <td width="30%" align="center">Version: <b>@version@</b></td>
        </tr>
      </table>
  
      <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
        <tr>
          <td width="50%">
            <h2><xsl:value-of select="document/header/title"/></h2>
          </td>
          <td width="25%">
            <xsl:apply-templates select="document/header/tab"/>
          </td>
          <td nowrap="nowrap" align="right">
            Orthogonal views:
            <a href="?cocoon-view=content">Content</a>
            &#160;
            <a href="?cocoon-view=pretty-content">Pretty content</a>
            &#160;
            <a href="?cocoon-view=links">Links</a>
          </td>
        </tr>
      </table>
  
      <p>
       <xsl:choose>
        <xsl:when test="document/body/row">
         <table width="100%">
          <xsl:apply-templates select="document/body/*"/>
         </table>
        </xsl:when>
        <xsl:otherwise>
         <xsl:apply-templates select="document/body/*"/>
        </xsl:otherwise>
       </xsl:choose>
      </p>
  
      <p class="copyright">
        Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
        All rights reserved.
      </p>
     </body>
    </html>
   </xsl:template>
  
   <xsl:template match="style">
    <link type="text/css" rel="stylesheet" href="{@href}"/>
   </xsl:template>
   
   <xsl:template match="script">
    <script type="text/javascript" src="{@href}"/>
   </xsl:template>
   
   <xsl:template match="tab">
    <a href="{@href}"><i><xsl:value-of select="@title"/></i></a>&#160;
   </xsl:template>
   
   <xsl:template match="row">
    <tr>
     <xsl:apply-templates select="column"/>
    </tr>
   </xsl:template>
   
   <xsl:template match="column">
    <td valign="top">
     <h4 class="samplesGroup"><xsl:value-of select="@title"/></h4>
     <p class="samplesText"><xsl:apply-templates/></p>
    </td> 
   </xsl:template>
  
   <xsl:template match="section">
    <xsl:choose> <!-- stupid test for the hirachy deep -->
     <xsl:when test="../../../section">
      <h5><xsl:value-of select="title"/></h5>
     </xsl:when>
     <xsl:when test="../../section">
      <h4><xsl:value-of select="title"/></h4>
     </xsl:when>
     <xsl:when test="../section">
      <h4 class="samplesGroup"><xsl:value-of select="title"/></h4>
     </xsl:when>
    </xsl:choose>
    <p>
     <xsl:apply-templates select="*[name()!='title']"/>
    </p>
   </xsl:template>
  
   <xsl:template match="source">
    <div style="background: #b9d3ee; border: thin; border-color: black; border-style: solid; padding-left: 0.8em; 
                padding-right: 0.8em; padding-top: 0px; padding-bottom: 0px; margin: 0.5ex 0px; clear: both;">
    <pre>
     <xsl:value-of select="."/>
    </pre>
    </div>
   </xsl:template>
   
   <xsl:template match="link">
    <xsl:text> </xsl:text>
    <a href="{@href}">
     <xsl:apply-templates/>
    </a>
    <xsl:text> </xsl:text>
   </xsl:template>
   
   <xsl:template match="strong">
    <xsl:text> </xsl:text>
    <b>
     <xsl:apply-templates/>
    </b>
    <xsl:text> </xsl:text>
   </xsl:template>
   
   <xsl:template match="anchor">
    <a name="{@name}">
     <xsl:apply-templates/>
    </a>
   </xsl:template>
   
  <!-- <xsl:template match="table">
    <table border="1" cellspacing="3" cellpadding="3">
     <xsl:apply-templates/>
    </table>
   </xsl:template> -->
  
   <xsl:template match="*|@*|node()|text()" priority="-1">
    <xsl:copy><xsl:apply-templates select="*|@*|node()|text()"/></xsl:copy>
   </xsl:template>
  
  </xsl:stylesheet>
  
  
  
  1.13      +18 -5     cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/sitemap.xmap,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- sitemap.xmap	5 May 2003 09:09:40 -0000	1.12
  +++ sitemap.xmap	7 May 2003 16:50:40 -0000	1.13
  @@ -114,7 +114,7 @@
      <map:match pattern="welcome">
       <map:generate                src="misc/samples.xml"/>
       <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
  -       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
       </map:transform>
       <map:serialize/>
      </map:match>
  @@ -127,6 +127,9 @@
       <map:transform type="lexer"   src="grammars/mathexp.xlex"/>
       <map:transform type="parser"  src="grammars/mathexp.xgrm"/>
       <map:transform                src="stylesheets/mathexp2html.xsl"/>
  +    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  @@ -135,7 +138,9 @@
       <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
       <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
       <map:transform                src="stylesheets/wiki2xdoc.xsl"/>
  -    <map:transform                src="stylesheets/xdoc2html.xsl"/>
  +    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  @@ -144,7 +149,9 @@
       <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
       <map:transform type="parser"  src="cocoon:/wiki.xgrm"         label="ast"/>
       <map:transform                src="stylesheets/wiki2xdoc.xsl" label="xdoc"/>
  -    <map:transform                src="stylesheets/xdoc2html.xsl"/>
  +    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  @@ -152,14 +159,20 @@
       <map:generate  type="text"    src="misc/quote.txt"/>
       <map:transform type="lexer"   src="grammars/quote.xlex"/>
       <map:transform type="parser"  src="grammars/quote.xgrm" label="ast"/>
  -    <map:transform                src="stylesheets/quote2html.xsl"/>
  +    <map:transform                src="stylesheets/quote2page.xsl"/>
  +    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
      <map:match pattern="pattern.html">
  -    <map:generate                 src="misc/patterntext.xhtml"/>
  +    <map:generate                 src="misc/patterntext.xml"/>
       <map:transform type="pattern" src="grammars/link.xlex"/>
       <map:transform                src="stylesheets/pattern2link.xsl"/>
  +    <map:transform                src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  
  
  
  1.2       +31 -30    cocoon-2.1/src/blocks/chaperon/samples/misc/mathexp.xsp
  
  Index: mathexp.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/misc/mathexp.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mathexp.xsp	9 Mar 2003 00:02:56 -0000	1.1
  +++ mathexp.xsp	7 May 2003 16:50:40 -0000	1.2
  @@ -4,34 +4,35 @@
             xmlns:xsp="http://apache.org/xsp"
             xmlns:xsp-request="http://apache.org/xsp/request/2.0">
   
  -<html>
  - <head>
  -  <title>Mathexp Example</title>
  - </head>
  - <body>
  -
  -  <h1>Mathexp Example</h1>
  -
  -  <p>
  -   <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0"><xsp-request:get-parameter name="text" 
  -    default="3*a-5*6/7 + ( b-c)*5- b"/></text>
  -  </p>
  -
  -  <p>
  -   <form action="mathexp.html" method="post">
  -
  -    <xsp:element name="input">
  -     <xsp:attribute name="name">text</xsp:attribute>
  -     <xsp:attribute name="type">text</xsp:attribute>
  -     <xsp:attribute name="size">80</xsp:attribute>
  -     <xsp:attribute name="maxlength">110</xsp:attribute>
  -     <xsp:attribute name="value"><xsp-request:get-parameter name="text" 
  -       default="3*a-5*6/7 + ( b-c)*5- b"/></xsp:attribute>
  -    </xsp:element>
  -   </form>
  -  </p>
  -
  - </body>
  -</html>
  -
  + <document>
  +  <header>
  +   <title>Chaperon examples</title>
  +   <tab title="back" href="."/>
  +  </header>
  +  <body>
  +   <row>
  +    <column title="Mathematical expression">
  +
  +     <p>
  +      <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0"><xsp-request:get-parameter name="text" 
  +            default="3*a-5*6/7 + ( b-c)*5- b"/></text>
  +     </p>
  +
  +     <p>
  +      <form action="mathexp.html" method="post">
  +
  +       <xsp:element name="input">
  +        <xsp:attribute name="name">text</xsp:attribute>
  +        <xsp:attribute name="type">text</xsp:attribute>
  +        <xsp:attribute name="size">80</xsp:attribute>
  +        <xsp:attribute name="maxlength">110</xsp:attribute>
  +        <xsp:attribute name="value"><xsp-request:get-parameter name="text" 
  +                       default="3*a-5*6/7 + ( b-c)*5- b"/></xsp:attribute>
  +       </xsp:element>
  +      </form>
  +     </p>
  +    </column>
  +   </row>
  +  </body>
  + </document>
   </xsp:page>
  
  
  
  1.2       +23 -248   cocoon-2.1/src/blocks/chaperon/samples/misc/wiki.xsp
  
  Index: wiki.xsp
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/misc/wiki.xsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- wiki.xsp	9 Mar 2003 00:02:57 -0000	1.1
  +++ wiki.xsp	7 May 2003 16:50:40 -0000	1.2
  @@ -4,245 +4,25 @@
             xmlns:xsp="http://apache.org/xsp"
             xmlns:xsp-request="http://apache.org/xsp/request/2.0">
   
  -<html>
  - <head>
  -  <title>Wiki example</title>
  -  <style>
  - .title
  -      {
  -        text-align: center;
  -        font-size: 18px;
  -        font-weight: bold;
  -        font-family: sans-serif,Arial,Tahoma;
  -        color: black;
  -        background: white;
  -        border-color: black;
  -        border-width: 10px;
  -      }
  -      
  -      .main
  -      {
  -        border: 1px solid #0086B2;
  -        padding: 0px;
  -        margin: 6px;
  -        min-width: 630px;
  -      }
  -      
  -      .head
  -      {
  -        border-bottom: #0086B2;
  -        border-width: 0 0 1px 0;
  -        border-style: none none solid none;
  -        padding: 6px 6px 3px 6px;
  -      }
  -      
  -      .block { padding: 6px; }
  -      
  -      .confirm
  -      {
  -        width: 40%;
  -        margin-left: 50%;
  -        padding: 6px;
  -      }
  -      
  -      .content
  -      {
  -        border: 1px solid #0086B2; 
  -        padding: 6px;
  -        margin: 1px;
  -      }
  - 
  -      tr 
  -      {
  -        padding: 2px 6px 2px 6px;
  -      }
  -           
  -    
  -      .col1
  -      {
  -        font-weight: bold;
  -      }
  -
  -       .error .col1
  -      {
  -        padding: 2px 20px 2px 6px;
  -      }
  -
  -       .error .col2
  -      {
  -        color:#BB0000;
  -        padding: 2px 20px 2px 6px;
  -      }
  -     
  -      .field { }
  -      
  -      .notify
  -      {
  -        font-size: 15px;
  -        text-align: left;
  -      }
  -      
  -      .tools { text-align: right; }
  -      .tool { padding: 6px; }
  -      
  -      .notes
  -      {
  -        font-size: 12px;
  -        font-weight: bold;
  -        color: white;
  -        background: #0086B2;
  -        text-align: left;
  -        padding: 6px 6px 3px 6px;
  -      }
  -      
  -      .foot
  -      {
  -        text-align: center;
  -        font-size: 12px;
  -        margin-top: 50px;
  -      }
  -      
  -      .hspace { margin: 30px; }
  -      #left { float: left; }
  -      #right { float: right; }
  -      #center { text-align: center; }
  -      #row { background: #EEFFFF; }
  -      
  -      .failure
  -      {
  -        font-weight: bold;
  -        color: #BB0000;
  -      }
  -      
  -      .warning
  -      {
  -        font-weight: bold;
  -        color: #BB0000;
  -      }
  -      
  -      .success
  -      {
  -        font-weight: bold;
  -        color: green;
  -      }
  -      
  -      .tab
  -      {
  -        font-size: 12px;
  -        font-weight: bold;
  -        color: white;
  -        background: #0086B2;
  -        padding: 4px 4px 2px 4px;
  -        border: 0px solid #0086B2;
  -        margin: 1px;
  -      }
  -      
  -      .tab a
  -      {
  -        text-decoration: none;
  -        color: white;
  -      }
  -      
  -      .tab a:visited
  -      {
  -        text-decoration: none;
  -        color: white;
  -      }
  -      
  -      .tab a:link
  -      {
  -        text-decoration: none;
  -        color: white;
  -      }
  -      
  -      .tab a:hover
  -      {
  -        text-decoration: underline;
  -        color: red;
  -      }
  -      
  -      a { text-decoration: none; }
  -      
  -      a:hover
  -      {
  -        text-decoration: underline;
  -        color: red;
  -      }
  -      
  -      body
  -      {
  -        font-size: 12px;
  -        font-family: sans-serif,Arial,Tahoma;
  -        color: black;
  -        background: white;
  -      }
  -      
  -      form { font-size: 12px; }
  -      
  -      textarea
  -      {
  -        background-color: #EEFFFF;
  -        font-size: 12px;
  -        font-family: geneva,arial,sans-serif;
  -        border-color: #0086B2;
  -        border-width: 1px;
  -        padding-left: 2px;
  -      }
  -      
  -      textarea.hidden { display: none; }
  -      
  -      input
  -      {
  -        background-color: #EEFFFF;
  -        font-size: 12px;
  -        font-family: geneva,arial,sans-serif;
  -        border-color: #0086B2;
  -        border-width: 1px;
  -        padding-left: 2px;
  -      }
  -      
  -      input.submit
  -      {
  -        background-color: #0086B2;
  -        font-size: 12px;
  -        font-family: geneva,arial,sans-serif;
  -        border-color: black;
  -        border-width: 1px;
  -        padding: 2px 6px;
  -        font-weight: bold;
  -        color: white;
  -      }
  -      
  -      input.button
  -      {
  -        background-color: #BB0000;
  -        font-size: 12px;
  -        font-family: geneva,arial,sans-serif;
  -        border-color: black;
  -        border-width: 1px;
  -        padding: 2px 6px;
  -        font-weight: bold;
  -        color: white;
  -      }
  - </style>
  - </head>
  - <body>
  -
  -  <div class="title">Wiki example</div>
  -
  -  <p>
  -   <div class="block"><span class="tab">Preview</span><div class="content">
  - <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0"><xsp-request:get-parameter name="text" default="No text"/></text>
  -   </div></div>
  -  </p>
  + <document>
  +  <header>
  +   <title>Chaperon examples</title>
  +   <tab title="back" href="."/>
  +  </header>
  +  <body>
  +   <row>
  +    <column title="Wiki preview">
  +
  +     <text xmlns="http://chaperon.sourceforge.net/schema/text/1.0"><xsp-request:get-parameter name="text" default="No text"/></text>
  +
  +    </column>
  +   </row>
  +   <row>
  +    <column title="Wiki content">
   
  -  <p>
  +     <form action="wiki.html" method="post">
   
  -   <form action="wiki.html" method="post">
  -
  -   <div class="block"><span class="tab">Content</span><div class="field">
  -
  -   <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%"><![CDATA[When you've figured out how the editor works, then you should read [WikiEtiquette] so that you would know how to use
  +      <textarea name="text" type="textarea" cols="100" rows="23" style="width: 100%"><![CDATA[When you've figured out how the editor works, then you should read [WikiEtiquette] so that you would know how to use
   your newly acquired skills...
   
   !Quick reference
  @@ -465,16 +245,11 @@
   [#1] Here's the footnote I mentioned.
   
   [The other footnote|#2] The other footnote.  Note how it's name is different?]]></textarea><br/>
  -   </div></div>
  -
  -   <div style="text-align:right" class="block">
  -   <input value="Preview" type="submit" class="submit"/>
  -   </div>
  -
  -   </form>
  -  </p>
  -
  - </body>
  -</html>
  +      <input value="Preview" type="submit" class="submit"/>
   
  +     </form>
  +    </column>
  +   </row>
  +  </body>
  + </document>
   </xsp:page>
  
  
  
  1.1                  cocoon-2.1/src/blocks/chaperon/samples/misc/patterntext.xml
  
  Index: patterntext.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
   <header>
    <title>Chaperon examples</title>
    <tab title="back" href="."/>
   </header>
   <body>
    <section>
     <title>Pattern test</title>
  
     <p>Some links for the Apache project(http://xml.apache.org/):</p>
     <ul>
      <li>Here the link for Cocoon http://cocoon.apache.org/</li>
      <li>And the link for Avalon http://jakarta.apache.org/avalon/</li>
     </ul>
     <p>This example was made by Stephan Michels(stephan@apache.org).</p>
    </section>
   </body>
  </document>
  
  
  
  1.2       +0 -1      cocoon-2.1/src/blocks/chaperon/samples/stylesheets/mathexp2html.xsl
  
  Index: mathexp2html.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/chaperon/samples/stylesheets/mathexp2html.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mathexp2html.xsl	9 Mar 2003 00:02:59 -0000	1.1
  +++ mathexp2html.xsl	7 May 2003 16:50:40 -0000	1.2
  @@ -3,7 +3,6 @@
                   xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/1.0"
                   version="1.0">
   
  -
    <xsl:template match="st:E">
     <table bgcolor="#a0ffff" cellspacing="1">
      <tr>
  
  
  
  1.1                  cocoon-2.1/src/blocks/chaperon/samples/stylesheets/quote2page.xsl
  
  Index: quote2page.xsl
  ===================================================================
  <?xml version="1.0"?>
  <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
    xmlns:st="http://chaperon.sourceforge.net/schema/syntaxtree/1.0"
    exclude-result-prefixes="st">
  
   <xsl:template match="st:document">
    <document>
     <header>
      <title>Chaperon examples</title>
      <tab title="back" href="."/>
     </header>
     <body>
      <section>
       <title>Stock quote</title>
  
       <p>
        The Comma-Separated Values (CSV) file is three months of end-of-day
        data for one particular stock symbol (data such as that obtained from
        <a href="http://finance.yahoo.com/">Yahoo Finance</a>).
        Here are the first five lines of input ...
       </p>
       <pre>
  --------------------------------------------
  20021101,0.11,0.11,0.11,0.11,74000
  20021104,0.11,0.11,0.1,0.105,1166900
  20021105,0.1,0.105,0.1,0.105,759670
  20021106,0.1,0.105,0.1,0.105,101000
  20021107,0.105,0.105,0.097,0.097,808230
  ...
  --------------------------------------------
       </pre>
       <p>
        After processing with the Lexer Transformer and the Parser Transformer,
        here is the result ...
       </p>
       <table cellpadding="3" border="1">
        <tr>
         <th>Date</th>
         <th>Open</th>
         <th>High</th>
         <th>Low</th>
         <th>Close</th>
         <th>Volume</th>
        </tr>
        <xsl:apply-templates/>
       </table>
      </section>
     </body>
    </document>
   </xsl:template>
  
   <xsl:template match="st:row">
    <tr>
     <xsl:apply-templates select="st:Value"/>
    </tr>
   </xsl:template>
  
   <xsl:template match="st:Comma | st:SoftBreak">
   </xsl:template>
  
   <xsl:template match="st:Value">
    <td><xsl:value-of select="."/></td>
   </xsl:template>
  
   <xsl:template match="@*|*|text()|processing-instruction()" priority="-1">
    <xsl:copy>
     <xsl:apply-templates select="@*|*|text()|processing-instruction()"/>
    </xsl:copy>
   </xsl:template>
  
  </xsl:stylesheet>
  
  
  
  1.3       +121 -217  cocoon-2.1/src/blocks/slide/samples/description2html4content.xsl
  
  Index: description2html4content.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4content.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- description2html4content.xsl	6 May 2003 11:38:10 -0000	1.2
  +++ description2html4content.xsl	7 May 2003 16:50:40 -0000	1.3
  @@ -1,242 +1,146 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet version="1.0"
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  -                xmlns:source="http://xml.apache.org/cocoon/source/2.0"
  -                xmlns:dav="DAV:"
  -                xmlns:xi="http://www.w3.org/2001/XInclude">
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:source="http://xml.apache.org/cocoon/source/2.0" xmlns:dav="DAV:" xmlns:xi="http://www.w3.org/2001/XInclude" version="1.0">
   
  - <xsl:output indent="yes"/>
  +  <xsl:output indent="yes"/>
   
  - <xsl:param name="cocoon-source-principal">guest</xsl:param> 
  +  <xsl:param name="cocoon-source-principal">guest</xsl:param>
   
  - <xsl:template match="/">
  -  <html>
  -   <head>
  -    <title>Apache Cocoon @version@</title>
  -    <link rel="SHORTCUT ICON" href="favicon.ico"/>
  -   </head>
  -   <body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
  -    <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -     <tr>
  -      <td width="*"><font face="arial,helvetica,sanserif" color="#000000">The Apache Software Foundation is proud to present...</font></td>
  -      <td width="40%" align="center"><img border="0" src="/cocoon/samples/images/cocoon.gif"/></td>
  -      <td width="30%" align="center"><font face="arial,helvetica,sanserif" color="#000000"><b>version @version@</b></font></td>
  -     </tr>
  -     <tr>
  -       <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -         <tr>
  -            <td width="90%" align="left" bgcolor="#0086b2"><font size="+1" face="arial,helvetica,sanserif"
  -    color="#ffffff"><xsl:value-of select="source:source/@uri"/></font></td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/users/">
  -             <i>users</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}">
  -             <i>content</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}">
  -             <i>properties</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}">
  -             <i>permissions</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}">
  -             <i>locks</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/logout.html">
  -             <i>logout</i></a>
  +  <xsl:template match="/">
  +    <document>
  +      <header>
  +        <title>Jakarta Slide example</title>
  +        <tab title="users" href="/cocoon/samples/slide/users/"/>
  +        <tab title="content" href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="properties" href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="permissions" href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="locks" href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="logout" href="/cocoon/samples/slide/logout.html"/>
  +      </header>
  +      <body>
  +        <row>
  +          <xsl:apply-templates select="source:source"/>
  +        </row>
  +      </body>
  +    </document>
  +  </xsl:template>
  +
  +  <xsl:template match="source:source">
  +    <column title="Navigation">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <xsl:if test="@parent">
  +          <tr>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <a href="/cocoon/samples/slide/content/{substring-after(@parent,'://')}">Back</a>
               </td>
             </tr>
  -       </table>
  -     </tr>
  -    </table>
  -
  -    <xsl:apply-templates select="source:source"/>
  -
  -    <p align="center">
  -     <font size="-1">
  -      Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.<br/>
  -      All rights reserved.
  -     </font>
  -    </p>
  -   </body>
  -  </html>
  - </xsl:template>
  -
  - <xsl:template match="source:source">
  -
  -  <table width="100%">
  -   <tr>
  -    <td width="200" valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  +        </xsl:if>
  +        <tr>
  +          <td width="100%" bgcolor="#ffffff" align="left">
  +            <br/>
  +          </td>
  +        </tr>
  +        <xsl:for-each select="source:children/source:source">
             <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Navigation</font>
  -           </td>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +                <a href="/cocoon/samples/slide/content/{substring-after(@uri,'://')}">
  +                  <xsl:value-of select="@name"/>
  +                </a>
  +              </font>
  +            </td>
             </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <xsl:if test="@parent">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <a href="/cocoon/samples/slide/content/{substring-after(@parent,'://')}">Back</a>
  -               </td>
  -              </tr>
  -             </xsl:if>
  -             <tr>
  -              <td width="100%" bgcolor="#ffffff" align="left">
  -               <br/>
  -              </td>
  -             </tr>
  -             <xsl:for-each select="source:children/source:source">
  +        </xsl:for-each>
  +      </table>
  +    </column>
  +    <column title="Content">
  +      <xsl:choose>
  +        <xsl:when test="@collection='true'">
  +          <table width="100%" cellspacing="0" cellpadding="5" align="center">
  +            <font size="+0" face="arial,helvetica,sanserif" color="#000000">
                 <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -                 <a href="/cocoon/samples/slide/content/{substring-after(@uri,'://')}"
  -                  ><xsl:value-of select="@name"/></a>
  -                </font>
  -               </td>
  +                <td align="left">
  +                  <b>Filename</b>
  +                </td>
  +                <td align="left">
  +                  <b>Type</b>
  +                </td>
  +                <td align="left">
  +                  <b>Size</b>
  +                </td>
  +                <td align="left">
  +                  <b>Last Modified</b>
  +                </td>
  +                <td align="right"/>
                 </tr>
  -             </xsl:for-each>
  -            </table>
  -           </td>
  -          </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -
  -    <td valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -          <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Content</font>
  -           </td>
  -          </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -
  -            <xsl:choose>
  -             <xsl:when test="@collection='true'">
  -
  -              <table width="100%" cellspacing="0" cellpadding="5" align="center">
  -               <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +              <xsl:for-each select="source:children/source:source">
                   <tr>
  -                 <td align="left"><b>Filename</b></td>
  -                 <td align="left"><b>Type</b></td>
  -                 <td align="left"><b>Size</b></td>
  -                 <td align="left"><b>Last Modified</b></td>
  -                 <td align="right"></td>
  -                </tr>
  -
  -                <xsl:for-each select="source:children/source:source">
  -                 <tr>
  -                  <td align="left">&#160;&#160;
  -                   <a href="/cocoon/samples/slide/content/{substring-after(@uri,'://')}"
  -                    ><xsl:value-of select="@name"/></a>
  -                  </td>
  -                  <td align="left"><xsl:value-of
  -                    select="@mime-type"/></td>
  -                  <td align="left"><xsl:value-of
  -                    select="@contentlength"/></td>
  -                  <td align="left"><xsl:value-of
  -                    select="source:properties/dav:getlastmodified"/></td>
  -                  <td align="right">
  -                   <form action="" method="post">
  -                    <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  -                    <input type="submit" name="doDeleteSource" value="Delete"/>
  -                   </form>
  -                  </td>
  -                 </tr>
  -                </xsl:for-each>
  -    
  -                <tr>
  -                 <form action="" method="post" enctype="multipart/form-data">
  -                  <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +                  <td align="left">&#xA0;&#xA0;
  +                   <a href="/cocoon/samples/slide/content/{substring-after(@uri,'://')}"><xsl:value-of select="@name"/></a>
  +                  </td>
  +                  <td align="left">
  +                    <xsl:value-of select="@mime-type"/>
  +                  </td>
                     <td align="left">
  -                   <input type="text" name="cocoon-source-name" size="15" maxlength="40"/>(optional)
  +                    <xsl:value-of select="@contentlength"/>
  +                  </td>
  +                  <td align="left">
  +                    <xsl:value-of select="source:properties/dav:getlastmodified"/>
  +                  </td>
  +                  <td align="right">
  +                    <form action="" method="post">
  +                      <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +                      <input type="submit" name="doDeleteSource" value="Delete"/>
  +                    </form>
                     </td>
  +                </tr>
  +              </xsl:for-each>
  +              <tr>
  +                <form action="" method="post" enctype="multipart/form-data">
  +                  <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +                  <td align="left"><input type="text" name="cocoon-source-name" size="15" maxlength="40"/>(optional)</td>
                     <td align="left" colspan="3">
                      File:
                      <input type="file" name="cocoon-upload-file" size="15" maxlength="40"/>
                     </td>
                     <td align="right">
  -                   <input type="submit" name="doUploadSource" value="Upload File" />
  +                    <input type="submit" name="doUploadSource" value="Upload File"/>
                     </td>
  -                 </form>
  -                </tr>
  -
  -                <tr>
  -                 <form action="" method="post">
  +                </form>
  +              </tr>
  +              <tr>
  +                <form action="" method="post">
                     <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
                     <td align="left" colspan="4">
  -                   <input type="text" name="cocoon-source-name" size="15" maxlength="40"/>
  +                    <input type="text" name="cocoon-source-name" size="15" maxlength="40"/>
                     </td>
                     <td align="right">
  -                   <input type="submit" name="doCreateCollection" value="Create collection" />
  +                    <input type="submit" name="doCreateCollection" value="Create collection"/>
                     </td>
  -                 </form>
  -                </tr>
  -               </font>
  -              </table>
  -             </xsl:when>
  -
  -             <xsl:when test="@mime-type='image/gif'">
  -              <img src="/cocoon/samples/slide/view/{substring-after(@uri,'://')}"/>
  -             </xsl:when>
  -
  -             <xsl:when test="@mime-type='image/jpeg'">
  -              <img src="/cocoon/samples/slide/view/{substring-after(@uri,'://')}"/>
  -             </xsl:when>
  -
  -             <xsl:when test="@mime-type='text/plain'">
  -              <pre>
  -               <xi:include href="{@uri}?cocoon-source-principal={$cocoon-source-principal}" parse="text"/>
  -              </pre>
  -             </xsl:when>
  -
  -             <xsl:when test="@mime-type='text/xml'">
  -              <pre>
  -               <xi:include href="{@uri}?cocoon-source-principal={$cocoon-source-principal}" parse="text"/>
  -              </pre>
  -             </xsl:when>
  -
  -             <xsl:otherwise>
  -              <h3>Could not display content.</h3>
  -             </xsl:otherwise>
  -            </xsl:choose>
  -  
  -           </td>
  -          </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -   </tr>
  -  </table>
  -
  - </xsl:template>
  -
  +                </form>
  +              </tr>
  +            </font>
  +          </table>
  +        </xsl:when>
  +        <xsl:when test="@mime-type='image/gif'">
  +          <img src="/cocoon/samples/slide/view/{substring-after(@uri,'://')}"/>
  +        </xsl:when>
  +        <xsl:when test="@mime-type='image/jpeg'">
  +          <img src="/cocoon/samples/slide/view/{substring-after(@uri,'://')}"/>
  +        </xsl:when>
  +        <xsl:when test="@mime-type='text/plain'">
  +          <pre>
  +            <xi:include href="{@uri}?cocoon-source-principal={$cocoon-source-principal}" parse="text"/>
  +          </pre>
  +        </xsl:when>
  +        <xsl:when test="@mime-type='text/xml'">
  +          <pre>
  +            <xi:include href="{@uri}?cocoon-source-principal={$cocoon-source-principal}" parse="text"/>
  +          </pre>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <h3>Could not display content.</h3>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </column>
  +  </xsl:template>
   </xsl:stylesheet>
  
  
  
  1.3       +116 -190  cocoon-2.1/src/blocks/slide/samples/description2html4locks.xsl
  
  Index: description2html4locks.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4locks.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- description2html4locks.xsl	6 May 2003 11:38:10 -0000	1.2
  +++ description2html4locks.xsl	7 May 2003 16:50:40 -0000	1.3
  @@ -1,208 +1,134 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet version="1.0"
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  -                xmlns:source="http://xml.apache.org/cocoon/source/2.0"
  -                xmlns:dav="DAV:">
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:source="http://xml.apache.org/cocoon/source/2.0" xmlns:dav="DAV:" version="1.0">
   
  - <xsl:output indent="yes"/>
  +  <xsl:output indent="yes"/>
   
  - <xsl:template match="/">
  -  <html>
  -   <head>
  -    <title>Apache Cocoon @version@</title>
  -    <link rel="SHORTCUT ICON" href="favicon.ico"/>
  -   </head>
  -   <body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
  -    <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -     <tr>
  -      <td width="*"><font face="arial,helvetica,sanserif" color="#000000">The Apache Software Foundation is proud to present...</font></td>
  -      <td width="40%" align="center"><img border="0" src="/cocoon/samples/images/cocoon.gif"/></td>
  -      <td width="30%" align="center"><font face="arial,helvetica,sanserif" color="#000000"><b>version @version@</b></font></td>
  -     </tr>
  -     <tr>
  -       <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -         <tr>
  -            <td width="90%" align="left" bgcolor="#0086b2"><font size="+1" face="arial,helvetica,sanserif"
  -    color="#ffffff"><xsl:value-of select="source:source/@uri"/></font></td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/users/">
  -             <i>users</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}">
  -             <i>content</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}">
  -             <i>properties</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}">
  -             <i>permissions</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}">
  -             <i>locks</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/logout.html">
  -             <i>logout</i></a>
  -            </td>
  -         </tr>
  -       </table>
  -     </tr>
  -    </table>
  -
  -    <xsl:apply-templates select="source:source"/>
  -
  -    <p align="center">
  -     <font size="-1">
  -      Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.<br/>
  -      All rights reserved.
  -     </font>
  -    </p>
  -   </body>
  -  </html>
  - </xsl:template>
  -
  - <xsl:template match="source:source">
  -
  -  <table width="100%">
  -   <tr>
  -    <td width="200" valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  +  <xsl:template match="/">
  +    <document>
  +      <header>
  +        <title>Jakarta Slide example</title>
  +        <tab title="users" href="/cocoon/samples/slide/users/"/>
  +        <tab title="content" href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="properties" href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="permissions" href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="locks" href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="logout" href="/cocoon/samples/slide/logout.html"/>
  +      </header>
  +      <body>
  +        <row>
  +          <xsl:apply-templates select="source:source"/>
  +        </row>
  +      </body>
  +    </document>
  +  </xsl:template>
  +
  +  <xsl:template match="source:source">
  +    <column title="Navigation">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <xsl:if test="@parent">
             <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Navigation</font>
  -           </td>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <a href="/cocoon/samples/slide/permissions/{substring-after(@parent,'://')}">Back</a>
  +            </td>
             </tr>
  +        </xsl:if>
  +        <tr>
  +          <td width="100%" bgcolor="#ffffff" align="left">
  +            <br/>
  +          </td>
  +        </tr>
  +        <xsl:for-each select="source:children/source:source">
             <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <xsl:if test="@parent">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <a href="/cocoon/samples/slide/locks/{substring-after(@parent,'://')}">Back</a>
  -               </td>
  -              </tr>
  -             </xsl:if>
  -             <tr>
  -              <td width="100%" bgcolor="#ffffff" align="left">
  -               <br/>
  -              </td>
  -             </tr>
  -             <xsl:for-each select="source:children/source:source">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -                 <a href="/cocoon/samples/slide/locks/{substring-after(@uri,'://')}"
  -                  ><xsl:value-of select="@name"/></a>
  -                </font>
  -               </td>
  -              </tr>
  -             </xsl:for-each>
  -            </table>
  -           </td>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +                <a href="/cocoon/samples/slide/locks/{substring-after(@uri,'://')}">
  +                  <xsl:value-of select="@name"/>
  +                </a>
  +              </font>
  +            </td>
             </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -
  -    <td valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  +        </xsl:for-each>
  +      </table>
  +    </column>
  +
  +    <column title="Locks">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <font size="+0" face="arial,helvetica,sanserif" color="#000000">
             <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Locks</font>
  -           </td>
  +            <td align="left">
  +              <b>Subject</b>
  +            </td>
  +            <td align="left">
  +              <b>Type</b>
  +            </td>
  +            <td align="left">
  +              <b>Expiration</b>
  +            </td>
  +            <td align="left">
  +              <b>Inheritable</b>
  +            </td>
  +            <td align="left">
  +              <b>Exclusive</b>
  +            </td>
  +            <td align="right"/>
             </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -              <tr>
  -               <td align="left"><b>Subject</b></td>
  -               <td align="left"><b>Type</b></td>
  -               <td align="left"><b>Expiration</b></td>
  -               <td align="left"><b>Inheritable</b></td>
  -               <td align="left"><b>Exclusive</b></td>
  -               <td align="right"></td>
  -              </tr>
  -
  -              <xsl:for-each select="source:locks/source:lock">
  -               <tr bgcolor="#eeeeee">
  -                <td align="left"><xsl:value-of select="@subject"/></td>
  -                <td align="left"><xsl:value-of select="@type"/></td>
  -                <td align="left"><xsl:value-of select="@expiration"/></td>
  -                <td align="left"><xsl:value-of select="@inheritable"/></td>
  -                <td align="left"><xsl:value-of select="@exclusive"/></td>
  -                <td align="right">
  -                 <form action="" method="post">
  +          <xsl:for-each select="source:locks/source:lock">
  +            <tr bgcolor="#eeeeee">
  +              <td align="left">
  +                <xsl:value-of select="@subject"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="@type"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="@expiration"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="@inheritable"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="@exclusive"/>
  +              </td>
  +              <td align="right">
  +                <form action="" method="post">
                     <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
                     <input type="hidden" name="cocoon-lock-subject" value="{@subject}"/>
  -
                     <input type="submit" name="doDeleteLock" value="Delete"/>
  -                 </form>
  -                </td>
  -               </tr>
  -              </xsl:for-each>
  -
  -              <tr>
  -               <form action="" method="post">
  -                <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  -                <td align="left">
  -                 <input name="cocoon-lock-subject" type="text" size="20" maxlength="40"/>
  -                </td>
  -                <td align="left">
  -                 <input name="cocoon-lock-type" type="text" size="15" maxlength="40"/>
  -                </td>
  -                <td align="left">
  -                 <input name="cocoon-lock-expiration" type="text" size="15" maxlength="40"/>
  -                </td>
  -                <td align="left">
  -                 <select name="cocoon-lock-inheritable">
  +                </form>
  +              </td>
  +            </tr>
  +          </xsl:for-each>
  +          <tr>
  +            <form action="" method="post">
  +              <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +              <td align="left">
  +                <input name="cocoon-lock-subject" type="text" size="20" maxlength="40"/>
  +              </td>
  +              <td align="left">
  +                <input name="cocoon-lock-type" type="text" size="15" maxlength="40"/>
  +              </td>
  +              <td align="left">
  +                <input name="cocoon-lock-expiration" type="text" size="15" maxlength="40"/>
  +              </td>
  +              <td align="left">
  +                <select name="cocoon-lock-inheritable">
                     <option>true</option>
                     <option>false</option>
  -                 </select>
  -                </td>
  -                <td align="left">
  -                 <select name="cocoon-lock-exclusive">
  +                </select>
  +              </td>
  +              <td align="left">
  +                <select name="cocoon-lock-exclusive">
                     <option>true</option>
                     <option>false</option>
  -                 </select>
  -                </td>
  -                <td align="right">
  -                 <input type="submit" name="doAddLock" value="Add/Modify"/>
  -                </td>
  -               </form>
  -              </tr>
  -             </font>
  -            </table>
  -           </td>
  +                </select>
  +              </td>
  +              <td align="right">
  +                <input type="submit" name="doAddLock" value="Add/Modify"/>
  +              </td>
  +            </form>
             </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -   </tr>
  -  </table>
  -
  - </xsl:template>
  -
  +        </font>
  +      </table>
  +    </column>
  +  </xsl:template>
   </xsl:stylesheet>
  
  
  
  1.3       +213 -292  cocoon-2.1/src/blocks/slide/samples/description2html4permissions.xsl
  
  Index: description2html4permissions.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4permissions.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- description2html4permissions.xsl	6 May 2003 11:38:10 -0000	1.2
  +++ description2html4permissions.xsl	7 May 2003 16:50:40 -0000	1.3
  @@ -1,180 +1,117 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet version="1.0"
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  -                xmlns:source="http://xml.apache.org/cocoon/source/2.0"
  -                xmlns:dav="DAV:"
  -                xmlns:pl="http://xml.apache.org/cocoon/PrincipalListGenerator">
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:source="http://xml.apache.org/cocoon/source/2.0" xmlns:dav="DAV:" xmlns:pl="http://xml.apache.org/cocoon/PrincipalListGenerator" version="1.0">
   
  - <xsl:output indent="yes"/>
  +  <xsl:output indent="yes"/>
   
  - <xsl:template match="/">
  -  <html>
  -   <head>
  -    <title>Apache Cocoon @version@</title>
  -    <link rel="SHORTCUT ICON" href="favicon.ico"/>
  -   </head>
  -   <body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
  -    <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -     <tr>
  -      <td width="*"><font face="arial,helvetica,sanserif" color="#000000">The Apache Software Foundation is proud to present...</font></td>
  -      <td width="40%" align="center"><img border="0" src="/cocoon/samples/images/cocoon.gif"/></td>
  -      <td width="30%" align="center"><font face="arial,helvetica,sanserif" color="#000000"><b>version @version@</b></font></td>
  -     </tr>
  -     <tr>
  -       <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -         <tr>
  -            <td width="90%" align="left" bgcolor="#0086b2"><font size="+1" face="arial,helvetica,sanserif"
  -    color="#ffffff"><xsl:value-of select="document/source:source/@uri"/></font></td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/users/">
  -             <i>users</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/content/{substring-after(document/source:source/@uri,'://')}">
  -             <i>content</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/properties/{substring-after(document/source:source/@uri,'://')}">
  -             <i>properties</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/permissions/{substring-after(document/source:source/@uri,'://')}">
  -             <i>permissions</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/locks/{substring-after(document/source:source/@uri,'://')}">
  -             <i>locks</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/logout.html">
  -             <i>logout</i></a>
  -            </td>
  -         </tr>
  -       </table>
  -     </tr>
  -    </table>
  -
  -    <xsl:apply-templates select="document/source:source"/>
  -
  -    <p align="center">
  -     <font size="-1">
  -      Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.<br/>
  -      All rights reserved.
  -     </font>
  -    </p>
  -   </body>
  -  </html>
  - </xsl:template>
  -
  - <xsl:template match="source:source">
  -
  -  <table width="100%">
  -   <tr>
  -    <td width="200" valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -          <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Navigation</font>
  -           </td>
  -          </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <xsl:if test="@parent">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <a href="/cocoon/samples/slide/permissions/{substring-after(@parent,'://')}">Back</a>
  -               </td>
  -              </tr>
  -             </xsl:if>
  -             <tr>
  -              <td width="100%" bgcolor="#ffffff" align="left">
  -               <br/>
  +  <xsl:template match="/">
  +    <document>
  +      <header>
  +        <title>Jakarta Slide example</title>
  +        <tab title="users" href="/cocoon/samples/slide/users/"/>
  +        <tab title="content" href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="properties" href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="permissions" href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="locks" href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="logout" href="/cocoon/samples/slide/logout.html"/>
  +      </header>
  +      <body>
  +        <row>
  +          <xsl:apply-templates select="document/source:source"/>
  +        </row>
  +      </body>
  +    </document>
  +  </xsl:template>
  +
  +  <xsl:template match="source:source">
  +    <column title="Navigation">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <xsl:if test="@parent">
  +          <tr>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <a href="/cocoon/samples/slide/permissions/{substring-after(@parent,'://')}">Back</a>
  +            </td>
  +          </tr>
  +        </xsl:if>
  +        <tr>
  +          <td width="100%" bgcolor="#ffffff" align="left">
  +            <br/>
  +          </td>
  +        </tr>
  +        <xsl:for-each select="source:children/source:source">
  +          <tr>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +                <a href="/cocoon/samples/slide/permissions/{substring-after(@uri,'://')}">
  +                  <xsl:value-of select="@name"/>
  +                </a>
  +              </font>
  +            </td>
  +          </tr>
  +        </xsl:for-each>
  +      </table>
  +    </column>
  +
  +    <column title="User permissions">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +          <tr>
  +            <td align="left">
  +              <b>Principal</b>
  +            </td>
  +            <td align="left">
  +              <b>Privilege</b>
  +            </td>
  +            <td align="left">
  +              <b>Inheritable</b>
  +            </td>
  +            <td align="left">
  +              <b>Deny</b>
  +            </td>
  +            <td align="right"/>
  +          </tr>
  +          <xsl:for-each select="source:permissions/source:permission[@principal]">
  +            <tr>
  +              <td align="left">
  +                <xsl:value-of select="@principal"/>
                 </td>
  -             </tr>
  -             <xsl:for-each select="source:children/source:source">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -                 <a href="/cocoon/samples/slide/permissions/{substring-after(@uri,'://')}"
  -                  ><xsl:value-of select="@name"/></a>
  -                </font>
  -               </td>
  -              </tr>
  -             </xsl:for-each>
  -            </table>
  -           </td>
  -          </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -
  -    <td valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -          <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">User permissions</font>
  -           </td>
  -          </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -              <tr>
  -               <td align="left"><b>Principal</b></td>
  -               <td align="left"><b>Privilege</b></td>
  -               <td align="left"><b>Inheritable</b></td>
  -               <td align="left"><b>Deny</b></td>
  -               <td align="right"></td>
  -              </tr>
  -
  -              <xsl:for-each select="source:permissions/source:permission[@principal]">
  -               <tr>
  -                <td align="left"><xsl:value-of select="@principal"/></td>
  -                <td align="left"><xsl:value-of select="@privilege"/></td>
  -                <td align="left"><xsl:value-of select="@inheritable"/></td>
  -                <td align="left"><xsl:value-of select="@negative"/></td>
  -                <td align="right">
  -                 <form action="" method="post">
  +              <td align="left">
  +                <xsl:value-of select="@privilege"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="@inheritable"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="@negative"/>
  +              </td>
  +              <td align="right">
  +                <form action="" method="post">
                     <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
                     <input type="hidden" name="cocoon-source-permission-principal" value="{@principal}"/>
                     <input type="hidden" name="cocoon-source-permission-privilege" value="{@privilege}"/>
                     <input type="hidden" name="cocoon-source-permission-inheritable" value="{@inheritable}"/>
                     <input type="hidden" name="cocoon-source-permission-negative" value="{@negative}"/>
  -
                     <input type="submit" name="doRemovePrincipalPermission" value="Delete"/>
  -                 </form>
  -                </td>
  -               </tr>
  -              </xsl:for-each>
  -
  -              <tr>
  -               <form action="" method="post">
  -                <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  -                <td align="left">
  -                 <select name="cocoon-source-permission-principal">
  +                </form>
  +              </td>
  +            </tr>
  +          </xsl:for-each>
  +          <tr>
  +            <form action="" method="post">
  +              <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +              <td align="left">
  +                <select name="cocoon-source-permission-principal">
                     <option>ALL</option>
                     <option>SELF</option>
                     <option>GUEST</option>
                     <xsl:for-each select="/document/pl:list/pl:principal">
  -                   <option><xsl:value-of select="@pl:name"/></option>
  +                    <option>
  +                      <xsl:value-of select="@pl:name"/>
  +                    </option>
                     </xsl:for-each>
  -                 </select>
  -                </td>
  -                <td align="left">
  -                 <select name="cocoon-source-permission-privilege">
  +                </select>
  +              </td>
  +              <td align="left">
  +                <select name="cocoon-source-permission-privilege">
                     <option>all</option>
                     <option>read</option>
                     <option>write</option>
  @@ -195,142 +132,126 @@
                     <option>remove-content</option>
                     <option>grant-permission</option>
                     <option>revoke-permission</option>
  -                 </select>
  -                </td>
  -                <td align="left">
  -                 <select name="cocoon-source-permission-inheritable">
  -                  <option>true</option>
  -                  <option>false</option>
  -                 </select>
  -                </td>
  -                <td align="left">
  -                 <select name="cocoon-source-permission-negative">
  -                  <option>true</option>
  -                  <option>false</option>
  -                 </select>
  -                </td>
  -                <td align="right">
  -                 <input type="submit" name="doAddPrincipalPermission" value="Add/Modify"/>
  -                </td>
  -               </form>
  -              </tr>
  -             </font>
  -            </table>
  -           </td>
  -          </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -          <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Group permissions</font>
  -           </td>
  -          </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <tr>
  -              <td align="left"><b>Group</b></td>
  -              <td align="left"><b>Privilege</b></td>
  -              <td align="left"><b>Inheritable</b></td>
  -              <td align="left"><b>Deny</b></td>
  -              <td align="right"></td>
  -             </tr>
  -
  -             <xsl:for-each select="source:permissions/source:permission[@group]">
  -              <tr>
  -               <td align="left"><xsl:value-of select="@group"/></td>
  -               <td align="left"><xsl:value-of select="@privilege"/></td>
  -               <td align="left"><xsl:value-of select="@inheritable"/></td>
  -               <td align="left"><xsl:value-of select="@negative"/></td>
  -               <td align="right">
  -                <form action="" method="post">
  -                 <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
  -                 <input type="hidden" name="cocoon-source-permission-principal-group" value="{@group}"/>
  -                 <input type="hidden" name="cocoon-source-permission-privilege" value="{@privilege}"/>
  -                 <input type="hidden" name="cocoon-source-permission-inheritable" value="{@inheritable}"/>
  -                 <input type="hidden" name="cocoon-source-permission-negative" value="{@negative}"/>
  -
  -                 <input type="submit" name="doRemovePrincipalGroupPermission" value="Delete"/>
  -                </form>
  -               </td>
  -              </tr>
  -             </xsl:for-each>
  -
  -             <tr>
  -              <form action="" method="post">
  -               <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  -               <td align="left">
  -                <select name="cocoon-source-permission-principal-group">
  -                 <xsl:for-each select="/document/pl:list/pl:group">
  -                  <option><xsl:value-of select="@pl:name"/></option>
  -                 </xsl:for-each>
  -                </select>
  -               </td>
  -               <td align="left">
  -                <select name="cocoon-source-permission-privilege">
  -                 <option>all</option>
  -                 <option>read</option>
  -                 <option>write</option>
  -                 <option>read-acl</option>
  -                 <option>write-acl</option>
  -                 <option>read-source</option>
  -                 <option>create-source</option>
  -                 <option>remove-source</option>
  -                 <option>lock-source</option>
  -                 <option>read-locks</option>
  -                 <option>read-property</option>
  -                 <option>create-property</option>
  -                 <option>modify-property</option>
  -                 <option>remove-property</option>
  -                 <option>read-content</option>
  -                 <option>create-content</option>
  -                 <option>modify-content</option>
  -                 <option>remove-content</option>
  -                 <option>grant-permission</option>
  -                 <option>revoke-permission</option>
                   </select>
  -               </td>
  -               <td align="left">
  +              </td>
  +              <td align="left">
                   <select name="cocoon-source-permission-inheritable">
  -                 <option>true</option>
  -                 <option>false</option>
  +                  <option>true</option>
  +                  <option>false</option>
                   </select>
  -               </td>
  -               <td align="left">
  +              </td>
  +              <td align="left">
                   <select name="cocoon-source-permission-negative">
  -                 <option>true</option>
  -                 <option>false</option>
  +                  <option>true</option>
  +                  <option>false</option>
                   </select>
  -               </td>
  -               <td align="right">
  +              </td>
  +              <td align="right">
                   <input type="submit" name="doAddPrincipalPermission" value="Add/Modify"/>
  -               </td>
  +              </td>
  +            </form>
  +          </tr>
  +        </font>
  +      </table>
  +    </column>
  +
  +    <column title="Group permissions">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <tr>
  +          <td align="left">
  +            <b>Group</b>
  +          </td>
  +          <td align="left">
  +            <b>Privilege</b>
  +          </td>
  +          <td align="left">
  +            <b>Inheritable</b>
  +          </td>
  +          <td align="left">
  +            <b>Deny</b>
  +          </td>
  +          <td align="right"/>
  +        </tr>
  +        <xsl:for-each select="source:permissions/source:permission[@group]">
  +          <tr>
  +            <td align="left">
  +              <xsl:value-of select="@group"/>
  +            </td>
  +            <td align="left">
  +              <xsl:value-of select="@privilege"/>
  +            </td>
  +            <td align="left">
  +              <xsl:value-of select="@inheritable"/>
  +            </td>
  +            <td align="left">
  +              <xsl:value-of select="@negative"/>
  +            </td>
  +            <td align="right">
  +              <form action="" method="post">
  +                <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
  +                <input type="hidden" name="cocoon-source-permission-principal-group" value="{@group}"/>
  +                <input type="hidden" name="cocoon-source-permission-privilege" value="{@privilege}"/>
  +                <input type="hidden" name="cocoon-source-permission-inheritable" value="{@inheritable}"/>
  +                <input type="hidden" name="cocoon-source-permission-negative" value="{@negative}"/>
  +                <input type="submit" name="doRemovePrincipalGroupPermission" value="Delete"/>
                 </form>
  -             </tr>
  -            </table>
  -           </td>
  +            </td>
             </tr>
  -         </table>
  -        </td>
  -       </tr>
  -      </tbody>
  -     </table>
  -    </td>
  -   </tr>
  -  </table>
  -
  - </xsl:template>
  -
  +        </xsl:for-each>
  +        <tr>
  +          <form action="" method="post">
  +            <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +            <td align="left">
  +              <select name="cocoon-source-permission-principal-group">
  +                <xsl:for-each select="/document/pl:list/pl:group">
  +                  <option>
  +                    <xsl:value-of select="@pl:name"/>
  +                  </option>
  +                </xsl:for-each>
  +              </select>
  +            </td>
  +            <td align="left">
  +              <select name="cocoon-source-permission-privilege">
  +                <option>all</option>
  +                <option>read</option>
  +                <option>write</option>
  +                <option>read-acl</option>
  +                <option>write-acl</option>
  +                <option>read-source</option>
  +                <option>create-source</option>
  +                <option>remove-source</option>
  +                <option>lock-source</option>
  +                <option>read-locks</option>
  +                <option>read-property</option>
  +                <option>create-property</option>
  +                <option>modify-property</option>
  +                <option>remove-property</option>
  +                <option>read-content</option>
  +                <option>create-content</option>
  +                <option>modify-content</option>
  +                <option>remove-content</option>
  +                <option>grant-permission</option>
  +                <option>revoke-permission</option>
  +              </select>
  +            </td>
  +            <td align="left">
  +              <select name="cocoon-source-permission-inheritable">
  +                <option>true</option>
  +                <option>false</option>
  +              </select>
  +            </td>
  +            <td align="left">
  +              <select name="cocoon-source-permission-negative">
  +                <option>true</option>
  +                <option>false</option>
  +              </select>
  +            </td>
  +            <td align="right">
  +              <input type="submit" name="doAddPrincipalPermission" value="Add/Modify"/>
  +            </td>
  +          </form>
  +        </tr>
  +      </table>
  +    </column>
  +  </xsl:template>
   </xsl:stylesheet>
  
  
  
  1.3       +102 -188  cocoon-2.1/src/blocks/slide/samples/description2html4properties.xsl
  
  Index: description2html4properties.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/description2html4properties.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- description2html4properties.xsl	6 May 2003 11:38:10 -0000	1.2
  +++ description2html4properties.xsl	7 May 2003 16:50:40 -0000	1.3
  @@ -1,201 +1,115 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet version="1.0"
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  -                xmlns:source="http://xml.apache.org/cocoon/source/2.0"
  -                xmlns:dav="DAV:">
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:source="http://xml.apache.org/cocoon/source/2.0" xmlns:dav="DAV:" version="1.0">
   
  - <xsl:output indent="yes"/>
  +  <xsl:output indent="yes"/>
   
  - <xsl:template match="/">
  -  <html>
  -   <head>
  -    <title>Apache Cocoon @version@</title>
  -    <link rel="SHORTCUT ICON" href="favicon.ico"/>
  -   </head>
  -   <body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
  -    <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -     <tr>
  -      <td width="*"><font face="arial,helvetica,sanserif" color="#000000">The Apache Software Foundation is proud to present...</font></td>
  -      <td width="40%" align="center"><img border="0" src="/cocoon/samples/images/cocoon.gif"/></td>
  -      <td width="30%" align="center"><font face="arial,helvetica,sanserif" color="#000000"><b>version @version@</b></font></td>
  -     </tr>
  -     <tr>
  -       <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -         <tr>
  -            <td width="90%" align="left" bgcolor="#0086b2"><font size="+1" face="arial,helvetica,sanserif"
  -    color="#ffffff"><xsl:value-of select="source:source/@uri"/></font></td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/users/">
  -             <i>users</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}">
  -             <i>content</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}">
  -             <i>properties</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}">
  -             <i>permissions</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a
  -    href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}">
  -             <i>locks</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/logout.html">
  -             <i>logout</i></a>
  -            </td>
  -         </tr>
  -       </table>
  -     </tr>
  -    </table>
  -
  -    <xsl:apply-templates select="source:source"/>
  -
  -    <p align="center">
  -     <font size="-1">
  -      Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.<br/>
  -      All rights reserved.
  -     </font>
  -    </p>
  -   </body>
  -  </html>
  - </xsl:template>
  -
  - <xsl:template match="source:source">
  -
  -  <table width="100%">
  -   <tr>
  -    <td width="200" valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  +  <xsl:template match="/">
  +    <document>
  +      <header>
  +        <title>Jakarta Slide example</title>
  +        <tab title="users" href="/cocoon/samples/slide/users/"/>
  +        <tab title="content" href="/cocoon/samples/slide/content/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="properties" href="/cocoon/samples/slide/properties/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="permissions" href="/cocoon/samples/slide/permissions/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="locks" href="/cocoon/samples/slide/locks/{substring-after(source:source/@uri,'://')}"/>
  +        <tab title="logout" href="/cocoon/samples/slide/logout.html"/>
  +      </header>
  +      <body>
  +        <row>
  +          <xsl:apply-templates select="source:source"/>
  +        </row>
  +      </body>
  +    </document>
  +  </xsl:template>
  +
  +  <xsl:template match="source:source">
  +    <column title="Navigation">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <xsl:if test="@parent">
             <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Navigation</font>
  -           </td>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <a href="/cocoon/samples/slide/properties/{substring-after(@parent,'://')}">Back</a>
  +            </td>
             </tr>
  +        </xsl:if>
  +        <tr>
  +          <td width="100%" bgcolor="#ffffff" align="left">
  +            <br/>
  +          </td>
  +        </tr>
  +        <xsl:for-each select="source:children/source:source">
             <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -             <xsl:if test="@parent">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <a href="/cocoon/samples/slide/properties/{substring-after(@parent,'://')}">Back</a>
  -               </td>
  -              </tr>
  -             </xsl:if>
  -             <tr>
  -              <td width="100%" bgcolor="#ffffff" align="left">
  -               <br/>
  -              </td>
  -             </tr>
  -             <xsl:for-each select="source:children/source:source">
  -              <tr>
  -               <td width="100%" bgcolor="#ffffff" align="left">
  -                <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -                 <a href="/cocoon/samples/slide/properties/{substring-after(@uri,'://')}"
  -                  ><xsl:value-of select="@name"/></a>
  -                </font>
  -               </td>
  -              </tr>
  -             </xsl:for-each>
  -            </table>
  -           </td>
  +            <td width="100%" bgcolor="#ffffff" align="left">
  +              <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +                <a href="/cocoon/samples/slide/properties/{substring-after(@uri,'://')}">
  +                  <xsl:value-of select="@name"/>
  +                </a>
  +              </font>
  +            </td>
             </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -
  -    <td valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  +        </xsl:for-each>
  +      </table>
  +    </column>
  +
  +    <column title="Properties">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <font size="+0" face="arial,helvetica,sanserif" color="#000000">
             <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Properties</font>
  -           </td>
  +            <td align="left">
  +              <b>Namespace</b>
  +            </td>
  +            <td align="left">
  +              <b>Name</b>
  +            </td>
  +            <td align="left">
  +              <b>Value</b>
  +            </td>
  +            <td align="right"/>
             </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -
  -             <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -
  -             <tr>
  -              <td align="left"><b>Namespace</b></td>
  -              <td align="left"><b>Name</b></td>
  -              <td align="left"><b>Value</b></td>
  -              <td align="right"></td>
  -             </tr>
  -
  -             <xsl:for-each select="source:properties/*[local-name()!='children' and 
  -                local-name()!='permissions' and local-name()!='locks' and
  -                local-name()!='parent']">
  -              <tr>
  -               <td align="left"><xsl:value-of select="namespace-uri(.)"/></td>
  -               <td align="left"><xsl:value-of select="local-name(.)"/></td>
  -               <td align="left"><xsl:value-of select="."/></td>
  -               <td align="right">
  +          <xsl:for-each select="source:properties/*[local-name()!='children' and
  +                                local-name()!='permissions' and local-name()!='locks' and
  +                                local-name()!='parent']">
  +            <tr>
  +              <td align="left">
  +                <xsl:value-of select="namespace-uri(.)"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="local-name(.)"/>
  +              </td>
  +              <td align="left">
  +                <xsl:value-of select="."/>
  +              </td>
  +              <td align="right">
                   <xsl:if test="namespace-uri()!='DAV:' and ../@type='live'">
  -                 <form action="" method="post">
  -                  <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
  -                  <input type="hidden" name="cocoon-source-property-namespace" value="{namespace-uri()}"/>
  -                  <input type="hidden" name="cocoon-source-property-name" value="{local-name()}"/>
  -  
  -                  <input type="submit" name="doDeleteProperty" value="Delete"/>
  -                 </form>
  +                  <form action="" method="post">
  +                    <input type="hidden" name="cocoon-source-uri" value="{../../@uri}"/>
  +                    <input type="hidden" name="cocoon-source-property-namespace" value="{namespace-uri()}"/>
  +                    <input type="hidden" name="cocoon-source-property-name" value="{local-name()}"/>
  +                    <input type="submit" name="doDeleteProperty" value="Delete"/>
  +                  </form>
                   </xsl:if>
  -               </td>
  -              </tr>
  -             </xsl:for-each>
  -
  -             <tr>
  -              <form action="" method="post">
  -               <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  -                <td align="left">
  -                 <input name="cocoon-source-property-namespace" type="text" size="15" maxlength="40"/>
  -                </td>
  -                <td align="left">
  -                 <input name="cocoon-source-property-name" type="text" size="15" maxlength="40"/>
  -                </td>
  -                <td align="left">
  -                 <input name="cocoon-source-property-value" type="text" size="15" maxlength="40"/>
  -                </td>
  -                <td align="right">
  -                 <input type="submit" name="doAddProperty" value="Add/Modify"/>
  -                </td>
  -               </form>
  -              </tr>
  -
  -             </font>
  -
  -            </table>
  -           </td>
  +              </td>
  +            </tr>
  +          </xsl:for-each>
  +          <tr>
  +            <form action="" method="post">
  +              <input type="hidden" name="cocoon-source-uri" value="{@uri}"/>
  +              <td align="left">
  +                <input name="cocoon-source-property-namespace" type="text" size="15" maxlength="40"/>
  +              </td>
  +              <td align="left">
  +                <input name="cocoon-source-property-name" type="text" size="15" maxlength="40"/>
  +              </td>
  +              <td align="left">
  +                <input name="cocoon-source-property-value" type="text" size="15" maxlength="40"/>
  +              </td>
  +              <td align="right">
  +                <input type="submit" name="doAddProperty" value="Add/Modify"/>
  +              </td>
  +            </form>
             </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -   </tr>
  -  </table>
  -
  - </xsl:template>
  -
  +        </font>
  +      </table>
  +    </column>
  +  </xsl:template>
   </xsl:stylesheet>
  
  
  
  1.3       +126 -232  cocoon-2.1/src/blocks/slide/samples/principal2html4users.xsl
  
  Index: principal2html4users.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/principal2html4users.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- principal2html4users.xsl	6 May 2003 11:38:10 -0000	1.2
  +++ principal2html4users.xsl	7 May 2003 16:50:40 -0000	1.3
  @@ -1,260 +1,154 @@
   <?xml version="1.0"?>
  -<xsl:stylesheet version="1.0"
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  -                xmlns:pl="http://xml.apache.org/cocoon/PrincipalListGenerator">
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pl="http://xml.apache.org/cocoon/PrincipalListGenerator" version="1.0">
   
  - <xsl:output indent="yes"/>
  +  <xsl:output indent="yes"/>
   
  - <xsl:template match="/">
  -  <html>
  -   <head>
  -    <title>Apache Cocoon @version@</title>
  -    <link rel="SHORTCUT ICON" href="favicon.ico"/>
  -   </head>
  -   <body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
  -    <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -     <tr>
  -      <td width="*"><font face="arial,helvetica,sanserif" color="#000000">The Apache Software Foundation is proud to present...</font></td>
  -      <td width="40%" align="center"><img border="0" src="/cocoon/samples/images/cocoon.gif"/></td>
  -      <td width="30%" align="center"><font face="arial,helvetica,sanserif" color="#000000"><b>version @version@</b></font></td>
  -     </tr>
  -     <tr>
  -       <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -         <tr>
  -            <td width="90%" align="left" bgcolor="#0086b2"><font size="+1" face="arial,helvetica,sanserif"
  -    color="#ffffff">User management</font></td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/users/">
  -             <i>users</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/content/">
  -             <i>content</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/properties/">
  -             <i>properties</i></a>
  -            </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/permissions/">
  -             <i>permissions</i></a>
  +  <xsl:template match="/">
  +    <document>
  +      <header>
  +        <title>Jakarta Slide example</title>
  +        <tab title="users" href="/cocoon/samples/slide/users/"/>
  +        <tab title="content" href="/cocoon/samples/slide/content/"/>
  +        <tab title="properties" href="/cocoon/samples/slide/properties/"/>
  +        <tab title="permissions" href="/cocoon/samples/slide/permissions/"/>
  +        <tab title="locks" href="/cocoon/samples/slide/locks/"/>
  +        <tab title="logout" href="/cocoon/samples/slide/logout.html"/>
  +      </header>
  +      <body>
  +        <row>
  +          <xsl:apply-templates select="pl:list"/>
  +        </row>
  +      </body>
  +    </document>
  +  </xsl:template>
  +
  +  <xsl:template match="pl:list">
  +    <column title="Users">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  +          <tr>
  +            <td align="left">
  +              <b>User</b>
               </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/locks/">
  -             <i>locks</i></a>
  +            <td align="left"/>
  +            <td align="left">
  +              <b>Role</b>
               </td>
  -            <td nowrap="nowrap" bgcolor="#ffffff"><a href="/cocoon/samples/slide/logout.html">
  -             <i>logout</i></a>
  +            <td align="left">
  +              <b>Groups</b>
               </td>
  -         </tr>
  -       </table>
  -     </tr>
  -    </table>
  -
  -    <xsl:apply-templates select="pl:list"/>
  -
  -    <p align="center">
  -     <font size="-1">
  -      Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.<br/>
  -      All rights reserved.
  -     </font>
  -    </p>
  -   </body>
  -  </html>
  - </xsl:template>
  -
  - <xsl:template match="pl:list">
  -
  -  <table width="100%">
  -   <tr>
  -
  -    <td width="60%" valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  -          <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Users</font>
  -           </td>
  +            <td align="left"/>
  +            <td align="right"/>
             </tr>
  -          <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -
  -             <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -
  -              <tr>
  -               <td align="left"><b>User</b></td>
  -               <td align="left"></td>
  -               <td align="left"><b>Role</b></td>
  -               <td align="left"><b>Groups</b></td>
  -               <td align="left"></td>
  -               <td align="right"></td>
  -              </tr>
  - 
  -              <xsl:for-each select="pl:principal">
  -               <tr>
  -  
  -                <form action="" method="post">
  -                 <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  - 
  -                 <td align="left">
  +          <xsl:for-each select="pl:principal">
  +            <tr>
  +              <form action="" method="post">
  +                <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  +                <td align="left">
                     <xsl:value-of select="@name"/>
  -                 </td>
  - 
  -                 <td align="left">
  +                </td>
  +                <td align="left">
                     <input type="submit" name="doRemovePrincipal" value="Delete user"/>
  -                 </td>
  - 
  -                </form>
  - 
  -                <td align="left"><xsl:value-of select="@role"/></td>
  - 
  -                <form action="" method="post">
  -                 <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  - 
  -                 <td align="left">
  +                </td>
  +              </form>
  +              <td align="left">
  +                <xsl:value-of select="@role"/>
  +              </td>
  +              <form action="" method="post">
  +                <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  +                <td align="left">
                     <xsl:variable name="name" select="@name"/>
  -                  <select name="cocoon-principal-group-name" 
  -                          size="{count(../pl:group/pl:principal[@name=$name])}">
  -                   <xsl:for-each select="../pl:group/pl:principal[@name=$name]">
  -                    <option><xsl:value-of select="../@name"/></option>
  -                   </xsl:for-each>
  +                  <select name="cocoon-principal-group-name" size="{count(../pl:group/pl:principal[@name=$name])}">
  +                    <xsl:for-each select="../pl:group/pl:principal[@name=$name]">
  +                      <option>
  +                        <xsl:value-of select="../@name"/>
  +                      </option>
  +                    </xsl:for-each>
                     </select>
  -                 </td>
  - 
  -                 <td align="left">
  +                </td>
  +                <td align="left">
                     <input type="submit" name="doRemovePrincipalGroupMember" value="Remove group"/>
  -                 </td>
  -                </form>
  - 
  -               </tr>
  - 
  -               <tr>
  -                <td align="left"></td>
  -                <td align="left"></td>
  -                <td align="left"></td>
  - 
  -                <form action="" method="post">
  +                </td>
  +              </form>
  +            </tr>
  +            <tr>
  +              <td align="left"/>
  +              <td align="left"/>
  +              <td align="left"/>
  +              <form action="" method="post">
                   <input type="hidden" name="cocoon-principal-name" value="{@name}"/>
  - 
  -                 <td align="left">
  +                <td align="left">
                     <xsl:variable name="name" select="@name"/>
                     <select name="cocoon-principal-group-name" size="1">
  -                   <xsl:for-each select="../pl:group">
  -                    <option><xsl:value-of select="@name"/></option>
  -                   </xsl:for-each>
  +                    <xsl:for-each select="../pl:group">
  +                      <option>
  +                        <xsl:value-of select="@name"/>
  +                      </option>
  +                    </xsl:for-each>
                     </select>
  -                 </td>
  - 
  -                 <td align="left">
  -                  <input type="submit" name="doAddPrincipalGroupMember" value="Add group"/>
  -                 </td>
  -                </form>
  - 
  -               </tr>
  -              </xsl:for-each>
  - 
  -              <tr>
  -               <form action="" method="post">
  -                <td align="left">
  -                 <input name="cocoon-principal-name" type="text" size="10" maxlength="40"/>
                   </td>
  -                <td align="left"></td>
                   <td align="left">
  -                 <input name="cocoon-principal-role" type="text" size="10" maxlength="40"/>
  -                </td>
  -                <td align="left">Password:</td>
  -                <td align="left">
  -                 <input name="cocoon-principal-password" type="text" size="10" maxlength="40"/>
  -                </td>
  -                <td align="right">
  -                 <input type="submit" name="doAddPrincipal" value="Add user"/>
  +                  <input type="submit" name="doAddPrincipalGroupMember" value="Add group"/>
                   </td>
  -               </form>
  -              </tr>
  -
  -             </font>
  -
  -            </table>
  -           </td>
  -          </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -
  -    <td valign="top">
  -     <table border="0" bgcolor="#000000" cellpadding="0" cellspacing="0" width="97%">
  -      <tbody>
  -       <tr>
  -        <td>
  -         <table bgcolor="#000000" border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
  +              </form>
  +            </tr>
  +          </xsl:for-each>
             <tr>
  -           <td bgcolor="#0086b2" width="100%" align="left">
  -            <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">Groups</font>
  -           </td>
  +            <form action="" method="post">
  +              <td align="left">
  +                <input name="cocoon-principal-name" type="text" size="10" maxlength="40"/>
  +              </td>
  +              <td align="left"/>
  +              <td align="left">
  +                <input name="cocoon-principal-role" type="text" size="10" maxlength="40"/>
  +              </td>
  +              <td align="left">Password:</td>
  +              <td align="left">
  +                <input name="cocoon-principal-password" type="text" size="10" maxlength="40"/>
  +              </td>
  +              <td align="right">
  +                <input type="submit" name="doAddPrincipal" value="Add user"/>
  +              </td>
  +            </form>
             </tr>
  +        </font>
  +      </table>
  +    </column>
  +
  +    <column title="Groups">
  +      <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2" width="100%" align="center">
  +        <font size="+0" face="arial,helvetica,sanserif" color="#000000">
             <tr>
  -           <td width="100%" bgcolor="#ffffff" align="left">
  -            <table bgcolor="#ffffff" border="0" cellspacing="0" cellpadding="2"  width="100%" align="center">
  -
  -             <font size="+0" face="arial,helvetica,sanserif" color="#000000">
  -
  -              <tr>
  -               <td align="left"><b>Group</b></td>
  -               <td align="right"></td>
  -              </tr>
  -
  -              <xsl:for-each select="pl:group">
  -               <tr>
  -
  -                <form action="" method="post">
  -                 <input type="hidden" name="cocoon-principal-group-name" value="{@name}"/>
  - 
  -                 <td align="left">
  -                  <xsl:value-of select="@name"/>
  -                 </td>
  -
  -                 <td align="right">
  -                  <input type="submit" name="doRemovePrincipalGroup" value="Delete group"/>
  -                 </td>
  -
  -                </form>
  -               </tr>
  -              </xsl:for-each>
  -
  -              <tr>
  -               <form action="" method="post">
  +            <td align="left">
  +              <b>Group</b>
  +            </td>
  +            <td align="right"/>
  +          </tr>
  +          <xsl:for-each select="pl:group">
  +            <tr>
  +              <form action="" method="post">
  +                <input type="hidden" name="cocoon-principal-group-name" value="{@name}"/>
                   <td align="left">
  -                 <input name="cocoon-principal-group-name" type="text" size="15" maxlength="40"/>
  +                  <xsl:value-of select="@name"/>
                   </td>
                   <td align="right">
  -                 <input type="submit" name="doAddPrincipalGroup" value="Add group"/>
  +                  <input type="submit" name="doRemovePrincipalGroup" value="Delete group"/>
                   </td>
  -               </form>
  -              </tr>
  -
  -             </font>
  -
  -            </table>
  -           </td>
  +              </form>
  +            </tr>
  +          </xsl:for-each>
  +          <tr>
  +            <form action="" method="post">
  +              <td align="left">
  +                <input name="cocoon-principal-group-name" type="text" size="15" maxlength="40"/>
  +              </td>
  +              <td align="right">
  +                <input type="submit" name="doAddPrincipalGroup" value="Add group"/>
  +              </td>
  +            </form>
             </tr>
  -         </table>
  -
  -        </td>
  -       </tr> 
  -      </tbody>
  -     </table>
  -
  -     <br/>
  -    </td>
  -
  -   </tr>
  -  </table>
  -
  - </xsl:template>
  -
  +        </font>
  +      </table>
  +    </column>
  +  </xsl:template>
   </xsl:stylesheet>
  
  
  
  1.5       +29 -4     cocoon-2.1/src/blocks/slide/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap	6 May 2003 14:12:58 -0000	1.4
  +++ sitemap.xmap	7 May 2003 16:50:40 -0000	1.5
  @@ -100,7 +100,7 @@
      <map:match pattern="authenticate">
       <map:generate src="cocoon:/principallist"/>
   
  -    <map:transform type="xslt" src="principal2auth.xsl"> <!-- stylesheets seems to have a problem with XSLTC -->
  +	  <map:transform type="xslt" src="principal2auth.xsl"> 
        <map:parameter name="use-request-parameters" value="true"/>
       </map:transform>
   
  @@ -129,7 +129,10 @@
      </map:match>
    
      <map:match pattern="login.html">
  -    <map:generate src="login.xhtml"/>
  +    <map:generate src="login.xml"/>
  +    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:transform src="redirect4login.xsl">
        <map:parameter name="destination" value="{request-param:resource}"/>
       </map:transform>
  @@ -144,7 +147,10 @@
        <map:redirect-to uri="{request-param:resource}"/>
       </map:act>
   
  -    <map:generate src="login-failed.xhtml"/>
  +    <map:generate src="login-failed.xml"/>
  +    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:transform src="redirect4login.xsl">
        <map:parameter name="destination" value="{request-param:resource}"/>
       </map:transform>
  @@ -155,7 +161,11 @@
       <map:act type="auth-logout">
        <map:parameter name="handler" value="slidehandler"/>
   
  -     <map:read src="logout.xhtml"/>
  +     <map:generate src="logout.xml"/>
  +      <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
  +     <map:serialize/>
       </map:act>
   
       <map:redirect-to uri="login.html"/>
  @@ -175,6 +185,9 @@
         <map:transform src="description2html4content.xsl">
          <map:parameter name="cocoon-source-principal" value="{../ID}"/>
         </map:transform>
  +      <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
         <map:transform type="xinclude"/>
         <map:serialize type="html"/>
        </map:match>
  @@ -187,6 +200,9 @@
   
         <map:generate src="cocoon:/description/{../ID}/{1}"/>
         <map:transform src="description2html4properties.xsl"/>
  +      <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
         <map:serialize type="html"/>
        </map:match>
   
  @@ -202,6 +218,9 @@
         </map:aggregate>
   
         <map:transform src="description2html4permissions.xsl"/>
  +      <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
         <map:serialize type="html"/>
        </map:match>
   
  @@ -213,6 +232,9 @@
   
         <map:generate src="cocoon:/description/{../ID}/{1}"/>
         <map:transform src="description2html4locks.xsl"/>
  +      <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
         <map:serialize type="html"/>
        </map:match>
   
  @@ -233,6 +255,9 @@
          <map:parameter name="principalcaller" value="{../ID}"/>
         </map:generate>
         <map:transform src="principal2html4users.xsl"/>
  +      <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +       <map:parameter name="contextPath" value="{request:contextPath}"/>
  +      </map:transform>
         <map:serialize type="html"/>
        </map:match>
   
  
  
  
  1.1                  cocoon-2.1/src/blocks/slide/samples/login-failed.xml
  
  Index: login-failed.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <header>
      <title>Jakarta Slide example</title>
      <tab title="back" href=".."/>
    </header>
    <body>
      <row>
        <column title="Login failed">
          <table border="0" cellspacing="0" cellpadding="2">
            <form action="login" method="post">
              <input type="hidden" name="resource" value="content/"/>
              <tr>
                <td>Username</td>
                <td>
                  <input name="userid" type="text" size="15" maxlength="40"/>
                </td>
              </tr>
              <tr>
                <td>Password</td>
                <td>
                  <input name="password" type="password" size="15" maxlength="40"/>
                </td>
              </tr>
              <tr>
                <td/>
                <td>
                  <input type="submit" name="cocoon-login" value="Login"/>
                </td>
              </tr>
              <tr>
                <td/>
                <td>Login failed!</td>
              </tr>
              <tr>
                <td/>
                <td>Try root,root or john,john</td>
              </tr>
            </form>
          </table>
        </column>
      </row>
    </body>
  </document>
  
  
  
  1.1                  cocoon-2.1/src/blocks/slide/samples/login.xml
  
  Index: login.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <header>
      <title>Jakarta Slide example</title>
      <tab title="back" href=".."/>
    </header>
    <body>
      <row>
        <column title="Login">
          <table border="0" cellspacing="0" cellpadding="2">
            <form action="login" method="post">
              <input type="hidden" name="resource" value="content/"/>
              <tr>
                <td>Username</td>
                <td>
                  <input name="userid" type="text" size="15" maxlength="40"/>
                </td>
              </tr>
              <tr>
                <td>Password</td>
                <td>
                  <input name="password" type="password" size="15" maxlength="40"/>
                </td>
              </tr>
              <tr>
                <td/>
                <td>
                  <input type="submit" name="cocoon-login" value="Login"/>
                </td>
              </tr>
              <tr>
                <td/>
                <td>Try root,root or john,john</td>
              </tr>
            </form>
          </table>
        </column>
      </row>
    </body>
  </document>
  
  
  
  1.1                  cocoon-2.1/src/blocks/slide/samples/logout.xml
  
  Index: logout.xml
  ===================================================================
  <?xml version="1.0"?>
  <document>
    <header>
      <title>Jakarta Slide example</title>
      <tab title="login" href="/cocoon/samples/slide/login.html"/>
      <tab title="back" href=".."/>
    </header>
    <body>
      <row>
        <column title="Logout">
          <p>Good bye.</p>
        </column>
      </row>
    </body>
  </document>
  
  
  
  1.3       +26 -23    cocoon-2.1/src/blocks/profiler/samples/profile2page.xsl
  
  Index: profile2page.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/samples/profile2page.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- profile2page.xsl	20 Mar 2003 15:04:16 -0000	1.2
  +++ profile2page.xsl	7 May 2003 16:50:41 -0000	1.3
  @@ -12,30 +12,33 @@
    <xsl:param name="component"/>
   
    <xsl:template match="/">
  -  <page>
  -   <tab title="Back" href="profile.html"/>
  -   <tab title="Overview" href="welcome"/>
  -   <style href="xml2html.css"/>
  -   <script href="xml2html.js"/>
  +  <document>
  +   <header>
  +    <tab title="Back" href="profile.html"/>
  +    <tab title="Overview" href="welcome"/>
  +    <style href="xml2html.css"/>
  +    <script href="xml2html.js"/>
  +   </header>
  +   <body>
  +    <xsl:choose>
  +     <xsl:when test="$component!=''">
  +      <xsl:apply-templates
  +          select="profile:profilerinfo/profile:pipeline/profile:result/profile:component[@index=$component]"
  +          mode="fragment"/>
  +     </xsl:when>
  +     <xsl:when test="$result!=''">
  +      <xsl:apply-templates select="profile:profilerinfo/profile:pipeline/profile:result" mode="result"/>
  +     </xsl:when>
  +     <xsl:when test="$key!=''">
  +      <xsl:apply-templates select="profile:profilerinfo/profile:pipeline" mode="results"/>
  +     </xsl:when>
  +     <xsl:otherwise>
  +      <xsl:apply-templates select="profile:profilerinfo" mode="pipelines"/>
  +     </xsl:otherwise>
  +    </xsl:choose>
   
  -   <xsl:choose>
  -    <xsl:when test="$component!=''">
  -     <xsl:apply-templates
  -         select="profile:profilerinfo/profile:pipeline/profile:result/profile:component[@index=$component]"
  -         mode="fragment"/>
  -    </xsl:when>
  -    <xsl:when test="$result!=''">
  -     <xsl:apply-templates select="profile:profilerinfo/profile:pipeline/profile:result" mode="result"/>
  -    </xsl:when>
  -    <xsl:when test="$key!=''">
  -     <xsl:apply-templates select="profile:profilerinfo/profile:pipeline" mode="results"/>
  -    </xsl:when>
  -    <xsl:otherwise>
  -     <xsl:apply-templates select="profile:profilerinfo" mode="pipelines"/>
  -    </xsl:otherwise>
  -   </xsl:choose>
  - 
  -  </page>
  +   </body>
  +  </document>
    </xsl:template>
   
    <xsl:template match="profile:profilerinfo" mode="pipelines">
  
  
  
  1.6       +9 -3      cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/samples/sitemap.xmap,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sitemap.xmap	30 Apr 2003 09:24:02 -0000	1.5
  +++ sitemap.xmap	7 May 2003 16:50:41 -0000	1.6
  @@ -42,7 +42,9 @@
      <map:match pattern="caching-testsite.html">
       <map:generate src="test.xml"/>
       <map:transform src="test2page.xsl"/>
  -    <map:transform src="page2html.xsl"/>
  +    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  @@ -55,7 +57,9 @@
      <map:match pattern="noncaching-testsite.html">
       <map:generate src="test.xml"/>
       <map:transform src="test2page.xsl"/>
  -    <map:transform src="page2html.xsl"/>
  +    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  @@ -82,7 +86,9 @@
       <map:transform src="profile2page.xsl">
        <map:parameter name="use-request-parameters" value="true"/>
       </map:transform>
  -    <map:transform src="page2html.xsl"/>
  +    <map:transform src="context://samples/common/style/xsl/html/complex-page2html.xsl">
  +     <map:parameter name="contextPath" value="{request:contextPath}"/>
  +    </map:transform>
       <map:serialize type="html"/>
      </map:match>
   
  
  
  
  1.2       +10 -9     cocoon-2.1/src/blocks/profiler/samples/test2page.xsl
  
  Index: test2page.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/profiler/samples/test2page.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test2page.xsl	9 Mar 2003 00:05:54 -0000	1.1
  +++ test2page.xsl	7 May 2003 16:50:41 -0000	1.2
  @@ -3,16 +3,17 @@
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
    <xsl:template match="hello-world">
  -  <page>
  -   <tab title="Overview" href="welcome"/>
  -
  -   <row>
  -    <column title="{title}">
  +  <document>
  +   <header>
  +    <tab title="Overview" href="welcome"/>
  +   </header>
  +   <body>
  +    <section>
  +     <title><xsl:apply-templates select="title"/></title>
        <xsl:apply-templates select="some-text"/>
  -    </column>
  -   </row>
  - 
  -  </page>
  +    </section>
  +   </body>
  +  </document>
    </xsl:template>
   
    <xsl:template match="some-text">
  
  
  

Mime
View raw message