From 8dc8f5f34ab39e30778b22d035274ca90f9a678e Mon Sep 17 00:00:00 2001 From: James Tauber Date: Thu, 20 Sep 2012 22:02:02 -0400 Subject: [PATCH] moved _grid to _edit_grid and implemented read-only grid version --- symposion/templates/schedule/_edit_grid.html | 27 +++++++++++ symposion/templates/schedule/_grid.html | 3 +- .../templates/schedule/schedule_detail.html | 46 +++++++++++++++++++ .../templates/schedule/schedule_edit.html | 2 +- 4 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 symposion/templates/schedule/_edit_grid.html create mode 100644 symposion/templates/schedule/schedule_detail.html diff --git a/symposion/templates/schedule/_edit_grid.html b/symposion/templates/schedule/_edit_grid.html new file mode 100644 index 00000000..cb4ffe1a --- /dev/null +++ b/symposion/templates/schedule/_edit_grid.html @@ -0,0 +1,27 @@ + + + + {% for room in timetable.rooms %} + + {% endfor %} + + {% for row in timetable %} + + + {% for slot in row.slots %} + + {% endfor %} + + {% endfor %} +
 {{ room.name }}
{{ row.time|date:"h:iA" }} + {% if slot.kind.label == "talk" %} + {% if not slot.content %} + + + {% else %} + +
{{ slot.content.speaker }}
+ {% endif %} + {% else %} + {{ slot.kind.label }} + {% endif %} +
\ No newline at end of file diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html index cb4ffe1a..0ff0d814 100644 --- a/symposion/templates/schedule/_grid.html +++ b/symposion/templates/schedule/_grid.html @@ -12,9 +12,8 @@ {% if slot.kind.label == "talk" %} {% if not slot.content %} - + {% else %} -
{{ slot.content.title }}
+
{{ slot.content.title }}
{{ slot.content.speaker }}
{% endif %} {% else %} diff --git a/symposion/templates/schedule/schedule_detail.html b/symposion/templates/schedule/schedule_detail.html new file mode 100644 index 00000000..9761bdd1 --- /dev/null +++ b/symposion/templates/schedule/schedule_detail.html @@ -0,0 +1,46 @@ +{% extends "site_base.html" %} + +{% load i18n %} +{% load bootstrap_tags %} + +{% block head_title %}Conference Schedule Edit{% endblock %} + +{% block body_class %}full{% endblock %} + +{% block right %} +{% endblock %} + +{% block extra_head %} + +{% endblock %} + +{% block body_outer %} +
+
+

Schedule

+ + {% for timetable in days %} +

{{ timetable.day.date }}

+ {% include "schedule/_grid.html" %} + {% endfor %} +
+
+{% endblock %} diff --git a/symposion/templates/schedule/schedule_edit.html b/symposion/templates/schedule/schedule_edit.html index ad26c2fe..c20acf7a 100644 --- a/symposion/templates/schedule/schedule_edit.html +++ b/symposion/templates/schedule/schedule_edit.html @@ -43,7 +43,7 @@ {% for timetable in days %}

{{ timetable.day.date }}

- {% include "schedule/_grid.html" %} + {% include "schedule/_edit_grid.html" %} {% endfor %}