Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to align with 1.3.0 #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changes to align with 1.3.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5649d1
Couple of small changes to allign with Noir 1.3.0 and Hiccup 1.0.0 betas
zoka Mar 30, 2012
ea91323
gitignore updated for lein 2
zoka Mar 30, 2012
efe78d3
removed Jedit ignore
zoka Mar 30, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
*~
#blog database - remove it to have blogs saved in git
sdb.db
#lein 2.0
/target/
# lein 1.x
pom.xml
*jar
/lib/
/classes/
.lein-deps-sum
sdb.db
.lein-failures

2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
:description "A fully functional blog that serves an example of a noir project."
:dependencies [[org.clojure/clojure "1.3.0"]
[clj-time "0.3.7"]
[noir "1.2.2"]
[noir "1.3.0-beta2"]
[org.markdownj/markdownj "0.3.0-1.0.2b4"]
[simpledb "0.1.4"]]
:main noir-blog.server)
Expand Down
4 changes: 2 additions & 2 deletions src/noir_blog/views/admin.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(ns noir-blog.views.admin
(:use noir.core
hiccup.core
hiccup.page-helpers
hiccup.form-helpers)
hiccup.element
hiccup.form)
(:require [noir.session :as session]
[noir.validation :as vali]
[noir.response :as resp]
Expand Down
2 changes: 1 addition & 1 deletion src/noir_blog/views/blog.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns noir-blog.views.blog
(:use noir.core
hiccup.core
hiccup.page-helpers)
hiccup.element)
(:require [noir-blog.models.post :as posts]
[noir-blog.views.common :as common]
[noir-blog.models.user :as user]
Expand Down
3 changes: 2 additions & 1 deletion src/noir_blog/views/common.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(ns noir-blog.views.common
(use noir.core
hiccup.core
hiccup.page-helpers))
hiccup.page
hiccup.element))

;; Links and includes
(def main-links [{:url "/blog/admin" :text "Admin"}])
Expand Down