diff --git a/.gitignore b/.gitignore
index 0ef5d3f..9c4d914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+smeagol.log
pom.xml
pom.xml.asc
*jar
diff --git a/README.md b/README.md
index 14fbdc4..c6089a8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,28 @@
-# Welcome to Smeagol
+ Welcome to Smeagol!
-Smeagol is a simple Git-backed Wiki inspired by [Gollum](https://github.com/gollum/gollum/wiki).
+Smeagol is a simple Wiki engine inspired by [Gollum](https://github.com/gollum/gollum/wiki). Gollum is a Wiki engine written in Ruby, which uses a number of simple text formats including [Markdown](http://daringfireball.net/projects/markdown/), which uses [Git](http://git-scm.com/) to provide versioning and backup. I needed a new Wiki for a project and thought Gollum would be ideal - but unfortunately it doesn't provide user authentication, which I needed, and it was simpler for me to reimplement the bits I did need in Clojure than to modify Gollum.
+
+So at this stage Smeagol is a Wiki engine written in Clojure which uses Markdown as its text format, which does have user authentication, and which will soon use Git as its versioning and backup system.
+
+## Markup syntax
+
+Smeagol uses the Markdown format as provided by [markdown-clj](https://github.com/yogthos/markdown-clj), with the addition that anything enclosed in double square brackets, \[\[like this\]\], will be treated as a link into the wiki.
+
+## Security and authentication
+
+Currently security is very weak. There is currently a file called *passwd* in the *resources/public* directory, which contains a clojure map of username/plain-text password pairs thus:
+
+ {:admin "admin"}
+
+that is to say, the username is a keyword and the corresponding password is a string. Obviously, this is a temporary solution while in development which I will fix later.
+
+## Todo
+
+* Git integration! Smeagol doesn't have any inbuilt versioning or backup mechanism; it's intended that Git will be used as that mechanism. But it isn't implemented yet.
+* Image (and other media) upload.
+* Improved security.
+* Mechanism to add users through the user interface.
+* Mechanism to change passwords through the user interface.
## Prerequisites
diff --git a/resources/public/content/Introduction.md b/resources/public/content/Introduction.md
index d08ede7..ac6c762 100644
--- a/resources/public/content/Introduction.md
+++ b/resources/public/content/Introduction.md
@@ -10,11 +10,19 @@ Smeagol uses the Markdown format as provided by [markdown-clj](https://github.co
## Security and authentication
-Not done yet.
+Currently security is very weak. There is currently a file called *passwd* in the *resources/public* directory, which contains a clojure map of username/plain-text password pairs thus:
+
+ {:admin "admin"}
+
+that is to say, the username is a keyword and the corresponding password is a string. Obviously, this is a temporary solution while in development which I will fix later.
## Todo
-Git integration!
+* Git integration! Smeagol doesn't have any inbuilt versioning or backup mechanism; it's intended that Git will be used as that mechanism. But it isn't implemented yet.
+* Image (and other media) upload.
+* Improved security.
+* Mechanism to add users through the user interface.
+* Mechanism to change passwords through the user interface.
## Editing the framing content
diff --git a/resources/public/css/standard.css b/resources/public/css/standard.css
index 6fa4869..6f7a0ea 100644
--- a/resources/public/css/standard.css
+++ b/resources/public/css/standard.css
@@ -18,6 +18,13 @@ body {
background:rgba(40,40,40,0.8);
}
+#user {
+ font-height: 66%;
+ float: right;
+ padding: 0.1em 0.75em;
+ margin: 0;
+}
+
/* only needed for fly-out menu effect on tablet and phone stylesheets */
#nav-icon {
display: none;
@@ -120,10 +127,15 @@ input {
background-color: white;
}
-input.submit {
+input.action {
background-color: green;
}
+input.action-dangerous {
+ color: white;
+ background-color: red;
+}
+
input.required:after {
content: " \*";
color: red;
diff --git a/resources/public/passwd b/resources/public/passwd
new file mode 100644
index 0000000..2123246
--- /dev/null
+++ b/resources/public/passwd
@@ -0,0 +1 @@
+{:admin "admin"}
diff --git a/resources/templates/auth.html b/resources/templates/auth.html
new file mode 100644
index 0000000..25594f8
--- /dev/null
+++ b/resources/templates/auth.html
@@ -0,0 +1,33 @@
+{% extends "templates/base.html" %}
+{% block content %}
+
