diff --git a/Pipfile b/Pipfile index 945245c8..201ffa3f 100644 --- a/Pipfile +++ b/Pipfile @@ -22,8 +22,7 @@ dj-static = "~=0.0.6" Django = "~=3.2" django-debug-toolbar = "~=3.2" django-filter = "~=2.4.0" -django-ical = "~=1.7.1" -django-recurrence = "~=1.10.3" +django-ical = "~=1.8.3" django-registration-redux = "~=2.9" django-reversion = "~=3.0.9" django-toolbelt = "~=0.0.1" diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html index afa8d5b7..241e924c 100644 --- a/RIGS/templates/event_form.html +++ b/RIGS/templates/event_form.html @@ -106,6 +106,10 @@ title="Things that aren't service-based, like training, meetings and site visits."> + + Subhire + diff --git a/RIGS/templates/subhire_form.html b/RIGS/templates/subhire_form.html index 123cd59d..f75fe350 100644 --- a/RIGS/templates/subhire_form.html +++ b/RIGS/templates/subhire_form.html @@ -40,7 +40,7 @@ {% include 'form_errors.html' %} {# Contact details #} -
+
Contact Details
@@ -93,6 +93,16 @@
+
+
+
Associated Event(s)
+
+
+ +
+
+
+
{# Event details #}
@@ -150,33 +160,27 @@
-
-
Associated Event(s)
-
-
- -
-
-
-
-
Equipment Information
-
-
- -
- {% render_field form.description class+="form-control" %} +
+
+
Equipment Information
+
+
+ +
+ {% render_field form.description class+="form-control" %} +
-
-
- -
-
£
- {% render_field form.insurance_value class+="form-control" %} -
-
- If this value is greater than £50,000 then please email productions@nottinghamtec.co.uk in addition to complete the additional insurance requirements +
+ +
+
£
+ {% render_field form.insurance_value class+="form-control" %} +
+
+ If this value is greater than £50,000 then please email productions@nottinghamtec.co.uk in addition to complete the additional insurance requirements +