From b5649d1a357ac62b3c2c1e541f623f54ef909774 Mon Sep 17 00:00:00 2001
From: zoka <ztomicic@gmail.com>
Date: Fri, 30 Mar 2012 18:29:30 +1100
Subject: [PATCH 1/3] Couple of small changes to allign with Noir 1.3.0 and
 Hiccup 1.0.0 betas

---
 project.clj                    | 2 +-
 src/noir_blog/views/admin.clj  | 4 ++--
 src/noir_blog/views/blog.clj   | 2 +-
 src/noir_blog/views/common.clj | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/project.clj b/project.clj
index 0e2c73e..4344829 100644
--- a/project.clj
+++ b/project.clj
@@ -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)
diff --git a/src/noir_blog/views/admin.clj b/src/noir_blog/views/admin.clj
index 5e1e435..5b0f1cf 100644
--- a/src/noir_blog/views/admin.clj
+++ b/src/noir_blog/views/admin.clj
@@ -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]
diff --git a/src/noir_blog/views/blog.clj b/src/noir_blog/views/blog.clj
index 1647a8a..4079bec 100644
--- a/src/noir_blog/views/blog.clj
+++ b/src/noir_blog/views/blog.clj
@@ -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]
diff --git a/src/noir_blog/views/common.clj b/src/noir_blog/views/common.clj
index cee6d25..7294a89 100644
--- a/src/noir_blog/views/common.clj
+++ b/src/noir_blog/views/common.clj
@@ -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"}])

From ea91323d3e87df22681e279d81f1ee42cf4e8799 Mon Sep 17 00:00:00 2001
From: zoka <ztomicic@gmail.com>
Date: Fri, 30 Mar 2012 20:18:28 +1100
Subject: [PATCH 2/3] gitignore updated for lein 2

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 39978d1..bd3591a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 pom.xml
 *jar
 /lib/
+/target/
 /classes/
 .lein-deps-sum
 sdb.db

From efe78d32d231980358f054afe0ea7f8df3ec6eb9 Mon Sep 17 00:00:00 2001
From: zoka <ztomicic@gmail.com>
Date: Sat, 31 Mar 2012 03:08:24 +1100
Subject: [PATCH 3/3] removed Jedit ignore

---
 .gitignore | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd3591a..fb667c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +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/
-/target/
 /classes/
 .lein-deps-sum
-sdb.db
+.lein-failures
+