You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2004/08/11 14:58:40 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/xslt homepage2xhtml.xsl links2xhtml.xsl page2xhtml-homepage.xsl page2xhtml-links.xsl page2xhtml-xhtml.xsl xhtml2xhtml.xsl

michi       2004/08/11 05:58:39

  Modified:    src/webapp/lenya/pubs/default parameter-doctype.xmap
                        publication-sitemap.xmap
               src/webapp/lenya/pubs/default/content/authoring sitetree.xml
               src/webapp/lenya/pubs/default/xslt xhtml2xhtml.xsl
  Added:       src/webapp/lenya/pubs/default/content/authoring/links
                        index_en.xml
               src/webapp/lenya/pubs/default/xslt homepage2xhtml.xsl
                        links2xhtml.xsl page2xhtml-homepage.xsl
                        page2xhtml-links.xsl page2xhtml-xhtml.xsl
  Log:
  using of doctypes is now better recognizable
  
  Revision  Changes    Path
  1.14      +15 -2     cocoon-lenya/src/webapp/lenya/pubs/default/parameter-doctype.xmap
  
  Index: parameter-doctype.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/parameter-doctype.xmap,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- parameter-doctype.xmap	13 Mar 2004 12:47:21 -0000	1.13
  +++ parameter-doctype.xmap	11 Aug 2004 12:58:39 -0000	1.14
  @@ -28,7 +28,10 @@
       <map:actions>
         <map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.forrest.components.sourcetype.SourceTypeAction">
           <sourcetype name="xhtml">
  -          <document-element namespace="http://www.w3.org/1999/xhtml" />
  +          <document-element namespace="http://www.w3.org/1999/xhtml"/>
  +        </sourcetype>
  +        <sourcetype name="links">
  +          <document-element namespace="http://cocoon.apache.org/lenya/pubs/default/1.0"/>
           </sourcetype>
         </map:action>
       </map:actions>
  @@ -39,6 +42,16 @@
     <map:resources/>
   
     <map:pipelines>
  +
  +    <map:pipeline>
  +      <!-- {area}/{uri} -->
  +      <map:match pattern="*/index.html">
  +        <map:generate type="serverpages" src="../../config/parameters/default.xsp">
  +          <map:parameter name="value" value="homepage"/>
  +	</map:generate>
  +	<map:serialize type="xml"/>
  +      </map:match>
  +    </map:pipeline>
   
       <map:pipeline>
         <!-- {area}/{uri} -->
  
  
  
  1.72      +2 -2      cocoon-lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap
  
  Index: publication-sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/publication-sitemap.xmap,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- publication-sitemap.xmap	24 Apr 2004 21:20:50 -0000	1.71
  +++ publication-sitemap.xmap	11 Aug 2004 12:58:39 -0000	1.72
  @@ -125,7 +125,7 @@
             <map:part src="cocoon://navigation/{2}/{3}/search/{5}.xml"/>
             <map:part src="cocoon:/lenya-document-{1}/{3}/{4}/{page-envelope:document-path}"/>
           </map:aggregate>
  -        <map:transform src="xslt/page2xhtml.xsl">
  +        <map:transform src="xslt/page2xhtml-{4}.xsl">
             <map:parameter name="root" value="{page-envelope:context-prefix}/{2}/{3}"/>
             <map:parameter name="url" value="{5}"/>
             <map:parameter name="document-id" value="{page-envelope:document-id}"/>
  
  
  
  1.19      +7 -0      cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/sitetree.xml
  
  Index: sitetree.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/sitetree.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- sitetree.xml	1 Apr 2004 21:27:45 -0000	1.18
  +++ sitetree.xml	11 Aug 2004 12:58:39 -0000	1.19
  @@ -25,6 +25,13 @@
     <node id="concepts">
       <label xml:lang="en">Concepts (english only)</label>
     </node>
  +
  +<!-- Menu not finished yet -->
  +<!--
  +  <node id="links">
  +    <label xml:lang="en">Apache Lenya Links</label>
  +  </node>
  +-->
     
     <node id="features">
       <label xml:lang="en">Features</label>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/content/authoring/links/index_en.xml
  
  Index: index_en.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <links xmlns="http://cocoon.apache.org/lenya/pubs/default/1.0">
    <title>Apache Lenya Links</title>
    <link href="http://cocoon.apache.org/lenya/">Apache Lenya Website</link>
    <link href="http://wiki.apache.org/cocoon-lenya/">Apache Lenya Wiki</link>
  </links>
  
  
  
  1.11      +2 -2      cocoon-lenya/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl
  
  Index: xhtml2xhtml.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/xslt/xhtml2xhtml.xsl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- xhtml2xhtml.xsl	10 Aug 2004 18:38:49 -0000	1.10
  +++ xhtml2xhtml.xsl	11 Aug 2004 12:58:39 -0000	1.11
  @@ -146,4 +146,4 @@
   
     <xsl:template match="dc:metadata"/>
     
  -</xsl:stylesheet> 
  \ No newline at end of file
  +</xsl:stylesheet> 
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/xslt/homepage2xhtml.xsl
  
  Index: homepage2xhtml.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  >
    
  <xsl:import href="xhtml2xhtml.xsl"/>
    
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/xslt/links2xhtml.xsl
  
  Index: links2xhtml.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    xmlns:default="http://cocoon.apache.org/lenya/pubs/default/1.0"
    xmlns="http://www.w3.org/1999/xhtml"
  >
  
  <xsl:template match="default:links">
  <div id="body">
  <h1><xsl:value-of select="default:title"/></h1>
  <ul>
  <xsl:apply-templates select="default:link"/>
  </ul>
  </div>
  </xsl:template>
  
  <xsl:template match="default:link">
  <li>
  <a href="{@href}">
  <xsl:value-of select="."/>
  </a>
  </li>
  </xsl:template>
    
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/xslt/page2xhtml-homepage.xsl
  
  Index: page2xhtml-homepage.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  >
    
  <xsl:import href="page2xhtml.xsl"/>
    
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/xslt/page2xhtml-links.xsl
  
  Index: page2xhtml-links.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  >
    
  <xsl:import href="page2xhtml.xsl"/>
    
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-lenya/src/webapp/lenya/pubs/default/xslt/page2xhtml-xhtml.xsl
  
  Index: page2xhtml-xhtml.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  >
    
  <xsl:import href="page2xhtml.xsl"/>
    
  </xsl:stylesheet>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org