section8 video3

tlipski · tlipski · commit 072f119525af · 2014-04-12T18:00:59.000+02:00
diff --git a/project.clj b/project.clj
@@ -17,6 +17,7 @@
 		 [cheshire "5.1.1"]
    	         [ring "1.2.0"]
   		 [compojure "1.1.6"]
-		 [hiccup "1.0.4"]]
+		 [hiccup "1.0.4"]
+ 		 [enlive "1.1.5"]]
   :cljsbuild {:builds [{:source-paths ["cljs"] 
   			:compiler {:output-to "resources/public/app.js"}}]})
diff --git a/resources/templates/form-handler.html b/resources/templates/form-handler.html
@@ -0,0 +1,8 @@
+<p>Params:</p>
+<pre id="params"/>
+<p>Query string params:</p>
+<pre id="query-params"/>
+<p>Form params:</p>
+<pre id="form-params"/>
+<p>Multipart params:</p>
+<pre id="multipart-params"/>
diff --git a/resources/templates/layout.html b/resources/templates/layout.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title></title>
+	</head>
+<body style="background-color: #2c3e50; color: #fff">
+</body>
+</html>
diff --git a/src/project1/core.clj b/src/project1/core.clj
@@ -13,10 +13,22 @@
   		[core :as hiccup]
 		[page :as page]
 		[util]]
+	   [net.cgrand.enlive-html :as enlive]
 	   [project1.route :as route]
 	   [project1.blog :as blog]
            [clojure.string]))
 
+(enlive/deftemplate layout-template "templates/layout.html"
+ [contents]
+ [:body] (enlive/html-content (apply str contents)))
+
+(enlive/deftemplate form-handler-template "templates/form-handler.html"
+ [params query-params form-params multipart-params]
+ [:pre#params] (enlive/content (str params))
+ [:pre#query-params] (enlive/content (str query-params))
+ [:pre#form-params] (enlive/content (str form-params))
+ [:pre#multipart-params] (enlive/content (str multipart-params)))
+
 (defn layout [contents]
  (page/html5
    [:body {:style "background-color: #363636; color: #fff;"} 
@@ -93,19 +105,12 @@
   :cookies {:username login}
   :session {:username  login
 	    :cnt (inc (or (:cnt (:session request)) 0))}
-  :body (layout
-    	 [:div
-  	   [:p "Params:"]
-  	[:pre (hiccup.util/escape-html (:params request))]
- 	[:p "Query string params:"]
-	[:pre (hiccup.util/escape-html (:query-params request))]
-	[:p "Form params:"]
-	[:pre (hiccup.util/escape-html (:form-params request))]
-	[:p "Multipart params:"]
-	[:pre (hiccup.util/escape-html (:multipart-params request))]
-	[:p "Local path:"]
-	[:b (when-let [f (get-in request [:params :file :tempfile])]
-  		(hiccup.util/escape-html (.getAbsolutePath f)))]])})
+  :body (apply str (layout-template 
+			(form-handler-template
+  				(:params request)
+				(:query-params request)
+				(:form-params request)
+				(:multipart-params request))))})
 
 (compojure/defroutes route-handler 
   (compojure/context "/entries" [] 
