From 90f3c1eb1f692c4420d3d5f1890cc47b0e801386 Mon Sep 17 00:00:00 2001
From: fogus <mefogus@gmail.com>
Date: Wed, 22 May 2013 09:03:49 -0400
Subject: [PATCH] Resources packaged

---
 project.clj             | 6 ++----
 src/marginalia/html.clj | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/project.clj b/project.clj
index 1e03438..a208e4d 100644
--- a/project.clj
+++ b/project.clj
@@ -7,10 +7,8 @@
    [org.clojure/tools.cli "0.2.1"]
    [org.markdownj/markdownj "0.3.0-1.0.2b4"]]
 
-  :resources-path "vendor"
+  :resource-paths ["vendor"]
 
   ;;Needed for testing Latex equation formatting. You must download
   ;;and install MathJax in you doc directory.
-  :marginalia {:javascript ["mathjax/MathJax.js"]}
-
-  :eval-in-leiningen true)
+  :marginalia {:javascript ["mathjax/MathJax.js"]})
diff --git a/src/marginalia/html.clj b/src/marginalia/html.clj
index 177463b..b0cab71 100644
--- a/src/marginalia/html.clj
+++ b/src/marginalia/html.clj
@@ -33,7 +33,7 @@
     (catch java.lang.NullPointerException npe
       (println (str "Could not locate resources at " resource-name))
       (println "    ... attempting to fix.")
-      (let [resource-name (str "./resources/" resource-name)]
+      (let [resource-name (str *resources* resource-name)]
         (try
           (-> (.getContextClassLoader (Thread/currentThread))
               (.getResourceAsStream resource-name)
@@ -377,7 +377,7 @@
       "Syntax highlighting provided by Alex Gorbatchev's "
       [:a {:href "http://alexgorbatchev.com/SyntaxHighlighter/"}
        "SyntaxHighlighter"]
-      floating-toc]
+      floating-toc-html]
      (inline-js (str *resources* "app.js"))]]))