1--- a/bin/.wiki Sun Jul 25 22:23:58 2010 +0000
2+++ b/bin/.wiki Tue Aug 03 02:35:58 2010 +0000
3@@ -35,7 +35,7 @@
4 <p>test</p><p>test</p>
5
6 >>> parse(u'test\\\\test')
7-<p>test<br>test</p>
8+<p>test<br/>test</p>
9
10 >>> parse(u'----')
11 <hr>
12@@ -262,7 +262,7 @@
13 raise NotImplementedError
14
15 def break_emit(self, node):
16- return u"<br>"
17+ return u"<br/>"
18
19 def preformatted_emit(self, node):
20 return u"<pre>%s</pre>" % node.content
2.1--- a/bin/list Sun Jul 25 22:23:58 2010 +0000
2.2+++ b/bin/list Tue Aug 03 02:35:58 2010 +0000
2.3@@ -1,19 +1,18 @@
2.4 #!/usr/bin/env .wiki
2.5 = Hackiki page list
2.6
2.7-<ul>
2.8 {{{
2.9 #!/bin/bash
2.10+echo '<ul>'
2.11 ls -1a bin | awk '/.+/ { print "<li><a href=\"" $0 "\">" $0 "</a> <a href=\"'$HACKIKI_BASE'/medit/bin/" $0 "\">[edit]</a></li>" }'
2.12+echo '</ul>'
2.13+
2.14+echo '<form action="'$HACKIKI_BASE'/medit" method="get">
2.15+ <fieldset>
2.16+ New page:
2.17+ <input type="hidden" name="arg1" value="bin" />
2.18+ <input type="text" name="arg2" />
2.19+ <input type="submit" value="Create" />
2.20+ </fieldset>
2.21+</form>'
2.22 }}}
2.23-</ul>
2.24-
2.25-{{{
2.26-#!/bin/sh
2.27-echo '<form action="'$HACKIKI_BASE'/medit" method="get">'
2.28-}}}
2.29- New page:
2.30- <input type="hidden" name="arg1" value="bin" />
2.31- <input type="text" name="arg2" />
2.32- <input type="submit" value="Create" />
2.33-</form>
3.1--- a/bin/mlogin Sun Jul 25 22:23:58 2010 +0000
3.2+++ b/bin/mlogin Tue Aug 03 02:35:58 2010 +0000
3.3@@ -3,7 +3,7 @@
3.4
3.5 This page allows you to log in to this wiki via a variety of popular online services:
3.6
3.7-* <form action="?" method="post" style="display: inline"><input type="hidden" name="openidTryAuth" /><input type="text" name="login" /><input type="submit" value="Log in with OpenID" /></form>
3.8+* <form action="?" method="post" style="display: inline"><fieldset><input type="hidden" name="openidTryAuth" /><input type="text" name="login" /><input type="submit" value="Log in with OpenID" /></fieldset></form>
3.9 ** See http://openid.net/get-an-openid/ for information on getting an OpenID (you probably already have one!)
3.10 * [[?openidTryAuth&login=https://www.google.com/accounts/o8/id|Google]]
3.11 * [[?openidTryAuth&login=http://yahoo.com/|Yahoo]]
4.1--- a/bin/runner Sun Jul 25 22:23:58 2010 +0000
4.2+++ b/bin/runner Tue Aug 03 02:35:58 2010 +0000
4.3@@ -12,10 +12,12 @@
4.4
4.5 {{{
4.6 #!/bin/sh
4.7-echo '<form action="'$HACKIKI_BASE'/runner" method="post">'
4.8+echo '<form action="'$HACKIKI_BASE'/runner" method="post">
4.9+ <fieldset>
4.10+ <input type="text" name="cmd" />
4.11+ <input type="submit" value="Run" />
4.12+ </fieldset>
4.13+</form>'
4.14 }}}
4.15-<input type="text" name="cmd" />
4.16-<input type="submit" value="Run" />
4.17-</form>
4.18
4.19 [[index | Wiki index]]
5.1--- a/bin/upload Sun Jul 25 22:23:58 2010 +0000
5.2+++ b/bin/upload Tue Aug 03 02:35:58 2010 +0000
5.3@@ -1,2 +1,2 @@
5.4 #!/usr/bin/env .wiki
5.5-This wiki does not allow uploads.
5.6\ No newline at end of file
5.7+This wiki does not allow uploads.
6.1--- a/bin/uploadimage Sun Jul 25 22:23:58 2010 +0000
6.2+++ b/bin/uploadimage Tue Aug 03 02:35:58 2010 +0000
6.3@@ -11,7 +11,9 @@
6.4 fi
6.5
6.6 echo '<form action="'$HACKIKI_BASE'/uploadimage" method="post" enctype="multipart/form-data">
6.7-<input type="file" name="upload" /><br/>
6.8-<input type="submit" value="Upload" />
6.9+ <fieldset>
6.10+ <input type="file" name="upload" /><br/>
6.11+ <input type="submit" value="Upload" />
6.12+ </fieldset>
6.13 </form>'
6.14 }}}
7.1--- a/etc/permissions Sun Jul 25 22:23:58 2010 +0000
7.2+++ b/etc/permissions Tue Aug 03 02:35:58 2010 +0000
7.3@@ -1,3 +1,4 @@
7.4+<<<<<<< local
7.5 group administrators codu.org
7.6 regexgroup noneditor #!(?!edit$)(?!medit$).*
7.7
7.8@@ -14,3 +15,5 @@
7.9 script .* administrators w
7.10 script /usr/bin/env\ .wiki all w
7.11 script .* anonymous r
7.12+=======
7.13+>>>>>>> other
8.1--- a/lib/python/creole.py Sun Jul 25 22:23:58 2010 +0000
8.2+++ b/lib/python/creole.py Tue Aug 03 02:35:58 2010 +0000
8.3@@ -397,4 +397,3 @@
8.4 self.content = content
8.5 if self.parent is not None:
8.6 self.parent.children.append(self)
8.7-
9.1--- a/lib/python/hackikilogin.py Sun Jul 25 22:23:58 2010 +0000
9.2+++ b/lib/python/hackikilogin.py Tue Aug 03 02:35:58 2010 +0000
9.3@@ -4,5 +4,5 @@
9.4 if os.environ.has_key("HACKIKI_AUTH_DISPLAY"):
9.5 login = "<span class=\"dark\">You are logged in as %s</span> - <a href=\"%s/?openidLogOff\">Log off</a> -" % (os.environ["HACKIKI_AUTH_DISPLAY"], os.environ["HACKIKI_BASE"])
9.6 else:
9.7- login = "<form action=\"%s/\" method=\"get\" style=\"display: inline\"><input type=\"hidden\" name=\"openidTryAuth\" /><input type=\"text\" name=\"login\" /><input type=\"submit\" value=\"Log in using OpenID\" /></form> -" % (os.environ["HACKIKI_BASE"])
9.8+ login = "<form action=\"%s/\" method=\"get\" style=\"display: inline\"><fieldset><input type=\"hidden\" name=\"openidTryAuth\" /><input type=\"text\" name=\"login\" /><input type=\"submit\" value=\"Log in using OpenID\" /></fieldset></form> -" % (os.environ["HACKIKI_BASE"])
9.9 return login
10.1--- a/templates/edit.html Sun Jul 25 22:23:58 2010 +0000
10.2+++ b/templates/edit.html Tue Aug 03 02:35:58 2010 +0000
10.3@@ -1,3 +1,6 @@
10.4+<?xml version="1.0" encoding="utf-8" ?>
10.5+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
10.6+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
10.7 <html>
10.8 <head>
10.9 <title>Codu Wiki - Editing %(name)s</title>
11.1--- a/templates/wiki.css Sun Jul 25 22:23:58 2010 +0000
11.2+++ b/templates/wiki.css Tue Aug 03 02:35:58 2010 +0000
11.3@@ -24,4 +24,4 @@
11.4 div#bottombar {
11.5 font-size: 0.75em;
11.6 text-align: right;
11.7-}
11.8\ No newline at end of file
11.9+}
12.1--- a/templates/wiki.html Sun Jul 25 22:23:58 2010 +0000
12.2+++ b/templates/wiki.html Tue Aug 03 02:35:58 2010 +0000
12.3@@ -1,3 +1,6 @@
12.4+<?xml version="1.0" encoding="utf-8" ?>
12.5+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
12.6+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
12.7 <html>
12.8 <head>
12.9 <title>Codu Wiki - %(title)s</title>
13.1--- a/templates/wikimobile.css Sun Jul 25 22:23:58 2010 +0000
13.2+++ b/templates/wikimobile.css Tue Aug 03 02:35:58 2010 +0000
13.3@@ -58,3 +58,7 @@
13.4 background-color: #FFFFFF;
13.5 padding: 2em 0.5em 0px 0.5em;
13.6 }
13.7+
13.8+fieldset {
13.9+ border: 0px
13.10+}
13.11\ No newline at end of file
14.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2+++ b/bin/css Tue Aug 03 02:35:58 2010 +0000
14.3@@ -0,0 +1,5 @@
14.4+#!/bin/bash
14.5+echo 'headers
14.6+Content-type: text/css
14.7+'
14.8+cat "$1"
14.9\ No newline at end of file
