From 918f4ab6f98b02527f3de81967899a23e3ca33b3 Mon Sep 17 00:00:00 2001
From: Tobias <tobias@localhost.localdomain>
Date: Mon, 1 Oct 2018 09:37:08 +1300
Subject: [PATCH] Various small/typo fixes
---
.../registrasion/migrations/0001_initial.py | 1 -
.../migrations/0011_add_2018_conf.py | 19 +++++++++++++++++++
.../flatpages/programme_overview.html | 2 +-
pinaxcon/templates/flatpages/shirts.html | 2 +-
.../templates/flatpages/tickets_prices.html | 10 +++-------
.../symposion/dashboard/_categories.html | 2 +-
6 files changed, 25 insertions(+), 11 deletions(-)
create mode 100644 pinaxcon/registrasion/migrations/0011_add_2018_conf.py
diff --git a/pinaxcon/registrasion/migrations/0001_initial.py b/pinaxcon/registrasion/migrations/0001_initial.py
index 166668e0..58aefa6b 100644
--- a/pinaxcon/registrasion/migrations/0001_initial.py
+++ b/pinaxcon/registrasion/migrations/0001_initial.py
@@ -26,7 +26,6 @@ _PAST_EVENTS = (
(2015, "2015 Auckland"),
(2016, "2016 Geelong"),
(2017, "2017 Hobart"),
- (2018, "2018 Sydney"),
)
diff --git a/pinaxcon/registrasion/migrations/0011_add_2018_conf.py b/pinaxcon/registrasion/migrations/0011_add_2018_conf.py
new file mode 100644
index 00000000..ab7764ea
--- /dev/null
+++ b/pinaxcon/registrasion/migrations/0011_add_2018_conf.py
@@ -0,0 +1,19 @@
+from django.db import migrations
+
+
+def populate(apps, schema_editor):
+ PastEvent = apps.get_model("pinaxcon_registrasion","PastEvent")
+ PastEvent.objects.get_or_create(
+ year=2018, defaults={'name': '2018 Sydney'}
+ )
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('pinaxcon_registrasion', '0010_auto_20180929_1530'),
+ ]
+
+ operations = [
+ migrations.RunPython(populate)
+ ]
diff --git a/pinaxcon/templates/flatpages/programme_overview.html b/pinaxcon/templates/flatpages/programme_overview.html
index 555bd9b2..de1c0b0a 100644
--- a/pinaxcon/templates/flatpages/programme_overview.html
+++ b/pinaxcon/templates/flatpages/programme_overview.html
@@ -121,7 +121,7 @@
<p>35-45 minute presentations on a single topic. These are generally presented in lecture format and form the bulk of the available conference slots.</p>
<h3>Tutorials</h3>
- <p>90 minute interactive learning sessions being held in the Medium Lecture Theatr (CB11.00.401). Particpants will gain some hands on knowledge or experience in a topic.These are generally presented in a classroom format and are interactive or hands-on in nature. Some tutorials will require prepartation work to be done or some hardware to be purchased prior to their attendance - please check the individual tutorial descriptions for more information.</p>
+ <p>90 minute interactive learning sessions. Particpants will gain some hands on knowledge or experience in a topic.These are generally presented in a classroom format and are interactive or hands-on in nature. Some tutorials will require prepartation work to be done or some hardware to be purchased prior to their attendance - please check the individual tutorial descriptions for more information.</p>
<h3>Lightning Talks</h3>
<p>On Friday afternoon the now traditional lightning talks (3-5 minutes each) take place. </p>
diff --git a/pinaxcon/templates/flatpages/shirts.html b/pinaxcon/templates/flatpages/shirts.html
index 1a2f2ec8..2de7c9ff 100644
--- a/pinaxcon/templates/flatpages/shirts.html
+++ b/pinaxcon/templates/flatpages/shirts.html
@@ -29,7 +29,7 @@
</thead>
<tbody>
<tr>
- <th>Chest</th>
+ <th>Half Chest</th>
<td>43</td>
<td>46</td>
<td>49</td>
diff --git a/pinaxcon/templates/flatpages/tickets_prices.html b/pinaxcon/templates/flatpages/tickets_prices.html
index 001b68b4..5d76da58 100644
--- a/pinaxcon/templates/flatpages/tickets_prices.html
+++ b/pinaxcon/templates/flatpages/tickets_prices.html
@@ -26,7 +26,7 @@
<div class="card-body">
<p class="card-title"><strong>Early Bird <br />Registrations Close</strong></p>
</div>
- <div class="card-footer bg-secondary">October 31st 2018</div>
+ <div class="card-footer bg-secondary">October 31st 2018 or when sold out</div>
</div>
<div class="card">
<div class="card-body">
@@ -35,10 +35,6 @@
<div class="card-footer bg-secondary">January 15th 2019</div>
</div>
<div class="card">
- <div class="card-body">
- <p class="card-title"><strong>Extended <br />Registrations Close</strong></p>
- </div>
- <div class="card-footer bg-secondary">January 22nd 2019</div>
</div>
</div>
</div>
@@ -92,8 +88,8 @@
<tr>
<th>Penguin Dinner</th>
<td>Yes</td>
- <td></td>
- <td></td>
+ <td>Optional</td>
+ <td>Optional</td>
</tr>
<tr>
<th>PDNS</th>
diff --git a/pinaxcon/templates/symposion/dashboard/_categories.html b/pinaxcon/templates/symposion/dashboard/_categories.html
index cfb9362f..d35a6b5f 100644
--- a/pinaxcon/templates/symposion/dashboard/_categories.html
+++ b/pinaxcon/templates/symposion/dashboard/_categories.html
@@ -48,7 +48,7 @@
<h3>Attendee Profile</h3>
</div>
<div class="panel-body">
- <p>If you would like to change the details on your badge or your attendee statistics, you may edit your attendee profile up until the 15th January 2018</p>
+ <p>If you would like to change the details on your badge or your attendee statistics, you may edit your attendee profile here.</p>
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "attendee_edit" %}">Edit attendee profile</a>
</div>
</div>