joerg 2003/11/06 06:11:21
Modified: src/blocks/linotype/samples/stylesheets news2edit.xslt news2html-content.xslt news2html-history.xslt news2html-homepage.xslt news2html-private.xslt news2html-single.xslt news2rss-0.91.xslt news2rss-2.0.xslt request2news.xslt Log: stylesheet cleanup: - namespace issues: namespaces should be declared on the root element, otherwise elements from other elements are not in this namespace (caused a NPE in Xalan a special case) - TABs => spaces - indentation Revision Changes Path 1.3 +141 -139 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2edit.xslt Index: news2edit.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2edit.xslt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news2edit.xslt 28 Sep 2003 11:54:24 -0000 1.2 +++ news2edit.xslt 6 Nov 2003 14:11:21 -0000 1.3 @@ -1,149 +1,151 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:n="http://www.betaversion.org/linotype/news/1.0" -> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0" + xmlns="http://www.w3.org/1999/xhtml"> <xsl:param name="home"/> - - <xsl:template match="/"> - <html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title><xsl:value-of select="n:news/n:title"/></title> - <link rel="stylesheet" type="text/css" href="{$home}/styles/main.css"/> - <link rel="stylesheet" type="text/css" href="{$home}/styles/editor.css"/> - <script type="text/javascript"><![CDATA[ - - prefixImageSrc="image-"; - - function doAction(action) { - var form = document.forms[0]; - - if (action == "delete") { - var agree = confirm("Are you sure you want to delete this news?"); - if (!agree) return; - } else if (action == "revert") { - var content = document.getElementById("previous_innerHTML").firstChild.nodeValue; - if (content != "") { - var agree = confirm("Are you sure you want to restore content to the previous version?"); - if (agree) loadContent(content); - } - return; - } else { - form.elements['date'].value = getDate(); - form.elements['time'].value = getTime(); - form.elements['fulldate'].value = getFullDate(); - form.elements['innerHTML'].value = getInnerHTML(); - form.elements['xml:content'].value = getContent(); - } - - form.elements['action'].value = action; - form.submit(); - } + <xsl:template match="/"> + <html> + <head> + <title><xsl:value-of select="n:news/n:title"/></title> + <link rel="stylesheet" type="text/css" href="{$home}/styles/main.css"/> + <link rel="stylesheet" type="text/css" href="{$home}/styles/editor.css"/> + <script type="text/javascript"><![CDATA[ + + prefixImageSrc="image-"; + + function doAction(action) { + var form = document.forms[0]; + + if (action == "delete") { + var agree = confirm("Are you sure you want to delete this news?"); + if (!agree) return; + } else if (action == "revert") { + var content = document.getElementById("previous_innerHTML").firstChild.nodeValue; + if (content != "") { + var agree = confirm("Are you sure you want to restore content to the previous version?"); + if (agree) loadContent(content); + } + return; + } else { + form.elements['date'].value = getDate(); + form.elements['time'].value = getTime(); + form.elements['fulldate'].value = getFullDate(); + form.elements['innerHTML'].value = getInnerHTML(); + form.elements['xml:content'].value = getContent(); + } + + form.elements['action'].value = action; + form.submit(); + } ]]></script> - <script src="{$home}/scripts/editor.js" type="text/javascript"></script> - <noscript> - <h1>Dude, you don't go anywhere around here without Javascript enabled. ;-)</h1> - </noscript> - </head> - - <body onload="start(event)" onunload="stop(event)"> - <!--form name="data" action="/request" method="POST" enctype="multipart/form-data"--> - <form name="data" action="{string('#{$continuation/id}')}.kont" method="POST" enctype="multipart/form-data"> - <input type="hidden" name="action"/> - <input type="hidden" name="author" value="{string('#{userid}')}"/> - <input type="hidden" name="date"/> - <input type="hidden" name="time"/> - <input type="hidden" name="fulldate"/> - <input type="hidden" name="xml:content"/> - <input type="hidden" name="innerHTML"/> - - <div id="toolbar"> - <table cellpadding="0" cellspacing="0"> - <tr> - <td><div class="imagebutton" id="bold"><img src="{$home}/images/icons/bold.gif" alt="Strong" title="Strong"/></div></td> - <td><div class="imagebutton" id="italic"><img src="{$home}/images/icons/italic.gif" alt="Emphasis" title="Emphasis"/></div></td> - <td><div class="imagebutton" id="strikethrough"><img src="{$home}/images/icons/strikethrough.gif" alt="Error" title="Error"/></div></td> - <td><div class="imagebutton" id="quote"><img src="{$home}/images/icons/quote.gif" alt="Quote" title="Quote"/></div></td> - <td><div class="spacer"/></td> - <td><div class="imagebutton" id="removeformat"><img src="{$home}/images/icons/removeformat.gif" alt="Remove Format" title="Remove Format"/></div></td> - <td><div class="spacer"/></td> - <td><div class="imagebutton" id="createlink"><img src="{$home}/images/icons/link.gif" alt="Link Selection" title="Link Selection"/></div></td> - <td><div class="imagebutton" id="unlink"><img src="{$home}/images/icons/unlink.gif" alt="Unlink Selection" title="Unlink Selection"/></div></td> - <td><div class="spacer"/></td> - <td><div class="imagebutton" id="insertimage"><img src="{$home}/images/icons/image.gif" alt="Add Image" title="Add Image"/></div></td> - <td><div class="imagebutton" id="inserthorizontalrule"><img src="{$home}/images/icons/horizontalrule.gif" alt="Add Horizontal Rule" title="Add Horizontal Rule"/></div></td> - <td><div class="spacer"/></td> - <td><div class="imagebutton" id="insertorderedlist"><img src="{$home}/images/icons/orderedlist.gif" alt="Ordered List" title="Ordered List"/></div></td> - <td><div class="imagebutton" id="insertunorderedlist"><img src="{$home}/images/icons/unorderedlist.gif" alt="Unordered List" title="Unordered List"/></div></td> - <td><div class="spacer"/></td> - <td><div class="imagebutton" id="outdent"><img src="{$home}/images/icons/outdent.gif" alt="Outdent" title="Outdent"/></div></td> - <td><div class="imagebutton" id="indent"><img src="{$home}/images/icons/indent.gif" alt="Indent" title="Indent"/></div></td> - <td width="100%" align="center" nowrap="true"> - <span id="block_selector">Block: <select id="formatblock"> - <option value="">Normal</option> - <option value="p">Paragraph</option> - <option value="h1">Heading 1</option> - <option value="h2">Heading 2</option> - <option value="h3">Heading 3</option> - <option value="h4">Heading 4</option> - </select> - </span> - <span id="class_selector">Class: <select id="alternatives"><option>whatever</option></select></span> - </td> - <td nowrap="true"> - <input type="checkbox" name="online"> - <xsl:if test="n:news/@online='on'"><xsl:attribute name="checked">true</xsl:attribute></xsl:if> - </input> - <label for="online">published</label> - </td> - </tr> - </table> - </div> - - <xsl:apply-templates/> - - <div id="controls"> - <!--Version: <select name="version"> - <t:forEach select="{string('#{versions}')}" xmlns:t="http://apache.org/cocoon/templates/jx/1.0"> - <option>#{.}</option> - </t:forEach> - </select> - <input type="button" value="Restore" onclick="doAction('restore')"/--> - <input type="button" value="Revert" onclick="doAction('revert')"/> - <input type="button" value="Delete" onclick="doAction('delete')"/> - <input type="button" value="Save" onclick="doAction('save')"/> - <input type="button" value="Finish" onclick="doAction('finish')"/> - </div> - - </form> - </body> - </html> + <script src="{$home}/scripts/editor.js" type="text/javascript"></script> + <noscript> + <h1>Dude, you don't go anywhere around here without Javascript enabled. ;-)</h1> + </noscript> + </head> + + <body onload="start(event)" onunload="stop(event)"> + <!--form name="data" action="/request" method="POST" enctype="multipart/form-data"--> + <form name="data" action="{string('#{$continuation/id}')}.kont" method="POST" enctype="multipart/form-data"> + <input type="hidden" name="action"/> + <input type="hidden" name="author" value="{string('#{userid}')}"/> + <input type="hidden" name="date"/> + <input type="hidden" name="time"/> + <input type="hidden" name="fulldate"/> + <input type="hidden" name="xml:content"/> + <input type="hidden" name="innerHTML"/> + + <div id="toolbar"> + <table cellpadding="0" cellspacing="0"> + <tr> + <td><div class="imagebutton" id="bold"><img src="{$home}/images/icons/bold.gif" alt="Strong" title="Strong"/></div></td> + <td><div class="imagebutton" id="italic"><img src="{$home}/images/icons/italic.gif" alt="Emphasis" title="Emphasis"/></div></td> + <td><div class="imagebutton" id="strikethrough"><img src="{$home}/images/icons/strikethrough.gif" alt="Error" title="Error"/></div></td> + <td><div class="imagebutton" id="quote"><img src="{$home}/images/icons/quote.gif" alt="Quote" title="Quote"/></div></td> + <td><div class="spacer"/></td> + <td><div class="imagebutton" id="removeformat"><img src="{$home}/images/icons/removeformat.gif" alt="Remove Format" title="Remove Format"/></div></td> + <td><div class="spacer"/></td> + <td><div class="imagebutton" id="createlink"><img src="{$home}/images/icons/link.gif" alt="Link Selection" title="Link Selection"/></div></td> + <td><div class="imagebutton" id="unlink"><img src="{$home}/images/icons/unlink.gif" alt="Unlink Selection" title="Unlink Selection"/></div></td> + <td><div class="spacer"/></td> + <td><div class="imagebutton" id="insertimage"><img src="{$home}/images/icons/image.gif" alt="Add Image" title="Add Image"/></div></td> + <td><div class="imagebutton" id="inserthorizontalrule"><img src="{$home}/images/icons/horizontalrule.gif" alt="Add Horizontal Rule" title="Add Horizontal Rule"/></div></td> + <td><div class="spacer"/></td> + <td><div class="imagebutton" id="insertorderedlist"><img src="{$home}/images/icons/orderedlist.gif" alt="Ordered List" title="Ordered List"/></div></td> + <td><div class="imagebutton" id="insertunorderedlist"><img src="{$home}/images/icons/unorderedlist.gif" alt="Unordered List" title="Unordered List"/></div></td> + <td><div class="spacer"/></td> + <td><div class="imagebutton" id="outdent"><img src="{$home}/images/icons/outdent.gif" alt="Outdent" title="Outdent"/></div></td> + <td><div class="imagebutton" id="indent"><img src="{$home}/images/icons/indent.gif" alt="Indent" title="Indent"/></div></td> + <td width="100%" align="center" style="white-space: nowrap;"> + <span id="block_selector"> + <xsl:text>Block: </xsl:text> + <select id="formatblock"> + <option value="">Normal</option> + <option value="p">Paragraph</option> + <option value="h1">Heading 1</option> + <option value="h2">Heading 2</option> + <option value="h3">Heading 3</option> + <option value="h4">Heading 4</option> + </select> + </span> + <span id="class_selector"> + <xsl:text>Class: </xsl:text> + <select id="alternatives"> + <option>whatever</option> + </select> + </span> + </td> + <td style="white-space: nowrap;"> + <input type="checkbox" name="online"> + <xsl:if test="n:news/@online='on'"> + <xsl:attribute name="checked">true</xsl:attribute> + </xsl:if> + </input> + <label for="online">published</label> + </td> + </tr> + </table> + </div> + + <xsl:apply-templates/> + + <div id="controls"> + <!--Version: <select name="version"> + <t:forEach select="{string('#{versions}')}" xmlns:t="http://apache.org/cocoon/templates/jx/1.0"> + <option>#{.}</option> + </t:forEach> + </select> + <input type="button" value="Restore" onclick="doAction('restore')"/--> + <input type="button" value="Revert" onclick="doAction('revert')"/> + <input type="button" value="Delete" onclick="doAction('delete')"/> + <input type="button" value="Save" onclick="doAction('save')"/> + <input type="button" value="Finish" onclick="doAction('finish')"/> + </div> + + </form> + </body> + </html> </xsl:template> - - <xsl:template match="n:news"> - - <div id="page"> - <div class="field">Title:<br/><input type="text" name="title" size="40" value="{n:title}"/></div> - - <div id="image_inputs"/> - - <div class="field"> - <table cellpadding="0" cellspacing="0"> - <tr> - <td align="left">Content:</td> - <td align="right" width="100%"><input type="checkbox" id="wysiwyg-checkbox" onclick="wysiwyg(!this.checked)"/>WYSIWYG</td> - </tr> - </table> - <iframe id="edit" src="content" width="100%" height="400px" scrolling="auto" frameborder="0">Get a modern browser</iframe> - <div id="path">...</div> - </div> - - <div id="previous_innerHTML">#{innerHTML}</div> - </div> + <xsl:template match="n:news"> + <div id="page"> + <div class="field">Title:<br/><input type="text" name="title" size="40" value="{n:title}"/></div> + <div id="image_inputs"/> + <div class="field"> + <table cellpadding="0" cellspacing="0"> + <tr> + <td align="left">Content:</td> + <td align="right" width="100%"><input type="checkbox" id="wysiwyg-checkbox" onclick="wysiwyg(!this.checked)"/>WYSIWYG</td> + </tr> + </table> + <iframe id="edit" src="content" width="100%" height="400px" scrolling="auto" frameborder="0">Get a modern browser</iframe> + <div id="path">...</div> + </div> + <div id="previous_innerHTML">#{innerHTML}</div> + </div> </xsl:template> - + </xsl:stylesheet> 1.2 +11 -12 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-content.xslt Index: news2html-content.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-content.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- news2html-content.xslt 17 Jun 2003 01:32:43 -0000 1.1 +++ news2html-content.xslt 6 Nov 2003 14:11:21 -0000 1.2 @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:n="http://www.betaversion.org/linotype/news/1.0" - xmlns:h="http://www.w3.org/1999/xhtml" -> - +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0" + xmlns:h="http://www.w3.org/1999/xhtml" + xmlns="http://www.w3.org/1999/xhtml"> + <xsl:param name="home"/> - + <xsl:template match="/"> - <html xmlns="http://www.w3.org/1999/xhtml"> + <html> <head> <link rel="stylesheet" type="text/css" href="{$home}/styles/main.css"/> <link rel="stylesheet" type="text/css" href="{$home}/styles/editor_page.css"/> @@ -19,19 +18,19 @@ </body> </html> </xsl:template> - + <xsl:template match="h:strong"> <b><xsl:apply-templates/></b> </xsl:template> - + <xsl:template match="h:em"> <i><xsl:apply-templates/></i> </xsl:template> - + <xsl:template match="@*|node()"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> </xsl:copy> </xsl:template> - + </xsl:stylesheet> 1.2 +20 -20 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-history.xslt Index: news2html-history.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-history.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- news2html-history.xslt 17 Jun 2003 01:32:43 -0000 1.1 +++ news2html-history.xslt 6 Nov 2003 14:11:21 -0000 1.2 @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:n="http://www.betaversion.org/linotype/news/1.0"> - +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0"> + <xsl:param name="home"/> - + <xsl:template match="/"> <html> <head> @@ -11,25 +12,24 @@ <link rel="stylesheet" type="text/css" href="{$home}/styles/main.css"/> </head> <body> - -<div id="sidebar"> - <a href="{$home}/"><img alt="Linotype" src="{$home}/images/linotype.jpg" width="156px" height="207px" /></a> -</div> - -<div id="bottombar"> - <a href="http://cocoon.apache.org" title="Apache Cocoon"><img alt="Powered by Cocoon" src="{$home}/images/cocoon.jpg"/></a> -</div> - -<div id="page"> - <h1>News History</h1> - <h2>The whole braindump</h2> - <xsl:apply-templates select="//n:[EMAIL PROTECTED] = 'on']"/> -</div> - + <div id="sidebar"> + <a href="{$home}/"><img alt="Linotype" src="{$home}/images/linotype.jpg" width="156px" height="207px" /></a> + </div> + + <div id="bottombar"> + <a href="http://cocoon.apache.org" title="Apache Cocoon"><img alt="Powered by Cocoon" src="{$home}/images/cocoon.jpg"/></a> + </div> + + <div id="page"> + <h1>News History</h1> + <h2>The whole braindump</h2> + <xsl:apply-templates select="//n:[EMAIL PROTECTED] = 'on']"/> + </div> + </body> </html> </xsl:template> - + <xsl:template match="n:news"> <xsl:variable name="id" select="../@id"/> <div class="news" online="[EMAIL PROTECTED]"> @@ -37,5 +37,5 @@ <h2><xsl:value-of select="@creation-date"/> ~ <xsl:value-of select="@creation-time"/></h2> </div> </xsl:template> - + </xsl:stylesheet> 1.2 +15 -16 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-homepage.xslt Index: news2html-homepage.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-homepage.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- news2html-homepage.xslt 17 Jun 2003 01:32:43 -0000 1.1 +++ news2html-homepage.xslt 6 Nov 2003 14:11:21 -0000 1.2 @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:n="http://www.betaversion.org/linotype/news/1.0" - xmlns:h="http://www.w3.org/1999/xhtml" -> - +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0" + xmlns:h="http://www.w3.org/1999/xhtml" + xmlns="http://www.w3.org/1999/xhtml"> + <xsl:param name="home"/> <xsl:param name="count"/> - + <xsl:template match="/"> <xsl:for-each select="//n:[EMAIL PROTECTED] = 'on']"> <xsl:if test="position() <= number($count)"> @@ -16,7 +15,7 @@ </xsl:if> </xsl:for-each> </xsl:template> - + <xsl:template match="n:news"> <xsl:variable name="id" select="../@id"/> <div class="news"> @@ -27,7 +26,7 @@ <div class="separator"><img align="center" src="images/separator1.jpg"/></div> </div> </xsl:template> - + <xsl:template name="find-id"> <xsl:param name="node"/> <xsl:choose> @@ -42,13 +41,13 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - + <xsl:template match="h:body"> <div class="body"> <xsl:apply-templates/> </div> </xsl:template> - + <xsl:template match="@src" priority="1"> <xsl:variable name="id"><xsl:call-template name="find-id"><xsl:with-param name="node" select=".."/></xsl:call-template></xsl:variable> <xsl:choose> @@ -71,21 +70,21 @@ <xsl:apply-templates select="text()[position() > 1]|@*|*"/> </xsl:copy> </xsl:template--> - + <xsl:template match="h:p[1]"> <p class="first"> <xsl:apply-templates/> </p> </xsl:template> - + <xsl:template match="hr"> - <div class="separator"><img src="images/separator2.jpg"/></div> + <div class="separator"><img src="images/separator2.jpg"/></div> </xsl:template> - + <xsl:template match="@*|node()"> <xsl:copy> <xsl:apply-templates select="@*|node()"/> </xsl:copy> </xsl:template> - + </xsl:stylesheet> 1.2 +22 -21 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-private.xslt Index: news2html-private.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-private.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- news2html-private.xslt 17 Jun 2003 01:32:43 -0000 1.1 +++ news2html-private.xslt 6 Nov 2003 14:11:21 -0000 1.2 @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:n="http://www.betaversion.org/linotype/news/1.0"> - +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0"> + <xsl:param name="home"/> - + <xsl:template match="/"> <html> <head> @@ -11,26 +12,26 @@ <link rel="stylesheet" type="text/css" href="{$home}/styles/main.css"/> </head> <body> - -<div id="sidebar"> - <a href="{$home}/"><img alt="Linotype" src="{$home}/images/linotype.jpg" width="156px" height="207px" /></a> -</div> - -<div id="bottombar"> - <a href="http://cocoon.apache.org" title="Apache Cocoon"><img alt="Powered by Cocoon" src="{$home}/images/cocoon.jpg"/></a> -</div> - -<div id="page"> - <h1>News List</h1> - <h2>where the juice is</h2> - <h3><a href="edit/news/template/">Write a news</a> | <a href="logout">Logout</a></h3> - <xsl:apply-templates select="//n:news"/> -</div> - + + <div id="sidebar"> + <a href="{$home}/"><img alt="Linotype" src="{$home}/images/linotype.jpg" width="156px" height="207px" /></a> + </div> + + <div id="bottombar"> + <a href="http://cocoon.apache.org" title="Apache Cocoon"><img alt="Powered by Cocoon" src="{$home}/images/cocoon.jpg"/></a> + </div> + + <div id="page"> + <h1>News List</h1> + <h2>where the juice is</h2> + <h3><a href="edit/news/template/">Write a news</a> | <a href="logout">Logout</a></h3> + <xsl:apply-templates select="//n:news"/> + </div> + </body> </html> </xsl:template> - + <xsl:template match="n:news"> <xsl:variable name="id" select="../@id"/> <div class="news" online="[EMAIL PROTECTED]"> @@ -38,5 +39,5 @@ <h2><xsl:value-of select="@creation-date"/> ~ <xsl:value-of select="@creation-time"/></h2> </div> </xsl:template> - + </xsl:stylesheet> 1.2 +65 -72 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-single.xslt Index: news2html-single.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2html-single.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- news2html-single.xslt 17 Jun 2003 01:32:43 -0000 1.1 +++ news2html-single.xslt 6 Nov 2003 14:11:21 -0000 1.2 @@ -1,81 +1,74 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:n="http://www.betaversion.org/linotype/news/1.0" - xmlns:h="http://www.w3.org/1999/xhtml" -> - - <xsl:param name="home"/> - - <xsl:template match="n:news"> -<html xml:lang="en" lang="en"> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0" + xmlns:h="http://www.w3.org/1999/xhtml" + xmlns="http://www.w3.org/1999/xhtml"> - <head> - <title>Stefano's Linotype ~ <xsl:value-of select="n:title"/></title> - - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <xsl:param name="home"/> - <meta name="DC.title" content="{n:title}"/> - <meta name="DC.author.personalName" content="Stefano Mazzocchi"/> - <meta name="keywords" lang="en" content="{n:keywords}"/> - <meta name="DC.date.created" content="[EMAIL PROTECTED]"/> - <meta name="DC.date.lastModified" content="[EMAIL PROTECTED]"/> - <meta name="DC.identifier" content="http://www.betaversion.org/~stefano/linotype/"/> - - <link rel="stylesheet" href="{$home}/styles/main.css" type="text/css"/> - - <rdf:RDF xmlns="http://web.resource.org/cc/" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <Work rdf:about=""> - <license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/1.0/" /> - </Work> - <License rdf:about="http://creativecommons.org/licenses/by-nc-sa/1.0/"> - <requires rdf:resource="http://web.resource.org/cc/Attribution" /> - <requires rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <permits rdf:resource="http://web.resource.org/cc/Reproduction" /> - <permits rdf:resource="http://web.resource.org/cc/Distribution" /> - <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <prohibits rdf:resource="http://web.resource.org/cc/CommercialUse" /> - <requires rdf:resource="http://web.resource.org/cc/Notice" /> - </License> - </rdf:RDF> - - </head> - -<body> - -<div id="bottombar"> - <a href="http://cocoon.apache.org" title="Apache Cocoon"><img alt="Powered by Cocoon" src="{$home}/images/cocoon.jpg"/></a> -</div> - -<div id="sidebar"> - <a href="{$home}/private/"><img alt="Linotype" src="{$home}/images/linotype.jpg" width="156px" height="207px" /></a> -</div> - -<div id="page"> - <div class="news"> - <h1><img src="{$home}/images/hand.jpg" alt=""/><xsl:value-of select="n:title"/></h1> - <h2><xsl:value-of select="@creation-date"/> ~ <xsl:value-of select="@creation-time"/></h2> - <div class="body"> - <xsl:apply-templates select="h:body"/> - </div> - </div> -</div> - -<div id="footer"> - <a href="http://creativecommons.org/licenses/by-nc-sa/1.0/" title="Creative Commons: some rights reserved"><img alt="Creative Commons License" src="{$home}/images/cc.gif"/></a> -</div> + <xsl:template match="n:news"> + <html xml:lang="en" lang="en"> + <head> + <title>Stefano's Linotype ~ <xsl:value-of select="n:title"/></title> + <meta name="DC.title" content="{n:title}"/> + <meta name="DC.author.personalName" content="Stefano Mazzocchi"/> + <meta name="keywords" lang="en" content="{n:keywords}"/> + <meta name="DC.date.created" content="[EMAIL PROTECTED]"/> + <meta name="DC.date.lastModified" content="[EMAIL PROTECTED]"/> + <meta name="DC.identifier" content="http://www.betaversion.org/~stefano/linotype/"/> + + <link rel="stylesheet" href="{$home}/styles/main.css" type="text/css"/> + + <rdf:RDF xmlns="http://web.resource.org/cc/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <Work rdf:about=""> + <license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/1.0/" /> + </Work> + <License rdf:about="http://creativecommons.org/licenses/by-nc-sa/1.0/"> + <requires rdf:resource="http://web.resource.org/cc/Attribution" /> + <requires rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <permits rdf:resource="http://web.resource.org/cc/Reproduction" /> + <permits rdf:resource="http://web.resource.org/cc/Distribution" /> + <permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <prohibits rdf:resource="http://web.resource.org/cc/CommercialUse" /> + <requires rdf:resource="http://web.resource.org/cc/Notice" /> + </License> + </rdf:RDF> + </head> + <body> + + <div id="bottombar"> + <a href="http://cocoon.apache.org" title="Apache Cocoon"><img alt="Powered by Cocoon" src="{$home}/images/cocoon.jpg"/></a> + </div> + + <div id="sidebar"> + <a href="{$home}/private/"><img alt="Linotype" src="{$home}/images/linotype.jpg" width="156px" height="207px" /></a> + </div> + + <div id="page"> + <div class="news"> + <h1><img src="{$home}/images/hand.jpg" alt=""/><xsl:value-of select="n:title"/></h1> + <h2><xsl:value-of select="@creation-date"/> ~ <xsl:value-of select="@creation-time"/></h2> + <div class="body"> + <xsl:apply-templates select="h:body"/> + </div> + </div> + </div> + + <div id="footer"> + <a href="http://creativecommons.org/licenses/by-nc-sa/1.0/" title="Creative Commons: some rights reserved"><img alt="Creative Commons License" src="{$home}/images/cc.gif"/></a> + </div> -</body> -</html> + </body> + </html> </xsl:template> - + <xsl:template match="@*|node()"> - <xsl:copy> - <xsl:apply-templates select="@*|node()"/> - </xsl:copy> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> </xsl:template> - + </xsl:stylesheet> 1.3 +6 -8 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-0.91.xslt Index: news2rss-0.91.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-0.91.xslt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- news2rss-0.91.xslt 26 Jun 2003 03:09:49 -0000 1.2 +++ news2rss-0.91.xslt 6 Nov 2003 14:11:21 -0000 1.3 @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:n="http://www.betaversion.org/linotype/news/1.0" - xmlns:h="http://www.w3.org/1999/xhtml" -> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0" + xmlns:h="http://www.w3.org/1999/xhtml"> <xsl:param name="home"/> <xsl:param name="count"/> <xsl:template match="/"> <rss version="0.91"> - <channel> + <channel> <title>Stefano's Linotype</title> <link>http://www.betaversion.org/~stefano/linotype/</link> <description>Stefano Mazzocchi's Weblog</description> @@ -24,8 +22,8 @@ <xsl:template match="n:news"> <item> <title><xsl:value-of select="n:title"/></title> - <link><xsl:value-of select="$home"/>/<xsl:value-of select="../@id"/>/</link> - <description><xsl:apply-templates select="h:body"/></description> + <link><xsl:value-of select="$home"/>/<xsl:value-of select="../@id"/>/</link> + <description><xsl:apply-templates select="h:body"/></description> </item> </xsl:template> 1.4 +4 -6 cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-2.0.xslt Index: news2rss-2.0.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/news2rss-2.0.xslt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- news2rss-2.0.xslt 24 Aug 2003 17:52:03 -0000 1.3 +++ news2rss-2.0.xslt 6 Nov 2003 14:11:21 -0000 1.4 @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:n="http://www.betaversion.org/linotype/news/1.0" - xmlns:h="http://www.w3.org/1999/xhtml" - xmlns:dc="http://purl.org/dc/elements/1.1/" -> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:n="http://www.betaversion.org/linotype/news/1.0" + xmlns:h="http://www.w3.org/1999/xhtml" + xmlns:dc="http://purl.org/dc/elements/1.1/"> <xsl:param name="home"/> <xsl:param name="count"/> 1.3 +5 -6 cocoon-2.1/src/blocks/linotype/samples/stylesheets/request2news.xslt Index: request2news.xslt =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/linotype/samples/stylesheets/request2news.xslt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- request2news.xslt 19 Jun 2003 04:20:32 -0000 1.2 +++ request2news.xslt 6 Nov 2003 14:11:21 -0000 1.3 @@ -1,11 +1,10 @@ <?xml version="1.0"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:r="http://apache.org/cocoon/request/2.0" - xmlns:h="http://www.w3.org/1999/xhtml" - xmlns="http://www.w3.org/1999/xhtml" - exclude-result-prefixes="h r"> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:r="http://apache.org/cocoon/request/2.0" + xmlns:h="http://www.w3.org/1999/xhtml" + xmlns="http://www.w3.org/1999/xhtml" + exclude-result-prefixes="h r"> <xsl:template match="/"> <xsl:apply-templates select="//r:requestParameters"/>