oscom-lenya-notimes/pubs/ina/xslt cmsbody_new_oscom_times.xsl,1.1.1.1,1.2 create.xsl,1.1,1.2 nitf-to-html.xsl,1.1.1.1,1.2 section.xsl,1.1.1.1,1.2 xinclude-section.xsl,1.1.1.1,1.2

Michael Wechner <[email protected]> Wed, 11 Jun 2003 17:08:30 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /usr/local/repositories/oscom-lenya-notimes/pubs/ina/xslt
In directory erbium:/tmp/cvs-serv31162/pubs/ina/xslt

Modified Files:
	cmsbody_new_oscom_times.xsl create.xsl nitf-to-html.xsl 
	section.xsl xinclude-section.xsl 
Log Message:
XHTML DocType added

Index: cmsbody_new_oscom_times.xsl
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/ina/xslt/cmsbody_new_oscom_times.xsl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cmsbody_new_oscom_times.xsl	16 May 2003 15:25:06 -0000	1.1.1.1
--- cmsbody_new_oscom_times.xsl	11 Jun 2003 15:08:27 -0000	1.2
***************
*** 69,72 ****
--- 69,75 ----
       <br /><br />
       </xsl:when>
+      <xsl:when test="body/html"> <!-- XHTML Article -->
+        This is XHTML
+      </xsl:when>
       <xsl:when test="body/section"> <!-- section -->
         <h3><xsl:value-of select="body/section/@prefix"/></h3>

Index: create.xsl
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/ina/xslt/create.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** create.xsl	28 May 2003 04:18:14 -0000	1.1
--- create.xsl	11 Jun 2003 15:08:27 -0000	1.2
***************
*** 3,18 ****
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    
!   <xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
!   
!   <xsl:template match="/">
!     <html>
!       <head>
! 	<link rel="stylesheet" type="text/css" href="/lenya/lenya/css/default.css" />
!       </head>
!       <body>
! 	<xsl:apply-templates/>
!       </body>
!     </html>
!   </xsl:template>
    
    <xsl:template match="parent-child">
--- 3,9 ----
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    
! <xsl:output version="1.0" indent="yes" encoding="ISO-8859-1"/>
! 
! <xsl:import href="../../../xslt/authoring/parent-child.xsl"/>
    
    <xsl:template match="parent-child">
***************
*** 29,32 ****
--- 20,24 ----
  	  <input type="hidden" name="childtype" value="{/parent-child/childtype}"/>
  	  <input type="hidden" name="doctype" value="{/parent-child/doctype}"/>
+ 	  <input type="hidden" name="childname" value="Levi"/>
  	  <table>
  	    <tr>
***************
*** 43,47 ****
  	    </tr>
  	    <tr>
! 	      <td>name:</td><td><input type="text" name="childname"/></td>
  	    </tr>
  	  </table>
--- 35,42 ----
  	    </tr>
  	    <tr>
! 	      <td>tree node name:</td><td>My Node Name</td>
! <!--
! 	      <td>tree node name:</td><td><input type="text" name="childname"/></td>
! -->
  	    </tr>
  	  </table>
***************
*** 51,69 ****
        </p>
      </xsl:if>
-   </xsl:template>
-   
-   <xsl:template match="exception">
-     <font color="red">EXCEPTION</font><br />
-     Go <a href="{../referer}">back</a> to page.<br />
-     <p>
-       Exception handling isn't very good at the moment. 
-       For further details please take a look at the log-files
-       of Cocoon. In most cases it's one of the two possible exceptions:
-       <ol>
- 	<li>The id is not allowed to have whitespaces</li>
- 	<li>The id is already in use</li>
-       </ol>
-       Exception handling will be improved in the near future.
-     </p>
    </xsl:template>
    
--- 46,49 ----

