Cope with the fact that servlet-context is no longer working...

At least as I think it did.
Also moved some assets to fixed URLs so that they can be served by Apache, reducing load on Tomcat.
This commit is contained in:
Simon Brooke 2022-02-14 10:33:06 +00:00
parent 644dfcb517
commit 1d97622a48
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
5 changed files with 39 additions and 23 deletions

View file

@ -2,9 +2,9 @@
{% block head %}
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<link rel="stylesheet" type="text/css" href="css/yyy-common.css" />
<link rel="stylesheet" type="text/css" href="css/yyy-app.css" />
<link rel="stylesheet" type="text/css" href="css/spinner.css" />
<link rel="stylesheet" type="text/css" href="/css/yyy-common.css" />
<link rel="stylesheet" type="text/css" href="/css/yyy-app.css" />
<link rel="stylesheet" type="text/css" href="/css/spinner.css" />
<link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
<title>{{site-title}}: {{title}}</title>
{% endblock %}
@ -43,12 +43,12 @@
{% block extra-tail %}
<!-- scripts and styles -->
<!-- Leaflet -->
<link rel="stylesheet" href="{{servlet-context}}/js/lib/node_modules/leaflet/dist/leaflet.css" />
<script src="{{servlet-context}}/js/lib/node_modules/leaflet/dist/leaflet.js"></script>
<link rel="stylesheet" href="js/lib/node_modules/leaflet/dist/leaflet.css" />
<script src="js/lib/node_modules/leaflet/dist/leaflet.js"></script>
<!-- Signature pad -->
<script src="{{servlet-context}}/js/lib/node_modules/signature_pad/dist/signature_pad.min.js"></script>
<script src="js/lib/node_modules/signature_pad/dist/signature_pad.min.js"></script>
<!-- our actual app -->
<script src="{{servlet-context}}/js/app.js"></script>
<script src="js/app.js"></script>
{% endblock %}