Permalink
Browse files

Merge branch 'master' of github.com:ibdknox/Noir-blog

Conflicts:
	src/noir_blog/views/common.clj
  • Loading branch information...
2 parents 27a1b75 + ed2e406 commit 227cee63e09340d3d3e95616e8a6c99e4e4be1c3 @ibdknox ibdknox committed Jun 26, 2011
Showing with 9 additions and 10 deletions.
  1. +1 −1 project.clj
  2. +5 −5 src/noir_blog/views/admin.clj
  3. +3 −4 src/noir_blog/views/common.clj
View
@@ -2,7 +2,7 @@
:description "A fully functional blog that serves an example of a noir project."
:dependencies [[org.clojure/clojure "1.2.1"]
[clj-time "0.3.0"]
- [noir "0.4.0"]
+ [noir "1.0.0"]
[org.markdownj/markdownj "0.3.0-1.0.2b4"]
[simpledb "0.1.4"]]
:main noir-blog.server)
@@ -58,7 +58,7 @@
(defpage [:post "/blog/login"] {:as user}
(if (users/login! user)
- (resp/redirect "/blog/admin/")
+ (resp/redirect "/blog/admin")
(render "/blog/login" user)))
(defpage "/blog/logout" {}
@@ -67,7 +67,7 @@
;; Post pages
-(defpage "/blog/admin/" {}
+(defpage "/blog/admin" {}
(common/admin-layout
[:ul.actions
(map action-item post-actions)]
@@ -84,7 +84,7 @@
(defpage [:post "/blog/admin/post/add"] {:as post}
(if (posts/add! post)
- (resp/redirect "/blog/admin/")
+ (resp/redirect "/blog/admin")
(render "/blog/admin/post/add" post)))
(defpage "/blog/admin/post/edit/:id" {:keys [id]}
@@ -99,12 +99,12 @@
(defpage [:post "/blog/admin/post/edit/:id"] {:keys [id] :as post}
(if (posts/edit! post)
- (resp/redirect "/blog/admin/")
+ (resp/redirect "/blog/admin")
(render (str "/blog/admin/post/edit/" id) post)))
(defpage "/blog/admin/post/remove/:id" {:keys [id]}
(posts/remove! id)
- (resp/redirect "/blog/admin/"))
+ (resp/redirect "/blog/admin"))
;; User pages
@@ -4,11 +4,10 @@
hiccup.page-helpers))
;; Links and includes
-
-(def main-links [{:url "/blog/admin/" :text "Admin"}])
+(def main-links [{:url "/blog/admin" :text "Admin"}])
(def admin-links [{:url "/blog/" :text "Blog"}
- {:url "/blog/admin/" :text "Posts"}
+ {:url "/blog/admin" :text "Posts"}
{:url "/blog/admin/users" :text "Users"}
{:url "/blog/logout" :text "Logout"}])
@@ -49,7 +48,7 @@
[:div#wrapper
[:div.content
[:div#header
- [:h1 (link-to "/blog/admin/" "Admin")]
+ [:h1 (link-to "/blog/admin" "Admin")]
[:ul.nav
(map link-item admin-links)]]
content]]]))

0 comments on commit 227cee6

Please sign in to comment.