Index: nitf-to-html.xsl
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/ina/xslt/nitf-to-html.xsl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nitf-to-html.xsl	16 May 2003 15:25:06 -0000	1.1.1.1
--- nitf-to-html.xsl	11 Jun 2003 15:08:27 -0000	1.2
***************
*** 13,16 ****
--- 13,22 ----
  
  
+ <!-- XHTML -->
+ <xsl:template match="html">
+   <xsl:copy-of select="."/>
+ </xsl:template>
+ 
+ <!-- NITF -->
  <xsl:template match="nitf">
    <xsl:apply-templates />

Index: section.xsl
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/ina/xslt/section.xsl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** section.xsl	16 May 2003 15:25:06 -0000	1.1.1.1
--- section.xsl	11 Jun 2003 15:08:27 -0000	1.2
***************
*** 1,17 ****
! <?xml version="1.0" encoding="ISO-8859-1"?>
! 
! <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
! 
! <xsl:template match="section">
! <ul>
!   <xsl:apply-templates select="article"/>
! </ul>
! </xsl:template>
! 
! <xsl:template match="article">
! <li><xsl:value-of select="body.head/dateline/location"/>, <xsl:value-of select="body.head/dateline/story.date"/><br />
  <b><a href="{substring-before(@filename,'.')}.html"><xsl:value-of select="body.head/hedline/hl1"/></a></b><br />
! <xsl:value-of select="body.head/abstract"/><br /><br /></li>
! </xsl:template>
! 
! </xsl:stylesheet>
--- 1,36 ----
! <?xml version="1.0" encoding="ISO-8859-1"?>
! 
! <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
! 
! <xsl:template match="section">
! <ul>
!   <xsl:apply-templates select="article"/>
! </ul>
! </xsl:template>
! 
! <xsl:template match="article">
! <li>
! <xsl:apply-templates select="body.head"/> <!-- NITF -->
! <xsl:apply-templates select="title"/> <!-- XHTML -->
! 
! <!--
! <xsl:value-of select="body.head/dateline/location"/>, <xsl:value-of select="body.head/dateline/story.date"/><br />
  <b><a href="{substring-before(@filename,'.')}.html"><xsl:value-of select="body.head/hedline/hl1"/></a></b><br />
! <xsl:value-of select="body.head/abstract"/>
! -->
! 
! <br /><br />
! </li>
! </xsl:template>
! 
! <xsl:template match="body.head">
! <xsl:value-of select="dateline/location"/>, <xsl:value-of select="dateline/story.date"/><br />
! <b>NITF: <a href="{substring-before(../@filename,'.')}.html"><xsl:value-of select="hedline/hl1"/></a></b><br />
! <xsl:value-of select="abstract"/>
! </xsl:template>
! 
! <xsl:template match="title">
! <b>XHTML: <a href="{substring-before(../@filename,'.')}.html"><xsl:value-of select="."/></a></b>
! </xsl:template>
! 
! </xsl:stylesheet>

Index: xinclude-section.xsl
===================================================================
RCS file: /usr/local/repositories/oscom-lenya-notimes/pubs/ina/xslt/xinclude-section.xsl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** xinclude-section.xsl	16 May 2003 15:25:06 -0000	1.1.1.1
--- xinclude-section.xsl	11 Jun 2003 15:08:27 -0000	1.2
***************
*** 17,21 ****
  <xsl:template match="dir:file">
  <article filename="{@name}" year="{$year}" month="{$month}" day="{$day}" section="{$section}">
! <head xlink:href="{@name}#xpointer(/nitf/head)xpointer(/nitf/body.head)" xlink:show="embed" xmlns:xlink="http://www.w3.org/2002/XLink"/>
  </article>
  </xsl:template>
--- 17,21 ----
  <xsl:template match="dir:file">
  <article filename="{@name}" year="{$year}" month="{$month}" day="{$day}" section="{$section}">
! <head xlink:href="{@name}#xpointer(/nitf/head)xpointer(/nitf/body.head)xpointer(/html/head/title)" xlink:show="embed" xmlns:xlink="http://www.w3.org/2002/XLink"/>
  </article>
  </xsl:template>