More work on UI, but this commit has a regression

The user is no longer correctly stored in the session, and I'm not sure why not.
This commit is contained in:
Simon Brooke 2018-07-02 10:51:42 +01:00
parent e6d6109575
commit f5afa67eed
46 changed files with 3054 additions and 2821 deletions

View file

@ -11,11 +11,11 @@
<link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
<title>{{site-title}}: {{title}}</title>
{% script "js/lib/jquery/dist/jquery.min.js" %}
{% endblock %}
{% block extra-head %}
<!-- extra-head: put any additional markup to go into the head of your document into this block -->
<!-- e.g. script tags, link tags -->
{% endblock %}
{% endblock %}
</head>
<body>
{% block whole-page %}
@ -48,7 +48,7 @@
{% block big-links %}
<!-- big-links: put any main navigation links into this block -->
{% endblock %}
</div>
</div>
<div if="#content">
{% block content %}
<!-- content: put your main page content into this block -->
@ -81,13 +81,11 @@
<!-- e.g. some javascript script tags, some link tags -->
{% endblock %}
<script type="text/javascript">
//<![CDATA[
var context = "{{servlet-context}}";
var csrfToken = "{{csrf-token}}";
{% block extra-script %}
/* extra-script: put any actual javascript source text you need into this block */
{% endblock %}
//]]>
</script>
</body>
</html>