Changeset - 918f4ab6f98b
[Not reviewed]
0 5 1
Tobias - 6 years ago 2018-09-30 20:37:08
tobias@localhost.localdomain
Various small/typo fixes
6 files changed with 25 insertions and 11 deletions:
0 comments (0 inline, 0 general)
pinaxcon/registrasion/migrations/0001_initial.py
Show inline comments
...
 
@@ -26,7 +26,6 @@ _PAST_EVENTS = (
 
    (2015, "2015 Auckland"),
 
    (2016, "2016 Geelong"),
 
    (2017, "2017 Hobart"),
 
    (2018, "2018 Sydney"),
 
)
 

	
 

	
pinaxcon/registrasion/migrations/0011_add_2018_conf.py
Show inline comments
 
new file 100644
 
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)
 
    ]
pinaxcon/templates/flatpages/programme_overview.html
Show inline comments
...
 
@@ -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>
pinaxcon/templates/flatpages/shirts.html
Show inline comments
...
 
@@ -29,7 +29,7 @@
 
      </thead>
 
      <tbody>
 
        <tr>
 
          <th>Chest</th>
 
          <th>Half Chest</th>
 
          <td>43</td>
 
          <td>46</td>
 
          <td>49</td>
pinaxcon/templates/flatpages/tickets_prices.html
Show inline comments
...
 
@@ -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>
pinaxcon/templates/symposion/dashboard/_categories.html
Show inline comments
...
 
@@ -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>
0 comments (0 inline, 0 general)