diff --git a/RIGS/templates/partials/event_table.html b/RIGS/templates/partials/event_table.html index b1a29088..f360d90c 100644 --- a/RIGS/templates/partials/event_table.html +++ b/RIGS/templates/partials/event_table.html @@ -1,113 +1,104 @@ {% load namewithnotes from filters %} - -
-
-
#
-
Dates & Times
-
Event Details
-
MIC
-
- {% for event in events %} -
+ + + + + + + + + + + {% for event in events %} + - -
{{ event.display_id }}
- -
- Start: {{ event.start_date|date:"D d/m/Y" }} - {% if event.has_start_time %} - {{ event.start_time|date:"H:i" }} - {% endif %} - - {% if event.end_date %} -
- End: {% if event.end_date != event.start_date %}{{ event.end_date|date:"D d/m/Y" }}{% endif %} - {% if event.has_end_time %} - {{ event.end_time|date:"H:i" }} + +
+ + + + + + + + {% empty %} + + + + {% endfor %} + +
#Dates & TimesEvent DetailsMIC
{{ event.display_id }} + Start: {{ event.start_date|date:"D d/m/Y" }} + {% if event.has_start_time %} + {{ event.start_time|date:"H:i" }} {% endif %} - {% endif %} - {% if not event.cancelled %} - {% if event.meet_at %} -
Crew meet: {{ event.meet_at|date:"H:i" }} {{ event.meet_at|date:"(d/m/Y)" }} - {% endif %} - {% if event.access_at %} -
Access at: {{ event.access_at|date:"H:i" }} {{ event.access_at|date:"(d/m/Y)" }} - {% endif %} - {% endif %} - - -
-

- - {{ event.name }} - - {% if event.venue %} - at {{ event.venue|namewithnotes:'venue_detail' }} - {% endif %} - {% if event.dry_hire %} - Dry Hire - {% endif %} -

- {% if event.is_rig and not event.cancelled %} -
- {{ event.person.name }} - {% if event.organisation %} - for {{ event.organisation.name }} + {% if event.end_date %} +
+ End: {% if event.end_date != event.start_date %}{{ event.end_date|date:"D d/m/Y" }}{% endif %} + {% if event.has_end_time %} + {{ event.end_time|date:"H:i" }} {% endif %} -
- {% endif %} - {% if not event.cancelled and event.description %} -

{{ event.description|linebreaksbr }}

- {% endif %} - {% include 'partials/event_status.html' %} -
- -
+

+ + {{ event.name }} + {% if event.venue %} + at {{ event.venue|namewithnotes:'venue_detail' }} + {% endif %} + {% if event.dry_hire %} + Dry Hire + {% endif %} +

+ {% if event.is_rig and not event.cancelled %} +
+ {{ event.person.name }} + {% if event.organisation %} + for {{ event.organisation.name }} + {% endif %} +
{% endif %} - {% elif event.is_rig %} - - {% endif %} - - - {% endfor %} + {% if not event.cancelled and event.description %} +

{{ event.description|linebreaksbr }}

+ {% endif %} + {% include 'partials/event_status.html' %} +
+ {% if event.mic %} + {% if perms.RIGS.view_profile %} + + {% endif %} + + {{ event.mic }} + {% if perms.RIGS.view_profile %} + + {% endif %} + {% elif event.is_rig %} + + {% endif %} +
No events found
diff --git a/gulpfile.js b/gulpfile.js index 9fc24d98..73200aaa 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -80,7 +80,7 @@ function browserSync(done) { spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'}); // TODO Wait for Django server to come up before browsersync, it seems inconsistent browsersync.init({ - notify: true, + notify: false, open: false, port: 8001, proxy: 'localhost:8000'