Permalink
Browse files

Merge branch 'develop' of github.com:SciMed/shared-resource into develop

Conflicts:
	project.clj
	src/shared_resource/views/resource.clj
  • Loading branch information...
2 parents 13e6906 + e5ec280 commit a0c18110925156b4ae4fbeb84b03b931c164a715 David Davis committed Aug 11, 2012
Showing with 7 additions and 2 deletions.
  1. +4 −1 src/shared_resource/server.clj
  2. +3 −1 src/shared_resource/views/resource.clj
@@ -1,11 +1,14 @@
(ns shared-resource.server
- (:require [noir.server :as server]))
+ (:require [noir.server :as server]
+ [noir.cljs.core]))
+(def cljs-options {:advanced {:externs ["externs/jquery.js"]}})
(server/load-views-ns 'shared-resource.views)
(defn -main [& m]
(let [mode (keyword (or (first m) :dev))
port (Integer. (get (System/getenv) "PORT" "8080"))]
+ (noir.cljs.core/start mode cljs-options)
(server/start port {:mode mode
:ns 'shared-resource})))
@@ -11,6 +11,7 @@
;; Partials
+
(defpartial resource-list [
{:keys [
id
@@ -55,10 +56,11 @@
(resources-page (r/get-all)))
(defpage "/" []
+ (noir.cljs.core/include-scripts)
(resources-page (r/get-all)))
(defpage "/resources/:id" {:keys [id]}
(resource-page (r/get-by-id id)))
;(defpage "/resource/:id/reservations" {:keys [id]}
-; (resource-reservation-page (r/get-by-id id) (resv/get-by-resource-id id)))
+; (resource-reservation-page (r/get-by-id id) (resv/get-by-resource-id id)))

0 comments on commit a0c1811

Please sign in to comment.