Yet more progress!

src/clj/youyesyet/layout.clj

@@ -10,9 +10,32 @@
                     [ring.middleware.anti-forgery :refer [*anti-forgery-token*]]
                     [selmer.parser :as parser]
                     [selmer.filters :as filters]
+                    [youyesyet.config :refer [env]]
                     [youyesyet.db.core :as db]
                     ))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;
+;;;; youyesyet.layout: lay out Selmer-templated web pages.
+;;;;
+;;;; This program is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU General Public License
+;;;; as published by the Free Software Foundation; either version 2
+;;;; of the License, or (at your option) any later version.
+;;;;
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with this program; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+;;;; USA.
+;;;;
+;;;; Copyright (C) 2016 Simon Brooke for Radical Independence Campaign
+;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 (declare ^:dynamic *app-context*)
@@ -47,6 +70,8 @@
             :csrf-token *anti-forgery-token*
             :user user
             :user-roles (get-user-roles user)
+            :site-title (:site-title env)
+            :site-logo (:site-logo env)
             :version (System/getProperty "youyesyet.version"))))
       "text/html; charset=utf-8")))
 

src/clj/youyesyet/routes/auto.clj

@@ -1,6 +1,6 @@
 (ns
  youyesyet.routes.auto
- "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T222155.170Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180630T113600.562Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
@@ -18,6 +18,7 @@
  [r]
  (l/render
   (support/resolve-template "application-index.html")
+  (:session r)
   {:title "Administrative menu"}))
 
 (defn

src/clj/youyesyet/routes/home.clj

@@ -6,8 +6,9 @@
             [noir.response :as nresponse]
             [noir.util.route :as route]
             [ring.util.http-response :refer [content-type ok]]
-            [youyesyet.layout :as layout]
+            [youyesyet.config :refer [env]]
             [youyesyet.db.core :as db-core]
+            [youyesyet.layout :as layout]
             [youyesyet.oauth :as oauth]
             [compojure.core :refer [defroutes GET POST]]
             [ring.util.http-response :as response]
@@ -41,7 +42,7 @@
 
 
 (defn about-page []
-  (layout/render "about.html" {}))
+  (layout/render "about.html" {} {:title (str "About " (:site-title env))}))
 
 
 (defn call-me-page [request]
@@ -53,7 +54,7 @@
     (layout/render "call-me.html" (:session request)
                    {:title "Please call me!"
                     ;; TODO: Issues need to be fetched from the database
-                    :concerns nil})))
+                    :concerns (db-core/list-issues db-core/*db* {})})))
 
 
 (defn roles-page [request]
@@ -72,7 +73,7 @@
 
 
 (defn home-page []
-  (layout/render "home.html" {} {:title "You Yes Yet?"}))
+  (layout/render "home.html" {} {:title "You yes yet?"}))
 
 
 (defn login-page