@@ -1,24 +1,33 @@ -<div id="container"> - <div id="header"> - <h1><a href="/">Nuki</a></h1> - <h2>A pure-Nu wiki.</h2> - <div id="menu"> - <ul> - <li><a href="/">FrontPage</a></li> - <li><a href="<%= "/#{@path}" %>">Back to <%= @path %></a></li> - <li><a href="/pages">List of pages</a></li> - </ul> - </div> - </div> - <div id="content"> - <form action=<%= "/#{@path}/edit" %> method="post"> - <label for="contents">Page contents: </label> - <textarea name="contents" rows=35 cols=75><%= (@page contents) %></textarea> <br/> - <label for="description">Describe your changes here: <input type="text" name="description" maxlength="50"/> - <input type="submit" value="Commit"/> <br/> <input type="reset"/> - </form> - </div> - <div id="footer"> - <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> - </div> -</div> \ No newline at end of file +<html> +<head> + <title>Nuki!</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <link href="/nuki.css" media="all" rel="Stylesheet" type="text/css"/> +</head> +<body> + <div id="container"> + <div id="header"> + <h1><a href="/">Nuki</a></h1> + <h2>A pure-Nu wiki.</h2> + <div id="menu"> + <ul> + <li><a href="/">FrontPage</a></li> + <li><a href="<%= "/#{%path}" %>">Back to <%= %path %></a></li> + <li><a href="/pages">List of pages</a></li> + </ul> + </div> + </div> + <div id="content"> + <form action=<%= "/#{%path}/edit" %> method="post"> + <label for="contents">Page contents: </label> + <textarea name="contents" rows=35 cols=75><%= (@page contents) %></textarea> <br/> + <label for="description">Describe your changes here: <input type="text" name="description" maxlength="50"/> + <input type="submit" value="Commit"/> <br/> <input type="reset"/> + </form> + </div> + <div id="footer"> + <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> + </div> + </div> + </body> + </html> \ No newline at end of file site/edit.nhtml @@ -1,25 +1,33 @@ -<div id="container"> - <div id="header"> - <h1><a href="/">Nuki</a></h1> - <h2>A pure-Nu wiki.</h2> - <div id="menu"> - <ul> - <li><a href="/">FrontPage</a></li> - <li><a href="/<%= @path %>/edit">Edit <%= @path %></a></li> - <li><a href="/pages">List of pages</a></li> - </ul> - </div> - </div> - <div id="content"> - <% (if @allRevisions %> - <% (@allRevisions each: (do (hash) %> - Rev <a href="/<%= @path %>/history/<%= hash %>"><%= (hash abbreviatedString: 5) %></a> - (<a href="/<%= @path %>/history/<%= hash %>/edit">Edit</a>)<br> <% )) %> - <% (else %> - Since the page <%= @path %> doesn't exist yet, it has no history. - <% )) %> - </div> - <div id="footer"> - <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> - </div> -</div> \ No newline at end of file +<html> +<head> + <title>Nuki!</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <link href="/nuki.css" media="all" rel="Stylesheet" type="text/css"/> +</head> +<body> + <div id="container"> + <div id="header"> + <h1><a href="/">Nuki</a></h1> + <h2>A pure-Nu wiki.</h2> + <div id="menu"> + <ul> + <li><a href="/">FrontPage</a></li> + <li><a href="/<%= %path %>/edit">Edit <%= %path %></a></li> + <li><a href="/pages">List of pages</a></li> + </ul> + </div> + </div> + <div id="content"> + <% (if @allRevisions %> + <% (@allRevisions each: (do (hash) %> + Rev <a href="/<%= %path %>/history/<%= hash %>"><%= (hash abbreviatedString: 5) %></a> + (<a href="/<%= %path %>/history/<%= hash %>/edit">Edit</a>)<br> <% )) %> + <% (else %> + Since the page <%= %path %> doesn't exist yet, it has no history. + <% )) %> + </div> + <div id="footer"> + <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> + </div> + </div> +</body> \ No newline at end of file site/history.nhtml @@ -1,19 +1,28 @@ -<div id="container"> - <div id="header"> - <h1><a href="/">Nuki</a></h1> - <h2>A pure-Nu wiki.</h2> - <div id="menu"> - <ul> - <li><a href="/">FrontPage</a></li> - </ul> - </div> - </div> - <div id="content"> - <% (@pages each: (do (page) %> - <%= (link-to-page page) %> <br> - <% )) %> - </div> - <div id="footer"> - <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> - </div> -</div> \ No newline at end of file +<html> +<head> + <title>Nuki!</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <link href="/nuki.css" media="all" rel="Stylesheet" type="text/css"/> +</head> +<body> + <div id="container"> + <div id="header"> + <h1><a href="/">Nuki</a></h1> + <h2>A pure-Nu wiki.</h2> + <div id="menu"> + <ul> + <li><a href="/">FrontPage</a></li> + </ul> + </div> + </div> + <div id="content"> + <%= %silly %> + <% (%pages each: (do (page) %> + <%= (link-to-page page) %> <br> + <% )) %> + </div> + <div id="footer"> + <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> + </div> + </div> +</body> \ No newline at end of file site/listpages.nhtml @@ -1,31 +1,31 @@ <html> - <head> - <title>Nuki!</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link href="/nuki.css" media="all" rel="Stylesheet" type="text/css"/> - </head> - <body> - <div id="container"> - <div id="header"> - <div style="float:right; margin-right:10px"> - </div> - <h1><a href="/">Nuki</a></h1> - <h2>A pure-Nu wiki.</h2> - <div id="menu"> - <ul> - <li><a href="/">FrontPage</a></li> - <li><a href="/<%= @path %>/edit">Edit <%= @path %></a></li> - <li><a href="/<%= @path %>/history">History</a></li> - <li><a href="/pages">List of pages</a></li> - </ul> - </div> - </div> - <div id="content"> - <%= (display-page @page) %> - </div> - <div id="footer"> - <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> - </div> +<head> + <title>Nuki!</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <link href="/nuki.css" media="all" rel="Stylesheet" type="text/css"/> +</head> +<body> + <div id="container"> + <div id="header"> + <div style="float:right; margin-right:10px"> + </div> + <h1><a href="/">Nuki</a></h1> + <h2>A pure-Nu wiki.</h2> + <div id="menu"> + <ul> + <li><a href="/">FrontPage</a></li> + <li><a href="/<%= %path %>/edit">Edit <%= %path %></a></li> + <li><a href="/<%= %path %>/history">History</a></li> + <li><a href="/pages">List of pages</a></li> + </ul> + </div> </div> - </body> + <div id="content"> + <%= (display-page %page) %> + </div> + <div id="footer"> + <p>© 2007 <a href="http://importantshock.wordpress.com">Patrick Thomson</a>. A <a href="http://programming.nu">Nu™</a> thing.</p> + </div> + </div> +</body> </html> \ No newline at end of file site/page.nhtml @@ -2,53 +2,53 @@ ;; @discussion Handlers for HTTP requests. (get "/" - (self redirectResponse: request toLocation: "/FrontPage")) + ; Bug occurs if the first parameter to this method is not defined? + (Nunja redirectResponse:REQUEST toLocation:"/FrontPage")) -(get "/pages" - - (set @pages ($session allBlobs)) +(get /\/pages/ + (set %silly (MATCH groupAtIndex: 0)) + (set %pages ($session allBlobs)) (eval (template-named "listpages"))) (get /\/(\w*)/ - - (set @path (TITLE lastPathComponent)) - (set @page ($session fetchBlob: @path)) + (set %path ((MATCH string) lastPathComponent)) + (set %page ($session fetchBlob: %path)) (eval (template-named "page"))) (get /\/(\w*)\/edit/ - (set @path (TITLE pathComponent: 1)) - (set @page ($session fetchBlob: @path)) + (set %path (TITLE pathComponent: 1)) + (set %page ($session fetchBlob: %path)) (eval (template-named "edit"))) (post /\/(\w*)\/edit/ - (set @path (TITLE pathComponent: 1)) - (set @page ($session createBlob:@path withContents:((request post) "contents"))) - (set @message ((request post) "description")) - (unless @message (set @message "Automatically-generated commit from Nuki.")) - ($session commitWithMessage: @message) - (self redirectResponse: request toLocation: "/#{@path}")) + (set %path (TITLE pathComponent: 1)) + (set %page ($session createBlob:%path withContents:((request post) "contents"))) + (set %message ((request post) "description")) + (unless %message (set %message "Automatically-generated commit from Nuki.")) + ($session commitWithMessage: %message) + (Nunja redirectResponse: request toLocation: "/#{%path}")) (get /\/(\w*)\/history/ - (set @path (TITLE pathComponent: 1)) - (set @page ($session fetchBlob: @path)) - (set @allRevisions (@page revisionHashes)) + (set %path (TITLE pathComponent: 1)) + (set %page ($session fetchBlob: %path)) + (set %allRevisions (%page revisionHashes)) (eval (template-named "history"))) (get /\/(\w*)\/history\/(\w*)/ - (set @path (TITLE pathComponent: 1)) - (set @revision (TITLE pathComponent: 3)) - (set @page ($session fetchBlob: @path)) - (@page setContents: (@page contentsForRevisionHash: @revision)) + (set %path (TITLE pathComponent: 1)) + (set %revision (TITLE pathComponent: 3)) + (set %page ($session fetchBlob: %path)) + (%page setContents: (%page contentsForRevisionHash: %revision)) (eval (template-named "page"))) (get /\/(\w*)\/history\/(\w*)\/edit/ - (set @path (TITLE pathComponent: 1)) - (set @revision (TITLE pathComponent: 3)) - (set @page ($session fetchBlob: @path)) - (@page setContents: (@page contentsForRevisionHash: @revision)) + (set %path (TITLE pathComponent: 1)) + (set %revision (TITLE pathComponent: 3)) + (set %page ($session fetchBlob: %path)) + (%page setContents: (%page contentsForRevisionHash: %revision)) (eval (template-named "edit"))) \ No newline at end of file site/site.nu eaa85613f80bdc7d556b62f88561e33809921b25 Patrick Thomson ironswallow@gmail.com http://github.com/patrickt/nuki/commit/844657146455ae4f495f40e495165cb15826e75c 844657146455ae4f495f40e495165cb15826e75c

2008-08-22T18:32:09-07:00

Converted what were instance variables to variables using % as a prefix. May replace this or hack Nunja somehow. bca23ac5bc00a3e910a7cb6e55212db53d655140 Patrick Thomson ironswallow@gmail.com