 (ns notehub.handler
   (:use compojure.core
+        [notehub.views]
         [notehub.settings]
         [clojure.string :rename {replace sreplace} :only [replace]]
-        [clojure.core.incubator :only [-?>]]
-        [hiccup.form]
-        [hiccup.core]
-        [hiccup.element]
-        [hiccup.util :only [escape-html]]
-        [hiccup.page :only [include-js html5]])
-  (:require [compojure.handler :as handler]
-            [compojure.route :as route]
-            [hiccup.util :as util]
-            [notehub.api :as api]
-            [notehub.storage :as storage]
-            [cheshire.core :refer :all]))
-
-; Creates the main html layout
-(defn layout
-  [title & content]
-  (html5
-   [:head
-    [:title (print-str (get-message :name) "&mdash;" title)]
-    [:meta {:charset "UTF-8"}]
-    [:meta {:name "viewport" :content "width=device-width, initial-scale=1.0"}]
-    [:link {:rel "stylesheet/less" :type "text/css" :href "/styles/main.less"}]
-    (html
-     (include-js "/js/less.js")
-     (include-js "/js/themes.js")
-     (include-js "/js/md5.js")
-     (include-js "/js/marked.js")
-     (include-js "/js/main.js"))
-    ; google analytics code should appear in prod mode only
-    (if-not (get-setting :dev-mode) (include-js "/js/google-analytics.js"))]
-   [:body {:onload "onLoad()"} content]))
-
-(defn md-node
-  "Returns an HTML element with a textarea inside
-  containing the markdown text (to keep all chars unescaped)"
-  ([cls input] (md-node cls {} input))
-  ([cls opts input]
-   [(keyword (str (name cls) ".markdown")) opts
-    [:textarea input]]))
-
-(defn sanitize
-  "Breakes all usages of <script> & <iframe>"
-  [input]
-  (sreplace input #"(</?(iframe|script).*?>|javascript:)" ""))
-
-; input form for the markdown text with a preview area
-(defn input-form [form-url command fields content passwd-msg]
-  (let [css-class (when (= :publish command) :hidden)]
-    (layout (get-message :new-note)
-            [:article#preview ""]
-            [:div#dashed-line {:class css-class}]
-            [:div.central-element.helvetica {:style "margin-bottom: 3em"}
-             (form-to {:autocomplete :off} [:post form-url]
-                      (hidden-field :action command)
-                      (hidden-field :version api/version)
-                      (hidden-field :password)
-                      fields
-                      (text-area {:class :max-width} :note content)
-                      [:fieldset#input-elems {:class css-class}
-                       (text-field {:class "ui-elem" :placeholder (get-message passwd-msg)}
-                                   :plain-password)
-                       (submit-button {:class "button ui-elem"
-                                       :id :publish-button} (get-message command))])])))
+        [clojure.core.incubator :only [-?>]])
+  (:require 
+    [hiccup.util :as util]
+    [compojure.handler :as handler]
+    [compojure.route :as route]
+    [notehub.api :as api]
+    [notehub.storage :as storage]
+    [cheshire.core :refer :all]))
 
 ; TODO: make sure the status is really set to the response!!!!
 (defn- response

  (context "/api" []
           #(ring.util.response/content-type (api-routes %) "application/json"))

  (GET "/" []
       (layout (get-message :page-title)
               [:div#hero
                [:h1 (get-message :name)]
                [:h2 (get-message :title)]
                [:br]
                [:a.landing-button {:href "/new" :style "color: white"} (get-message :new-page)]]
               [:div#dashed-line]
               (md-node :article.helvetica.bottom-space
                        {:style "font-size: 1em"}
                        (slurp "LANDING.md"))
               (md-node :div.centered.helvetica (get-message :footer))))

  (GET "/:year/:month/:day/:title/export" [year month day title]
       (when-let [md-text (:note (api/get-note {:noteID (api/build-key year month day title)}))]


  (GET "/:year/:month/:day/:title/stats" [year month day title]
       (when-let [resp (api/get-note {:noteID (api/build-key year month day title)})]
         (statistics-page resp)))

  (GET "/:year/:month/:day/:title/edit" [year month day title]
       (note-update-page year month day title))

  (GET "/new" [] new-note-page)

  (GET "/:year/:month/:day/:title" [year month day title :as params]
       (note-page year month day title params))

  (GET "/:short-url" [short-url]
       (when-let [params (storage/resolve-url short-url)]
