added favicon.ico

tmarble · tmarble · commit d7a52c29f35a · 2015-07-05T15:44:14.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 # projectspecific
 *.orig
 lastcommit.js
-*.log
+*.log*
 /resources/public/js/compiled/[a-z]*
 /logs
 
diff --git a/resources/public/favicon.ico b/resources/public/favicon.ico
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -2,6 +2,7 @@
 <html lang="en">
   <head>
     <title>clojurebridgemn.org development mode</title>
+    <link href="/favicon.ico" rel="icon" type="image/x-icon">
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=0"/>
     <link href="css/clojurebridgemn.css" rel="stylesheet" type="text/css">
diff --git a/src/main/clj/clojurebridgemn/web.clj b/src/main/clj/clojurebridgemn/web.clj
@@ -76,9 +76,13 @@
 (defn append-body [nodes new-body-nodes]
   (append-at :body nodes new-body-nodes))
 
+(defn add-favicon [nodes]
+  (append-head nodes
+    (html [:link {:rel "icon" :href "/favicon.ico" :type "image/x-icon"}])))
+
 (defn add-css [nodes style-uri]
   (append-head nodes
-    (html [:link {:rel "stylesheet" :href style-uri}])))
+    (html [:link {:rel "stylesheet" :href style-uri :type "text/css"}])))
 
 (defn add-js [nodes script-uri]
   (append-head nodes
@@ -119,13 +123,15 @@
 ;; for production
 (defn create-html [& [req]]
   (-> basic-html5
+    (add-favicon)
     (add-css app-css-uri)
     (add-js app)
     (add-div "app")
     render-snippet))
 
 (defn create-test-html [& [req]]
   (-> basic-html5
+    (add-favicon)
     (add-css app-css)
     (add-js findns)
     (add-js phantomjs-shims)
