Permalink
Browse files

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

  • Loading branch information...
2 parents 0ebdb08 + 0604b03 commit 7da3f6fc96d78522722a06179109242da998caf0 David Davis committed Aug 11, 2012
Showing with 22 additions and 10 deletions.
  1. +18 −8 project.clj
  2. +1 −0 src-cljs/example.cljs
  3. +3 −2 src/shared_resource/views/common.clj
View
@@ -1,10 +1,20 @@
(defproject shared-resource "0.1.0-SNAPSHOT"
- :description "FIXME: write this!"
- :dependencies [[org.clojure/clojure "1.4.0"]
- [noir "1.3.0-beta10"]
- [lein-cljsbuild "0.2.5"]
- [com.datomic/datomic-free "0.8.3397"]
- [org.clojars.pntblnk/clj-ldap "0.0.9"]]
- :plugins [[lein-swank "1.4.4"]]
- :main ^{:skip-aot true} shared-resource.server)
+ :description "FIXME: write this!"
+ :dependencies [[org.clojure/clojure "1.4.0"]
+ [noir "1.3.0-beta10"]
+ [com.datomic/datomic-free "0.8.3397"]
+ [org.clojars.pntblnk/clj-ldap "0.0.9"]]
+ :plugins [[lein-swank "1.4.4"]
+ [lein-cljsbuild "0.2.5"]]
+ :main shared-resource.server
+ :cljsbuild {
+ :builds [{
+ ; The path to the top-level ClojureScript source directory:
+ :source-path "src-cljs"
+ ; The standard ClojureScript compiler options:
+ ; (See the ClojureScript compiler documentation for details.)
+ :compiler {
+ :output-to "resources/public/js/main.js" ; default: main.js in current directory
+ :optimizations :whitespace
+ :pretty-print true}}]})
@@ -0,0 +1 @@
+(js/alert "Hi!")
@@ -2,14 +2,15 @@
(:use noir.core
hiccup.core
hiccup.element
- [hiccup.page :only [include-css html5]])
+ [hiccup.page :only [include-css include-js html5]])
(:require [noir.session :as session]))
(defpartial layout [& content]
(html5
[:head
[:title "shared-resource"]
- (include-css "/css/reset.css")]
+ (include-css "/css/reset.css")
+ (include-js "/js/main.js")]
[:body
[:div#session
[:div#user-info (session/get :username)]

0 comments on commit 7da3f6f

Please sign in to comment.