diff --git a/requirements.txt b/requirements.txt
index 2096be1..0cfa92c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@ Django==2.0.6
Jinja2==2.10
social-auth-app-django==2.1.0
jsonfield==2.0.2
-Pillow==3.5.0
+Pillow==5.4.1
Markdown==3.0.1
diff --git a/sspromotions/jinja2/sspromotions/base.html b/sspromotions/jinja2/sspromotions/base.html
index 6348c11..5e44d67 100644
--- a/sspromotions/jinja2/sspromotions/base.html
+++ b/sspromotions/jinja2/sspromotions/base.html
@@ -2,7 +2,7 @@
{#
Society Self-Service
- Copyright © 2018 Yingtong Li (RunasSudo)
+ Copyright © 2018-2019 Yingtong Li (RunasSudo)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -34,9 +34,8 @@
Calendar
diff --git a/sspromotions/jinja2/sspromotions/calendar_edit.html b/sspromotions/jinja2/sspromotions/calendar_edit.html
new file mode 100644
index 0000000..25899af
--- /dev/null
+++ b/sspromotions/jinja2/sspromotions/calendar_edit.html
@@ -0,0 +1,111 @@
+{% extends 'sspromotions/base.html' %}
+
+{#
+ Society Self-Service
+ Copyright © 2018-2019 Yingtong Li (RunasSudo)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+#}
+
+{% block title %}{% if request.resolver_match.url_name == 'calendar_new' %}New{% else %}Edit{% endif %} calendar event{% endblock %}
+
+{% block maincontent %}
+ {% if request.resolver_match.url_name == 'calendar_new' %}New{% else %}Edit{% endif %} calendar event
+
+
+{% endblock %}
+
+{% block head %}
+ {{ super() }}
+
+{% endblock %}
+
+{% block script %}
+ {{ super() }}
+
+
+
+{% endblock script %}
diff --git a/sspromotions/jinja2/sspromotions/calendar_list.html b/sspromotions/jinja2/sspromotions/calendar_list.html
new file mode 100644
index 0000000..5032758
--- /dev/null
+++ b/sspromotions/jinja2/sspromotions/calendar_list.html
@@ -0,0 +1,75 @@
+{% extends 'sspromotions/base.html' %}
+
+{#
+ Society Self-Service
+ Copyright © 2018-2019 Yingtong Li (RunasSudo)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+#}
+
+{% block title %}Your calendar events{% endblock %}
+
+{% macro listitems(items) %}
+
+{% endmacro %}
+
+{% block maincontent %}
+ Your calendar events
+
+ {% if not items_past and not items_upcoming and not items_future %}
+ You have no calendar events to view. To create a calendar event, click Create new calendar event.
+ {% endif %}
+
+ {% if items_upcoming %}
+ Upcoming calendar events (next 14 days)
+
+ {{ listitems(items_upcoming) }}
+ {% endif %}
+
+ {% if items_future %}
+ Future calendar events
+
+ {{ listitems(items_future) }}
+ {% endif %}
+
+ {% if items_past %}
+ Past calendar events
+
+ {{ listitems(items_past) }}
+ {% endif %}
+{% endblock %}
+
+{% block head %}
+ {{ super() }}
+{% endblock %}
diff --git a/sspromotions/jinja2/sspromotions/email/base.html b/sspromotions/jinja2/sspromotions/email/base.html
index 1486fc5..3cee8c8 100644
--- a/sspromotions/jinja2/sspromotions/email/base.html
+++ b/sspromotions/jinja2/sspromotions/email/base.html
@@ -1,6 +1,6 @@
{#
Society Self-Service
- Copyright © 2018 Yingtong Li (RunasSudo)
+ Copyright © 2018-2019 Yingtong Li (RunasSudo)
Design by SendWithUs (Apache 2.0 licence)
@@ -1353,6 +1353,10 @@
display: block !important; }
table.menu[align="center"] {
width: auto !important; }
+
+ table .small-margafter {
+ margin-bottom: 0.8em;
+ }