{{title}}
diff --git a/resources/templates/docs.html b/resources/templates/docs.html index 6192696..4815695 100644 --- a/resources/templates/docs.html +++ b/resources/templates/docs.html @@ -1,6 +1,54 @@ {% extends "templates/base.html" %} {% block content %}
+
+
+
+ + {{parser|safe}} +
+ +
+
+ +
+
+ + {{parser|safe}} +
+ +
+
Implemented states
+As it says in the rule language documentation, above, you can use + any sequence of alphanumeric characters you want as the name of a state + &emdash; you can call it whatever you like. However, if you use state + names that there aren't already tiles for, and aren't already classes + for in the CSS file, your states won't be displayed nicely in the + World display. The states for which + there are already tiles are:
+-
+ {% for state in states %}
+
-
+ {{state}}
+
+
+ {% endfor %}
+
+ +
+
API documentation
+ +If you're adventurous you may want to modify the MicroWorld engine + itself. To do that you'll need this documentation. +
-
{% for component in components %}
-
diff --git a/resources/templates/home.html b/resources/templates/home.html
index fb0822f..f2ebe9f 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -1,19 +1,6 @@
{% extends "templates/base.html" %}
{% block content %}
- + {{content|safe}}{% endblock %} diff --git a/src/mw_ui/render_world.clj b/src/mw_ui/render_world.clj index 6816d55..a4cc30c 100644 --- a/src/mw_ui/render_world.clj +++ b/src/mw_ui/render_world.clj @@ -18,11 +18,14 @@ [statekey] (format "img/tiles/%s.png" (format-css-class statekey))) +(defn format-mouseover [cell] + (str "State " (:state cell) "; altitude: " (:altitude cell) "; fertility: " (:fertility 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) :title (format-mouseover cell)} [:img {:alt (world/format-cell cell) :src (format-image-path state)}]])) (defn render-world-row @@ -46,10 +49,11 @@ (session/put! :world w2) (session/put! :generation generation) [:div {:class "world"} - [:p (str "Generation " generation)] + (apply vector (cons :table - (map render-world-row w2)))])) + (map render-world-row w2))) + [:p (str "Generation " generation)]])) (defn render-world "Render the world implied by the session as a complete HTML page." diff --git a/src/mw_ui/routes/home.clj b/src/mw_ui/routes/home.clj index 790f10a..c20abd3 100644 --- a/src/mw_ui/routes/home.clj +++ b/src/mw_ui/routes/home.clj @@ -7,24 +7,27 @@ [noir.session :as session])) (defn home-page [] - (layout/render - "home.html" {:title "Welcome to MicroWorld" :content (util/md->html "/md/docs.md")})) - -(defn about-page [] - (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"})) +(defn about-page [] + (layout/render "about.html" {:title "About MicroWorld" :content (util/md->html "/md/about.md")})) + +(defn list-states [] + (sort + (filter #(not (nil? %)) + (map #(first (rest (re-matches #"([0-9a-z-]+).png" (.getName %)))) + (file-seq (clojure.java.io/file "resources/public/img/tiles")))))) + (defn docs-page [] (layout/render "docs.html" {:title "Documentation" + :parser (util/md->html "/md/parser.md") + :states (list-states) :components ["mw-engine" "mw-parser" "mw-ui"]})) (defroutes home-routes (GET "/" [] (home-page)) (GET "/about" [] (about-page)) - (GET "/world" [] (world-page)) (GET "/docs" [] (docs-page))) diff --git a/test/mw_ui/test/handler.clj b/test/mw_ui/test/handler.clj index 47e4862..91af8de 100644 --- a/test/mw_ui/test/handler.clj +++ b/test/mw_ui/test/handler.clj @@ -6,10 +6,9 @@ (deftest test-app (testing "main route" (let [response (app (request :get "/"))] - (is (= (:status response) 200)) - (is (= (:body response) - "\n \n
Welcome to mw-ui \n \n \n \n \n\n\n \n \n\n\n\n")))) + (is (= (:status response) 200)))) (testing "not-found route" (let [response (app (request :get "/invalid"))] - (is (= (:status response) 404))))) + (is (= (:status response) 404)))) +) \ No newline at end of fileWelcome to mw-ui
\n \nSome links to get started
\n\n