From de7a553a86784bb1387b2ff93620bc7abe52d9a0 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 2 Sep 2016 16:51:53 +0100 Subject: [PATCH] Done, working. --- README.md | 4 ++-- project.clj | 6 +++--- resources/public/content/Introduction.md | 6 ++++-- resources/public/content/_header.md | 2 +- resources/templates/edit.html | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index cdd4e11..bdfc865 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ with the line The Web Engineering Factory & Toolworks Developed by WEFT ## Prerequisites -You will need [Leiningen][1] 2.0 or above installed. +You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed. -[1]: https://github.com/technomancy/leiningen +You will need [node](https://nodejs.org/en/) and [bower](https://bower.io/) installed. ## Running To start a web server for the application, run: diff --git a/project.clj b/project.clj index 4da622c..a6c9d31 100644 --- a/project.clj +++ b/project.clj @@ -28,10 +28,10 @@ :jvm-opts ["-server"] :plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]] [lein-environ "1.0.0"] + [lein-bower "0.5.1"] [lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]] - [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]] - [lein-npm "0.6.2"]] - :npm {:dependencies [[simplemde "1.11.2"]]} + [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]] + :bower-dependencies [[simplemde "1.11.2"]] :ring {:handler smeagol.handler/app :init smeagol.handler/init :destroy smeagol.handler/destroy} diff --git a/resources/public/content/Introduction.md b/resources/public/content/Introduction.md index 27e187a..123abf8 100644 --- a/resources/public/content/Introduction.md +++ b/resources/public/content/Introduction.md @@ -51,17 +51,19 @@ parts of Smeagol into another open source project which uses a less restrictive license, please contact me; I'm open to dual licensing it. ## Prerequisites -You will need [Leiningen][1] 2.0 or above installed. +You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed. -[1]: https://github.com/technomancy/leiningen +You will need [node](https://nodejs.org/en/) and [bower](https://bower.io/) installed. ## Running To start a web server for the application, run: + lein bower install lein ring server Alternatively, if you want to deploy to a servlet container (which I would strongly recommend), the simplest thing is to run: + lein bower install lein ring uberwar (a command which I'm sure Smeagol would entirely appreciate) and deploy the resulting war file. diff --git a/resources/public/content/_header.md b/resources/public/content/_header.md index d50260c..2165f3a 100644 --- a/resources/public/content/_header.md +++ b/resources/public/content/_header.md @@ -1 +1 @@ -This is the header. There isn't yet much in it. You could [edit](edit?page=_header) it to provide internal navigation or branding. +This is the header. There isn't yet much in it. You could [edit](edit?page=_header) it to provide internal navigation or branding. diff --git a/resources/templates/edit.html b/resources/templates/edit.html index 275a11e..0d4388f 100644 --- a/resources/templates/edit.html +++ b/resources/templates/edit.html @@ -1,7 +1,7 @@ {% extends "templates/base.html" %} {% block extra-headers %} - - + + {% endblock %} {% block content %}