From d43eb22cd39871d5969b2887ea6d2f33cf572b16 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Mon, 17 May 2021 08:22:21 +0100 Subject: [PATCH] Selmer `style` and `script` tags are not working cleanly for me. --- .gitignore | 8 ++++ project.clj | 2 +- resources/templates/app.html | 12 ++--- resources/templates/base.html | 15 ++++--- src/clj/youyesyet/routes/home.clj | 72 ++++++++++++++++-------------- src/clj/youyesyet/routes/roles.clj | 38 +++++++++------- 6 files changed, 84 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 3d04b99..d4d4900 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,11 @@ youyesyet\.dump\.20180816 *.tar src/clj/youyesyet/cache\.clj + +.lsp/sqlite.db + +.settings/ + +.classpath + +.project diff --git a/project.clj b/project.clj index d632eb9..8d25178 100644 --- a/project.clj +++ b/project.clj @@ -51,7 +51,7 @@ [ring/ring-servlet "1.7.1"] [ring-webjars "0.2.0"] [secretary "1.2.3"] - [selmer "1.12.17"]] + [selmer "1.12.40"]] :deploy-repositories [["releases" :clojars] ["snapshots" :clojars]] diff --git a/resources/templates/app.html b/resources/templates/app.html index acf8274..f5e7c9a 100644 --- a/resources/templates/app.html +++ b/resources/templates/app.html @@ -42,13 +42,13 @@ {% endblock %} {% block extra-tail %} - - - -{% script "js/lib/node_modules/signature_pad/dist/signature_pad.min.js" %} -{% script "js/lib/node_modules/leaflet/dist/leaflet.js" %} -{% script "/js/app.js" %} + + + + + + {% endblock %} diff --git a/resources/templates/base.html b/resources/templates/base.html index 92e2a75..7f6d5ea 100644 --- a/resources/templates/base.html +++ b/resources/templates/base.html @@ -6,17 +6,20 @@ - {% style "/css/yyy-common.css" %} - {% style "/css/yyy-site.css" %} - {% style "/css/spinner.css" %} + + + - {% script "/js/lib/node_modules/jquery/dist/jquery.min.js" %} + {{site-title}}: {{title}} {% endblock %} {% block extra-head %} {% endblock %} + {% if servlet-context %} + + {% endif %} {% block whole-page %} @@ -87,12 +90,12 @@