Update to hiccup2.html

Author: Joy Clark

todo-app/cheats/01/handler.clj

@@ -1,15 +1,19 @@
 (ns todo-app.handler
  (:require [compojure.core :refer [defroutes GET POST DELETE]]
  [compojure.route :as route]
- [hiccup.page :refer [html5 include-css]]
+ [hiccup.page :refer [doctype include-css]]
+ [hiccup2.core :refer [html]]
  [ring.middleware.defaults :refer [wrap-defaults site-defaults]]))
 
 (defn page [title & content]
- (html5 
- [:head 
- [:title title]
- (include-css "splendor.css")]
- [:body content]))
+ (str
+ (html
+ (doctype :html5)
+ [:html
+ [:head
+ [:title title]
+ (include-css "splendor.css")]
+ [:body content]])))
 
 (defn index []
  (page "TODO App" 

todo-app/test/todo_app/01_tests.clj

@@ -16,7 +16,7 @@
 (deftest styles-loaded
  (testing "css stylesheet linked"
  (let [html (page "Some title")]
- (is (str/includes? html "<link href=\"splendor.css\" rel=\"stylesheet\" type=\"text/css\">")))))
+ (is (str/includes? html "<link href=\"splendor.css\" rel=\"stylesheet\" type=\"text/css\" />")))))
 
 (deftest test-app
  (testing "main route"

todo-app/tests/01_tests.clj

@@ -16,7 +16,7 @@
 (deftest styles-loaded
  (testing "css stylesheet linked"
  (let [html (page "Some title")]
- (is (str/includes? html "<link href=\"splendor.css\" rel=\"stylesheet\" type=\"text/css\">")))))
+ (is (str/includes? html "<link href=\"splendor.css\" rel=\"stylesheet\" type=\"text/css\" />")))))
 
 (deftest test-app
  (testing "main route"

tutorial/chapters/00_instructions.md

@@ -4,7 +4,7 @@ If you are reading this tutorial, the chances that you have downloaded the corre
 
 Congratulations!
 
-If you are viewing this tutorial in a browser, the chances that you have already installed [leinigen](http://github.com/technomancy/leinigen) are also quite high. If this is not the case, please do this right now.
+If you are viewing this tutorial in a browser, the chances that you have already installed [leinigen](http://github.com/technomancy/leinigen) are also quite high. If you are using the [Nightcode IDE](https://sekao.net/nightcode/) it comes bundled with leinigen so you should be fine. If this is not the case, please do this right now.
 
 During this tutorial we want to have a hands on experience with Clojure and build a Clojure web application from the base up.
 
@@ -14,7 +14,7 @@ The app was created using the compojure leinigen template
 
  lein new compojure todo-app
 
-If you are using the [Nightcode IDE](https://sekao.net/nightcode/) for developing Clojure (which I recommend, especially when starting out with the language), you can start the application directly from the IDE.
+If you are using the [Nightcode IDE](https://sekao.net/nightcode/) for developing Clojure (which I recommend, especially when starting out with the language), you can start the application directly from the IDE (by hitting the `Run` button).
 
 Otherwise, you can start the app from the command line:
 

tutorial/chapters/01_instructions.md

@@ -1,8 +1,8 @@
 # Basics, HTML Templating, and Namespaces
 
-If you have started the `todo-app` with `lein ring server` you can see what the app looks like at `http://localhost:3000`
+If you have started the `todo-app` with `lein ring server` or from Nightcode, you can see what the app looks like at `http://localhost:3000`
 
-The app currently only has a single route '/' which returns a message in text format. We want to return HTML instead of text, so let's look at what resources Clojure has to help us with this.
+The app currently only has a single route `/` which returns a message in text format. We want to return HTML instead of text, so let's look at what resources Clojure has to help us with this.
 
 ## Basics
 
@@ -75,12 +75,15 @@ In Clojure we have something like a list (Vectors!) and something like a name (K
   [:h1 "Title"]
   "Some content!"]
 
-Hiccup provides the `hiccup.page/html5` element for generating an HTML5 page from such a data structure. This can also be combined with functions to have reusable templates!
+Hiccup provides the some built in elements that we can use out of the box. The `hiccup.page/doctype` function, for instance, can be used to generate the doctype for an HTML5 page. We can use the `hiccup2.core/html` function to generate the final HTML (HTML escaping by default was only introduced in Hiccup 2...but better late than never! For this reason, use the `hiccup2.core/html` function instead of the `hiccup.core/html` function which is still included for compatibility reasons). The `hiccup2.core/html` emits a `raw string` that we can then transform to a string with the `str` function. We can now write a function that will be a reusable page template!
 
  (defn page [title & content]
-  (html5
-  [:head [:title title]]
-  [:body content]))
+  (str
+  (html
+  (doctype :html5)
+  [:html
+  [:head [:title title]]
+  [:body content]]))
 
 The `&` in the function specifies that the function takes a variable number of arguments. The first argument `title` is required, and any others that are passed in will be bound to `content` as a list. In Hiccup, you can simply insert the list of elements, and these will be rendered correctly within the body tag.