Date: Sunday December 29, 2002 @ 17:46
Author: matt
Update of /home/cvs/AxKit-XSP-Wiki/webstuff
In directory ted.sergeant.org:/home/matt/Perl/AxKit-XSP-Wiki/webstuff
Modified Files:
.htaccess docbook.xsl pod.xsl wiki.xsl wikitext.xsl
Log Message:
Merged current live
Log:
PR:
Index: .htaccess
===================================================================
RCS file: /home/cvs/AxKit-XSP-Wiki/webstuff/.htaccess,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -r1.3 -r1.4
--- .htaccess 2002/06/21 15:42:06 1.3
+++ .htaccess 2002/12/29 17:46:32 1.4
@@ -5,10 +5,22 @@
AxGzipOutput Off
-AxDebugLevel 0
+AxDebugLevel 7
+<Perl>
+use lib '.';
+</Perl>
+
+AxAddXSPTaglib AxKit::XSP::Session
+AxAddXSPTaglib AxKit::XSP::PerForm
+AxAddXSPTaglib AxKit::XSP::Util
AxAddXSPTaglib AxKit::XSP::Wiki
AxAddRootProcessor application/x-xsp NULL xspwiki
AxAddRootProcessor text/xsl wiki.xsl xspwiki
+AxTraceIntermediate /tmp/axkit-trace
+
+<Files *.css>
+SetHandler default-handler
+</Files>
Index: docbook.xsl
===================================================================
RCS file: /home/cvs/AxKit-XSP-Wiki/webstuff/docbook.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -r1.1 -r1.2
--- docbook.xsl 2002/06/21 15:44:16 1.1
+++ docbook.xsl 2002/12/29 17:46:32 1.2
@@ -2,13 +2,13 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <xsl:template match="article">
+<xsl:template match="article">
<xsl:apply-templates mode="docbook"/>
- </xsl:template>
+</xsl:template>
- <xsl:template match="abstract" mode="docbook">
+<xsl:template match="abstract" mode="docbook">
- </xsl:template>
+</xsl:template>
<xsl:template match="section" mode="docbook">
<div class="section">
@@ -25,13 +25,14 @@
<xsl:element name="h{number( count(ancestor-or-self::section) + 1)}">
<a name="{translate(title, ' -)(?:
', '')}">
- <xsl:value-of select="title"/>
+ <xsl:apply-templates mode="docbook" select="title"/>
</a>
</xsl:element>
- <xsl:apply-templates mode="docbook"/>
+ <xsl:apply-templates mode="docbook" select="*[local-name() != 'title']"/>
</div>
+ <hr/>
</xsl:template>
<xsl:template match="para" mode="docbook">
@@ -61,7 +62,7 @@
<xsl:template match="ulink" mode="docbook">
<a href="{@url}">
<xsl:apply-templates mode="docbook"/>
- </a>
+ </a><img src="/img/out.png"/>
</xsl:template>
<xsl:template match="xref" mode="docbook">
@@ -142,7 +143,20 @@
<xsl:apply-templates mode="docbook"/>
</xsl:template>
-<xsl:template match="title|/article/articleinfo/*" mode="docbook"></xsl:template>
+<xsl:template match="section/title" mode="docbook">
+ <xsl:apply-templates mode="docbook"/>
+</xsl:template>
+
+<xsl:template match="article/title" mode="docbook">
+ <h1>
+ <xsl:apply-templates mode="docbook"/>
+ </h1>
+ <hr/>
+</xsl:template>
+
+<xsl:template match="title" mode="docbook"></xsl:template>
+
+<xsl:template match="/article/articleinfo/*" mode="docbook"></xsl:template>
<!-- end core sdocbook elements -->
</xsl:stylesheet>
\ No newline at end of file
Index: pod.xsl
===================================================================
RCS file: /home/cvs/AxKit-XSP-Wiki/webstuff/pod.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -r1.3 -r1.4
--- pod.xsl 2002/06/21 15:42:06 1.3
+++ pod.xsl 2002/12/29 17:46:32 1.4
@@ -17,11 +17,18 @@
</xsl:template>
<xsl:template match="link" mode="pod">
+ <xsl:choose>
+ <xsl:when test='string-length(@section) and not( string-length(@page) )'>
+ <a href="#{@section}"><xsl:apply-templates mode="pod"/></a>
+ </xsl:when>
+ <xsl:otherwise>
<a href="./{@page}#{@section}"><xsl:apply-templates mode="pod"/></a>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match="xlink" mode="pod">
- <a href="{@href}"><xsl:apply-templates mode="pod"/></a>
+ <a href="{@href}"><xsl:apply-templates mode="pod"/></a><img src="/img/out.png"/>
</xsl:template>
<xsl:template match="head1" mode="pod">
@@ -72,4 +79,8 @@
<i><xsl:apply-templates mode="pod"/></i>
</xsl:template>
+<xsl:template match="F" mode="pod">
+ <literal><xsl:apply-templates mode="pod"/></literal>
+</xsl:template>
+
</xsl:stylesheet>
\ No newline at end of file
Index: wiki.xsl
===================================================================
RCS file: /home/cvs/AxKit-XSP-Wiki/webstuff/wiki.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -r1.3 -r1.4
--- wiki.xsl 2002/06/21 15:42:06 1.3
+++ wiki.xsl 2002/12/29 17:46:32 1.4
@@ -7,6 +7,7 @@
<xsl:include href="pod.xsl"/>
<xsl:include href="wikitext.xsl"/>
<xsl:include href="docbook.xsl"/>
+<xsl:include href="sidemenu.xsl"/>
<xsl:output method="html"/>
@@ -15,35 +16,67 @@
<xsl:template match="/">
<html>
<head>
- <title><xsl:value-of select="/xspwiki/title"/></title>
+ <title><xsl:value-of select="/xspwiki/page"/></title>
+ <link rel="Stylesheet" href="/wiki/wiki.css"
+ type="text/css" media="screen" />
</head>
<body>
- <table width="100%">
- <tr>
- <td width="5"> </td>
- <td align="center"><h3><a href="/">~ My Wiki ~</a></h3></td>
- </tr>
- <tr>
- <td width="5"> </td><td>
+ <div class="topbanner">
+ <a href="http://xml.apache.org/";><img src="/img/xmlapache.gif"
+border="0"/></a>
+ AxKit Wiki
+ </div>
+ <div class="base">
+ <table><tr><td valign="top" width="160">
+ <div class="sidemenu">
+ <xsl:apply-templates select="document('/wiki/sidemenu.xml')"
+mode="sidemenu"/>
+ </div></td><td valign="top" width="80%">
+ <div class="maincontent">
+ <div class="breadcrumbs">
+ <a href="/">AxKit</a> :: <a href="DefaultPage">Wiki</a> :: <xsl:value-of
+select="/xspwiki/page"/>
+ </div>
+ <div class="line"/>
+ <div class="content">
+ <xsl:choose>
+ <xsl:when test="$action='historypage'">
+ <h1>History View</h1>
+ <div class="ipaddress">IP: <xsl:value-of
+select="/xspwiki/processing-instruction('ip-address')"/></div>
+ <div class="date">Date: <xsl:value-of
+select="/xspwiki/processing-instruction('modified')"/></div>
+ <div class="line"> </div>
+ </xsl:when>
+ </xsl:choose>
<xsl:apply-templates/>
<xsl:choose>
<xsl:when test="$action='view'">
- <hr/>
- <a href="./{/xspwiki/page}?action=edit">Edit This Page</a>
+ <div class="line"> </div>
+ <a href="./{/xspwiki/page}?action=edit">Edit This Page</a> / <a
+href="./{/xspwiki/page}?action=history">Show Page History</a>
</xsl:when>
<xsl:when test="$action='edit'">
+ <div class="line"> </div>
<p><a href="EditTips">EditTips</a></p>
</xsl:when>
+ <xsl:when test="$action='historypage'">
+ <div class="line"> </div>
+ <form action="./{/xspwiki/page}" method="POST">
+ <input type="hidden" name="action" value="restore"/>
+ <input type="hidden" name="id" value="{$id}"/>
+ <input type="submit" name="Submit" value="Restore This Version"/>
+ </form>
+ </xsl:when>
+ <xsl:when test="$action='history'">
+ <div class="line"> </div>
+ </xsl:when>
<xsl:otherwise>
Other Mode?
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- </table>
+
+ </div> <!-- content -->
+ </div> <!-- maincontent -->
+ </td></tr></table>
+ </div> <!-- base -->
</body>
</html>
@@ -84,13 +117,42 @@
</option>
</xsl:template>
-<xsl:template match="node()|@*">
+<xsl:template match="history">
+ <h1>History for <xsl:value-of select="/xspwiki/page"/></h1>
+ <table>
+ <tr><th>Date</th><th>IP Address</th><th>Bytes</th></tr>
+ <xsl:apply-templates select="./entry"/>
+ </table>
+</xsl:template>
+
+<xsl:template match="history/entry">
+ <tr>
+ <xsl:apply-templates/>
+ </tr>
+</xsl:template>
+
+<xsl:template match="history/entry/id">
+</xsl:template>
+
+<xsl:template match="history/entry/modified">
+ <td><a
+href="./{/xspwiki/page}?action=historypage;id={../id}"><xsl:apply-templates/></a></td>
+</xsl:template>
+
+<xsl:template match="history/entry/ip-address">
+ <td><xsl:apply-templates/></td>
+</xsl:template>
+
+<xsl:template match="history/entry/bytes">
+ <td><xsl:apply-templates/></td>
+</xsl:template>
+
<!-- useful for testing - commented out for live
+<xsl:template match="node()|@*">
<xsl:copy>
<xsl:apply-templates select="@*"/>
<xsl:apply-templates/>
</xsl:copy>
--->
</xsl:template>
+-->
</xsl:stylesheet>
\ No newline at end of file
Index: wikitext.xsl
===================================================================
RCS file: /home/cvs/AxKit-XSP-Wiki/webstuff/wikitext.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -r1.1 -r1.2
--- wikitext.xsl 2002/06/21 15:44:16 1.1
+++ wikitext.xsl 2002/12/29 17:46:32 1.2
@@ -14,6 +14,9 @@
<xsl:template match="link" mode="wiki">
<a href="{@href}"><xsl:apply-templates mode="wiki"/></a>
+ <xsl:if test="contains(@href, 'http:')">
+ <img src="/img/out.png"/>
+ </xsl:if>
</xsl:template>
<xsl:template match="strong" mode="wiki">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
