From 9a25ca1754ef95960627274dccaf0614b6d7895b Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Tue, 10 Jan 2017 21:31:18 +1100 Subject: [PATCH] Chrisjrn/session chair (#94) * Adds session_detail page * Adds session chairing information to the schedule grid * Adds session_list.html * Nicer volunteer text Conflicts: pinaxcon/templates/symposion/schedule/_grid.html Conflict and migration performed by Sachi King Emoji changed, lca2017_tags to lca2018_tags, remove needless dependency on django-user-account, use request instead like the remainder of the calls n the template do anyways. Remove blocktrans from a number of texts as they break {{ templating }} and we don't translate anyways. Modified-by: Sachi King --- .../templates/symposion/schedule/_grid.html | 16 +++- .../symposion/schedule/session_detail.html | 80 +++++++++++++++++++ .../symposion/schedule/session_list.html | 63 +++++++++++++++ requirements.txt | 1 + 4 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 pinaxcon/templates/symposion/schedule/session_detail.html create mode 100644 pinaxcon/templates/symposion/schedule/session_list.html diff --git a/pinaxcon/templates/symposion/schedule/_grid.html b/pinaxcon/templates/symposion/schedule/_grid.html index 41722f98..ef138b7b 100644 --- a/pinaxcon/templates/symposion/schedule/_grid.html +++ b/pinaxcon/templates/symposion/schedule/_grid.html @@ -14,7 +14,7 @@ {% for room in timetable.rooms %} {% with room|trackname:timetable.day as track_name %} {% if track_name %}

{{ track_name }}{% endif %} - {% endwith %} + {% endwith %} {% endfor %} {% endif %} @@ -35,6 +35,20 @@ {{ slot.content.speakers|join:", " }} + {% if slot.sessions %} +

+ {% for session in slot.sessions.all %} + {% if not session.chair %} +
+ Volunteer! 🙋 + {% elif session.chair.user == request.user %} +
+ (You are session chair) + {% endif %} + + {% endfor %} +
+ {% endif %} {% endif %} {% elif slot.kind.label == "shortbreak" %} {% else %} diff --git a/pinaxcon/templates/symposion/schedule/session_detail.html b/pinaxcon/templates/symposion/schedule/session_detail.html new file mode 100644 index 00000000..3f59677c --- /dev/null +++ b/pinaxcon/templates/symposion/schedule/session_detail.html @@ -0,0 +1,80 @@ +{% extends "symposion/schedule/public_base.html" %} + +{% load lca2018_tags %} +{% load sitetree %} +{% load staticfiles %} +{% load thumbnail %} +{% load i18n %} + + +{% block head_title %}Session: {{ session }}{% endblock %} + +{% block breadcrumbs %}{% sitetree_breadcrumbs from "main" %}{% endblock %} + +{% block header_inset_image %}{{ block.super }}{% endblock %} + +{% block header_background_image %}{{ block.super }}{% endblock %} + +{% block header_title %}Session: {{ session }}{% endblock %} + +{% block header_paragraph %} + +{% endblock %} + +{% block content %} + +
+
{% trans "Session Chair" %}
+
+ {% if chair %} + {{ chair.attendee.attendeeprofilebase.attendeeprofile.name }} + {% if request.user == chair %} +
+ {% csrf_token %} + + +
+ {% endif %} + {% else %} + {% if request.user.is_authenticated %} + {% if request.user.attendee.completed_registration %} + {% if not chair_denied %} +
+ {% csrf_token %} + + +
+ {% endif %} + {% else %} + {% url 'guided_registration' as guided_registration %} + Click here to get a ticket for the conference, and enable volunteering for session roles. + {% endif %} + {% else %} + Sign up and log in to volunteer to be session chair. + {% endif %} + {% endif %} +
+
{% trans "Session Runner" %}
+
+ {% if runner %} + {{ runner.profile.display_name }} + {% else %} + {% blocktrans %}Session runner not assigned.{% endblocktrans %} + {% endif %} +
+
+ +

Slots

+ + + {% for slot in session.slots.all %} + + + + + {% empty %} +
  • {% trans "No slots in session." %}
  • + {% endfor %} +
    {{ slot }}{% if slot.content %}{{ slot.content }}{% endif %}
    + +{% endblock %} diff --git a/pinaxcon/templates/symposion/schedule/session_list.html b/pinaxcon/templates/symposion/schedule/session_list.html new file mode 100644 index 00000000..33fe3c8f --- /dev/null +++ b/pinaxcon/templates/symposion/schedule/session_list.html @@ -0,0 +1,63 @@ +{% extends "symposion/schedule/public_base.html" %} + +{% load lca2018_tags %} +{% load sitetree %} +{% load staticfiles %} +{% load thumbnail %} +{% load i18n %} + + +{% block head_title %}Sessions{% endblock %} + +{% block breadcrumbs %}{% sitetree_breadcrumbs from "main" %}{% endblock %} + +{% block header_inset_image %}{{ block.super }}{% endblock %} + +{% block header_background_image %}{{ block.super }}{% endblock %} + +{% block header_title %}Sessions{% endblock %} + +{% block header_paragraph %} + +{% endblock %} + +{% block content %} + + +{% endblock %} diff --git a/requirements.txt b/requirements.txt index 921aea38..429d7802 100644 --- a/requirements.txt +++ b/requirements.txt @@ -42,3 +42,4 @@ pinax-stripe==3.2.1 requests>=2.11.1 stripe==1.38.0 +django-user-accounts