Woohoo! Users can now change their own passwords. More work on tidying

up stylesheets.

resources/passwd

@@ -1,2 +1 @@
-{:admin {:password "admin" :email "admin@localhost"}}
-
+{:admin {:password "admin", :email "admin@localhost"}}

resources/public/css/standard.css

@@ -43,6 +43,10 @@ body {
 	float: right;
 	padding: 0.1em 0.75em;
   margin: 0;
+  color: white;
+}
+
+#user a {
   color: silver;
 }
 
@@ -110,13 +114,12 @@ li.nav-item a:active { background: gray; color: white; }
 #footer {
   clear: both;
   font-size: smaller;
-  padding: 0 2em;
   text-align: center;
   color:white;
   background:rgba(128,128,128,0.95);
   width: 100%;
   margin: 0;
-  padding: 0.1em 10%;
+/*  padding: 0.1em 10%; */
   bottom:0;
   position:fixed;
   z-index:150;
@@ -135,6 +138,7 @@ li.nav-item a:active { background: gray; color: white; }
  	border: thin solid white;
  	margin-top: 0;
  	margin-bottom: 0;
+  width: 100%;
 }
 
 .minor-controls {
@@ -144,6 +148,10 @@ li.nav-item a:active { background: gray; color: white; }
 	font-size: 66%;
 }
 
+.message {
+  border: thin solid red;
+}
+
 .wiki {
   margin: 0;
 }
@@ -156,8 +164,12 @@ form {
   border: thin solid silver;
 }
 
-div.content, form, p, pre, ul, ol, dl, menu, h1, h2, h3, h4, h5 {
-  padding: 0.25em 10%;
+div.content, form, p, pre, h1, h2, h3, h4, h5 {
+  padding: 0.25em 5%;
+}
+
+dl, menu, ol, table, ul {
+  margin: 0.25em 5%;
 }
 
 input {
@@ -179,7 +191,7 @@ input.required:after {
 }
 
 label {
-  width: 30em;
+  width: 20%;
   min-width: 20em;
   border-right: thin solid gray;
 }
@@ -192,12 +204,23 @@ menu li::before {
   content: "|| ";
 }
 
+table {
+  border: 2px solid black;
+  border-collapse: collapse;
+}
+
 table.music-ruled tr:nth-child(odd) {
 	background-color: silver;
 }
 
 th, td {
 	text-align: left;
-	padding: 0 0.25em;
+  vertical-align: top;
+	padding: 0.15em 1.5em;
+  border: 1px solid gray;
+}
+
+th {
+  background-color: silver;
 }
 

resources/public/css/tablet.css

@@ -126,11 +126,16 @@ h1, h2, h3, h4, h5 {
   color: white;
 }
 
-p, pre, ul, ol, dl, h1, h2, h3, h4, h5 {
+p, pre, h1, h2, h3, h4, h5 {
   width: 100%;
   padding: 0.25em 1em;
 }
 
+dl, menu, ol, table, ul {
+  margin: 0.15em 3%;
+}
+
+
 input {
   background-color: white;
 }
@@ -165,3 +170,24 @@ menu li::before {
   content: "|| ";
 }
 
+
+table {
+  border: 2px solid black;
+  border-collapse: collapse;
+}
+
+table.music-ruled tr:nth-child(odd) {
+	background-color: silver;
+}
+
+th, td {
+	text-align: left;
+  vertical-align: top;
+	padding: 0.15em 1.5em;
+  border: 1px solid gray;
+}
+
+th {
+  background-color: silver;
+}
+

resources/templates/about.html

@@ -1,4 +0,0 @@
-{% extends "templates/base.html" %}
-{% block content %}
-  <p>this is the story of smeagol... work in progress</p>
-{% endblock %}

resources/templates/auth.html

@@ -2,6 +2,7 @@
 {% block content %}
         <div id="content" class="auth">
             <form action="{{servlet-context}}/auth" method="POST">
+                <input type="hidden" name="redirect-to" value="{{redirect-to}}"/>
                 {% if user %}
                 <p class="widget">
                     <label for="submit">To finish editing</label>
@@ -10,11 +11,11 @@
                 {% else %}
                 <p class="widget">
                     <label for="username">Your username</label>
-                    <input name="username" id="username" type="text"/>
+                    <input name="username" id="username" type="text" required/>
                 </p>
                 <p class="widget">
                     <label for="password">Your password</label>
-                    <input name="password" id="password" type="password"/>
+                    <input name="password" id="password" type="password" required/>
                 </p>
                 <p class="widget">
                     <label for="submit">To edit this wiki</label>

resources/templates/base.html

@@ -14,7 +14,7 @@
     <!-- navbar -->
     <div id="nav">
       {% if user %}
-      <p class="user" id="user">You are logged in as {{user}}</p>
+        <p class="user" id="user">You are logged in as {{user}} | <a href="passwd">change password</a></p>
       {% endif %}
       <img id="nav-icon" src="{{servlet-context}}/img/threelines.png" alt="Menu"/>
       <ul id="nav-menu" class="nav">

resources/templates/edit.html

@@ -7,7 +7,7 @@
                 <p class="widget">
                     <label for="summary">What have you changed?</label>
                     <input name="summary" id="summary" type="text"
-                        value="{%if exists%}{%else%}New file {{title}}{%endif%}"/>
+                        value="{%if exists%}{%else%}New file {{title}}{%endif%}" required/>
                 </p>
                 <p class="widget">
                     <label for="submit">When you have finished editing</label>

resources/templates/passwd.html

@@ -0,0 +1,23 @@
+{% extends "templates/base.html" %}
+{% block content %}
+        <div id="content" class="auth">
+            <form action="{{servlet-context}}/passwd" method="POST">
+                <p class="widget">
+                    <label for="password">Your password</label>
+                    <input name="oldpass" id="oldpass" type="password" required/>
+                </p>
+                <p class="widget">
+                    <label for="password">New password</label>
+                    <input name="pass1" id="pass1" type="password" required/>
+                </p>
+                <p class="widget">
+                    <label for="password">And again</label>
+                    <input name="pass2" id="pass2" type="password" required/>
+                </p>
+                <p class="widget">
+                    <label for="submit">To edit this wiki</label>
+                    <input name="action" id="action" type="submit" class="action" value="Login!"/>
+                </p>
+            </form>
+        </div>
+{% endblock %}