-
-
-
+
{% block content %}
{% endblock %}
-
-
-
- {% style "/css/screen.css" %}
-
-
-
-
-
+
+
diff --git a/resources/templates/home.html b/resources/templates/home.html
index 013b45d..2ada9ce 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -1,14 +1,20 @@
{% extends "templates/base.html" %}
{% block content %}
-
-
-
+ Built with LuminusWeb ||
+ 
Powered by Clojure ||
+ Engineering and hosting by Journeyman ||
+ World generated using MicroWorld Engine
+
+ Powered by Clojure ||
+ Engineering and hosting by Journeyman ||
+ World generated using MicroWorld Engine
+
-
- {{content|safe}}
-
+
+
{% endblock %}
diff --git a/resources/templates/world.html b/resources/templates/world.html
new file mode 100644
index 0000000..6688478
--- /dev/null
+++ b/resources/templates/world.html
@@ -0,0 +1,8 @@
+{% extends "templates/base.html" %}
+{% block content %}
+ {{title}}
+
+
+{% endblock %}
diff --git a/src/mw_ui/render_world.clj b/src/mw_ui/render_world.clj
index 9c5328f..c5fc466 100644
--- a/src/mw_ui/render_world.clj
+++ b/src/mw_ui/render_world.clj
@@ -17,38 +17,47 @@
[statekey]
(format "img/tiles/%s.png" (format-css-class statekey)))
-(defn render-cell
+(defn render-cell
"Render this world cell as a Hiccup table cell."
[cell]
(let [state (:state cell)]
- [:td {:class (format-css-class state)}
+ [:td {:class (format-css-class state)}
[:img {:alt (world/format-cell cell) :img (format-image-path state)}]]))
-(defn render-world-row
+(defn render-world-row
"Render this world row as a Hiccup table row."
[row]
(apply vector (cons :tr (map render-cell row))))
-(defn render-world
- "Render this world as a complete HTML page."
+(defn render-world-table
+ "Render the world implied by the session as a complete HTML page."
[]
(let [world (or (session/get :world) (world/make-world 20 20))
rules (or (session/get :rules) rules/natural-rules)
+ generation (+ (or (session/get :generation) 0) 1)
w2 (engine/transform-world world rules)]
(session/put! :world w2)
- (html
- [:html
- [:head
- [:title "MicroWorld demo"]
- [:link {:media "only screen and (max-device-width: 480px)" :href "css/phone.css" :type "text/css" :rel "stylesheet"}]
- [:link {:media "only screen and (min-device-width: 481px) and (max-device-width: 1024px)" :href "css/tablet.css" :type "text/css" :rel "stylesheet"}]
- [:link {:media "screen and (min-device-width: 1025px)" :href "css/standard.css" :type "text/css" :rel "stylesheet"}]
- [:link {:media "print" :href "css/print.css" :type "text/css" :rel "stylesheet"}]
- [:link {:href "css/states.css" :type "text/css" :rel "stylesheet"}]
- [:meta {:http-equiv "refresh" :content "5"}]]
- [:body
- [:h1 "MicroWorld"]
- (apply vector
- (cons :table
- (map render-world-row w2)))]])))
-
\ No newline at end of file
+ (session/put! :generation generation)
+ [:div {:class "world"}
+ [:p (str "Generation " generation)]
+ (apply vector
+ (cons :table
+ (map render-world-row w2)))]))
+
+(defn render-world
+ "Render the world implied by the session as a complete HTML page."
+ []
+ (html
+ [:html
+ [:head
+ [:title "MicroWorld demo"]
+ [:link {:media "only screen and (max-device-width: 480px)" :href "css/phone.css" :type "text/css" :rel "stylesheet"}]
+ [:link {:media "only screen and (min-device-width: 481px) and (max-device-width: 1024px)" :href "css/tablet.css" :type "text/css" :rel "stylesheet"}]
+ [:link {:media "screen and (min-device-width: 1025px)" :href "css/standard.css" :type "text/css" :rel "stylesheet"}]
+ [:link {:media "print" :href "css/print.css" :type "text/css" :rel "stylesheet"}]
+ [:link {:href "css/states.css" :type "text/css" :rel "stylesheet"}]
+ [:meta {:http-equiv "refresh" :content "5"}]]
+ [:body
+ [:h1 "MicroWorld"]
+ (render-world-table)
+ ]]))
diff --git a/src/mw_ui/routes/home.clj b/src/mw_ui/routes/home.clj
index 93288c5..55344fc 100644
--- a/src/mw_ui/routes/home.clj
+++ b/src/mw_ui/routes/home.clj
@@ -1,17 +1,22 @@
(ns mw-ui.routes.home
(:use compojure.core)
- (:require [mw-ui.layout :as layout]
+ (:require [hiccup.core :refer [html]]
+ [mw-ui.layout :as layout]
[mw-ui.util :as util]
- [mw-ui.render-world :as world]))
+ [mw-ui.render-world :as world]
+ [noir.session :as session]))
(defn home-page []
(layout/render
- "home.html" {:content (util/md->html "/md/docs.md")}))
+ "home.html" {:title "Welcome to MicroWorld" :content (util/md->html "/md/docs.md")}))
(defn about-page []
- (layout/render "about.html"))
+ (layout/render "about.html" {:title "About MicroWorld" :content (util/md->html "/md/about.md")}))
+
+(defn world-page []
+ (layout/render "world.html" {:title "Watch your world grow" :content (html (world/render-world-table)) :seconds (or (session/get :seconds) 5) :maybe-refresh "refresh"}))
(defroutes home-routes
(GET "/" [] (home-page))
(GET "/about" [] (about-page))
- (GET "/world" [] (world/render-world)))
+ (GET "/world" [] (world-page)))