pages @@ -20,7 +20,7 @@ <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/> + <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> site/edit.nhtml @@ -16,7 +16,6 @@ </div> </div> <div id="content"> - <%= %silly %> <% (%pages each: (do (page) %> <%= (link-to-page page) %> <br> <% )) %> site/listpages.nhtml @@ -1,12 +1,11 @@ ;; @file site.nu -;; @discussion Handlers for HTTP requests. +;; @discussion Handlers for HTTP REQUESTs. (get "/" ; Bug occurs if the first parameter to this method is not defined? (Nunja redirectResponse:REQUEST toLocation:"/FrontPage")) (get /\/pages/ - (set %silly (MATCH groupAtIndex: 0)) (set %pages ($session allBlobs)) (eval (template-named "listpages"))) @@ -17,38 +16,38 @@ (get /\/(\w*)\/edit/ - (set %path (TITLE pathComponent: 1)) + (set %path ((MATCH string) 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")) + (set %path ((MATCH string) 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}")) + (Nunja redirectResponse: REQUEST toLocation: "/#{%path}")) (get /\/(\w*)\/history/ - (set %path (TITLE pathComponent: 1)) + (set %path ((MATCH string) 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 %path ((MATCH string) pathComponent: 1)) + (set %revision ((MATCH string) 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 %path ((MATCH string) pathComponent: 1)) + (set %revision ((MATCH string) 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 pages/.DS_Store pages/About pages/FrontPage 844657146455ae4f495f40e495165cb15826e75c Patrick Thomson ironswallow@gmail.com http://github.com/patrickt/nuki/commit/f0ba557a6b1f0a08de93ec70ced38d4ed99f5a8d f0ba557a6b1f0a08de93ec70ced38d4ed99f5a8d 2008-08-22T18:44:25-07:00 2008-08-22T18:44:25-07:00 Renabled the editing facilities. 12a93e93e30cf135da05a86728a64c6888216b62 Patrick Thomson ironswallow@gmail.com