From b7ddc0a4437e85508802899fa270c6a32e9378ed Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Sun, 22 Jul 2018 09:24:37 +0100
Subject: [PATCH] Servlet-context fixes

---
 resources/templates/base.html               | 3 ---
 resources/templates/call-me.html            | 2 +-
 resources/templates/issue-expert/list.html  | 5 +----
 resources/templates/login.html              | 2 +-
 resources/templates/{about.html => md.html} | 2 +-
 resources/templates/roles.html              | 2 +-
 resources/templates/untitled.html           | 0
 src/clj/youyesyet/routes/home.clj           | 4 ++--
 src/clj/youyesyet/routes/logged_in.clj      | 5 ++---
 9 files changed, 9 insertions(+), 16 deletions(-)
 rename resources/templates/{about.html => md.html} (85%)
 delete mode 100644 resources/templates/untitled.html

diff --git a/resources/templates/base.html b/resources/templates/base.html
index 26ecb00..54b4f02 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -63,9 +63,6 @@
         <!-- content: put your main page content into this block -->
         {% endblock %}
       </div>
-      <p>
-        User: {{user}}
-      </p>
       <br clear="both"/>
     </div>
     {% block foot %}
diff --git a/resources/templates/call-me.html b/resources/templates/call-me.html
index bb2414e..d24f4b6 100644
--- a/resources/templates/call-me.html
+++ b/resources/templates/call-me.html
@@ -3,7 +3,7 @@
       <p>
         Use this form to request someone to phone you to discuss your concerns about independence.
       </p>
-      <form action="call-me" method="post">
+      <form action="{{servlet-context}}/call-me" method="post">
         {% csrf-field %}
         <p class="widget">
           <label for="name">Your name</label>
diff --git a/resources/templates/issue-expert/list.html b/resources/templates/issue-expert/list.html
index 629fc72..0cd0efc 100644
--- a/resources/templates/issue-expert/list.html
+++ b/resources/templates/issue-expert/list.html
@@ -1,7 +1,4 @@
 {% extends "base.html" %}
-<!-- File list-followuprequests-Followuprequests.html generated 2018-07-17T07:58:11.329Z by adl.to-selmer-templates.
-See [Application Description Language](https://github.com/simon-brooke/adl).-->
-
 
 {% block back-links %}
 <div>
@@ -31,7 +28,7 @@ Add a new Followuprequest
 
 {% endblock %}
 {% block content %}
-<form id='list-followuprequests-Followuprequests' class='list' action='{{servlet-context}}/list-followuprequests-Followuprequests' method='POST'>
+<form id='issue-expert-list' class='list' action='{{servlet-context}}/issue-expert/list' method='POST'>
 {% csrf-field %}
 <input id='offset' name='offset' type='hidden' value='{{params.offset|default:0}}'/>
 <input id='limit' name='limit' type='hidden' value='{{params.limit|default:50}}'/>
diff --git a/resources/templates/login.html b/resources/templates/login.html
index d813e31..25550d0 100644
--- a/resources/templates/login.html
+++ b/resources/templates/login.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-      <form action="login" method="post">
+      <form action="{{servlet-context}}/login" method="post">
         {% csrf-field %}
         <h2>
           Or use a test username and password
diff --git a/resources/templates/about.html b/resources/templates/md.html
similarity index 85%
rename from resources/templates/about.html
rename to resources/templates/md.html
index 0812752..0421e30 100644
--- a/resources/templates/about.html
+++ b/resources/templates/md.html
@@ -2,6 +2,6 @@
 {% block big-links %}
 {% endblock %}
 {% block content %}
-{{motd|safe}}
+{{content|safe}}
 {% endblock %}
 
diff --git a/resources/templates/roles.html b/resources/templates/roles.html
index 0cc87ea..5e81c44 100644
--- a/resources/templates/roles.html
+++ b/resources/templates/roles.html
@@ -5,7 +5,7 @@
 {% block big-links %}
       {% for role in roles %}
       <div class="big-link-container">
-        <a href="roles/{{role.link|lower}}" class="big-link" id="big-link">{{role.name}}</a>
+        <a href="{{servlet-context}}/roles/{{role.link|lower}}" class="big-link" id="big-link">{{role.name}}</a>
       </div>
       {% endfor %}
 {% endblock %}
diff --git a/resources/templates/untitled.html b/resources/templates/untitled.html
deleted file mode 100644
index e69de29..0000000
diff --git a/src/clj/youyesyet/routes/home.clj b/src/clj/youyesyet/routes/home.clj
index 68408f5..896e7e1 100644
--- a/src/clj/youyesyet/routes/home.clj
+++ b/src/clj/youyesyet/routes/home.clj
@@ -49,9 +49,9 @@
 
 
 (defn about-page []
-  (layout/render "about.html" {:title
+  (layout/render "md.html" {:title
                                   (str "About " (:site-title env))
-                                  :motd (md-to-html-string (slurp (io/resource "about.md")))}))
+                                  :content (md-to-html-string (slurp (io/resource "about.md")))}))
 
 
 (defn call-me-page [request]
diff --git a/src/clj/youyesyet/routes/logged_in.clj b/src/clj/youyesyet/routes/logged_in.clj
index 8c33dc6..cb97171 100644
--- a/src/clj/youyesyet/routes/logged_in.clj
+++ b/src/clj/youyesyet/routes/logged_in.clj
@@ -115,7 +115,7 @@
 
 (defn handle-logout
   [request]
-  (let [r (response/found "home")]
+  (let [r (response/found (str (:servlet-context request) "/home"))]
     (assoc r :session (dissoc (:session r) :user))))
 
 
@@ -123,5 +123,4 @@
 (defroutes logged-in-routes
   (GET "/logout" request (handle-logout request))
   (GET "/profile" request (route/restricted (profile-page request)))
-  (GET "/app" [request] (route/restricted (app-page request)))
-  )
+  (GET "/app" [request] (route/restricted (app-page request))))