From 95e9754858505ef35cff6ab0f78eceb3c074222c Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Wed, 20 Jun 2018 14:07:14 +0100 Subject: Fix RST editor loading on pages that use it --- templates/staff/jams/edit_ending.html | 128 ++++++------- templates/staff/jams/edit_info.html | 256 +++++++++++++------------- templates/staff/jams/forms/preamble_edit.html | 128 ++++++------- templates/staff/tables/edit.html | 18 +- 4 files changed, 269 insertions(+), 261 deletions(-) (limited to 'templates') diff --git a/templates/staff/jams/edit_ending.html b/templates/staff/jams/edit_ending.html index 4e70776e..a0c5e8ff 100644 --- a/templates/staff/jams/edit_ending.html +++ b/templates/staff/jams/edit_ending.html @@ -64,87 +64,89 @@ {% endblock %} diff --git a/templates/staff/jams/edit_info.html b/templates/staff/jams/edit_info.html index 471f7aaf..75df1957 100644 --- a/templates/staff/jams/edit_info.html +++ b/templates/staff/jams/edit_info.html @@ -133,175 +133,177 @@ {% endblock %} diff --git a/templates/staff/jams/forms/preamble_edit.html b/templates/staff/jams/forms/preamble_edit.html index c2245b35..85747713 100644 --- a/templates/staff/jams/forms/preamble_edit.html +++ b/templates/staff/jams/forms/preamble_edit.html @@ -62,87 +62,89 @@ {% endblock %} diff --git a/templates/staff/tables/edit.html b/templates/staff/tables/edit.html index 421f6c45..b3b9faae 100644 --- a/templates/staff/tables/edit.html +++ b/templates/staff/tables/edit.html @@ -32,17 +32,19 @@ {% endblock %} -- cgit v1.2.3 From 805ef19e935f645825d462d60a63e8be5800170e Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Wed, 20 Jun 2018 14:25:26 +0100 Subject: [Jams] Allow editing info while preparing --- pysite/views/staff/jams/edit_info.py | 2 +- templates/staff/jams/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'templates') diff --git a/pysite/views/staff/jams/edit_info.py b/pysite/views/staff/jams/edit_info.py index ad0d3d41..4944ae67 100644 --- a/pysite/views/staff/jams/edit_info.py +++ b/pysite/views/staff/jams/edit_info.py @@ -8,7 +8,7 @@ from pysite.mixins import DBMixin from pysite.rst import render REQUIRED_KEYS = ["info_rst", "repo", "task_rst", "theme"] -ALLOWED_STATES = ["planning", "announced", "finished"] +ALLOWED_STATES = ["planning", "announced", "preparing", "finished"] class StaffView(RouteView, DBMixin): diff --git a/templates/staff/jams/index.html b/templates/staff/jams/index.html index 74292204..f140aecc 100644 --- a/templates/staff/jams/index.html +++ b/templates/staff/jams/index.html @@ -78,7 +78,7 @@  Basics - {% if jam.state in ["planning", "announced", "finished"] %} + {% if jam.state in ["planning", "announced", "preparing", "finished"] %}  Info @@ -205,7 +205,7 @@ case "preparing": document.getElementById("state-" + jam + "-preparing").removeAttribute("hidden"); - document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); + document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden"); document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); break; case "running": -- cgit v1.2.3