Fixing links

relevance · May 5, 2011 · c63349e · c63349e
1 parent 10e0487
commit c63349e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/labrepl.clj b/src/labrepl.clj
@@ -22,8 +22,7 @@
           :rock-paper-scissors])
 
 (defn home []
-  (layout/page
-   [:h2.logo "Clojure Labs"]
+  (layout/home
    [:ul
     (map
      (fn [lab] [:li (make-url lab)])
@@ -37,7 +36,7 @@
 
 (defroutes lab-routes
   (GET "/" [] (home))
-  (GET "/labs/:name" [name] (layout/page [:h2 name] (instructions name)))
+  (GET "/labs/:name" [name] (layout/lab [:h2 name] (instructions name)))
   (route/files "/")
   (route/not-found "<h1>Not Found</h1>"))
 

diff --git a/src/labrepl/layout.clj b/src/labrepl/layout.clj
@@ -13,7 +13,17 @@
    "/javascripts/shCore.js"
    "/javascripts/shBrushClojure.js"])
 
-(defn page [title & body]
+(defn home [body]
+  (html
+    [:head
+     [:title "Clojure Labs"]
+     (apply include-css default-stylesheets)
+     (apply include-js default-javascripts)]
+    [:body [:div {:id "header"} [:h2.logo "Clojure Labs"]]
+     [:div {:id "content"} body]
+     [:div {:id "footer"} "Clojure labrepl. Copyright Relevance Inc. All Rights Reserved."]]))
+
+(defn lab [title & body]
   {:pre [(string? (last title))]}
   (html
     [:head
@@ -25,4 +35,3 @@
       [:div {:id "breadcrumb"} (link-to "/" "Home")]
       body]
      [:div {:id "footer"} "Clojure labrepl. Copyright Relevance Inc. All Rights Reserved."]]))
-