From 54fceededa3f66e8f45f5b3e9af878c2cad379ca Mon Sep 17 00:00:00 2001 From: James Polley Date: Sun, 24 Sep 2017 20:40:19 +1000 Subject: [PATCH 01/40] Just one void invoices button is sufficient thanks And yes, this is changing it back to a button; having it as a link isn't quite what we want. --- pinaxcon/templates/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index f681707a..70d0084b 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -125,9 +125,9 @@ Invoice {{ invoice.id }} - ${{ invoice.value }} ({{ invoice.get_status_display }}) - Show void invoices {% endfor %} + Show void invoices From fbdf841f334cb7a7a2097e65c182ac9d59ba76eb Mon Sep 17 00:00:00 2001 From: James Polley Date: Wed, 27 Sep 2017 18:31:53 +1000 Subject: [PATCH 02/40] Reorder dockerfile This creates more intermediates, but moves those that are less likely to change to the top of the file. In theory this will produce faster builds on a developer's machine as they won't need to apt-get update every time. --- docker/Dockerfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 688276bf..9d24545c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,8 @@ FROM python:3.6 -COPY constraints.txt requirements.txt /reqs/ + +RUN set -ex \ + && apt-get update RUN set -ex \ && buildDeps=' \ @@ -15,12 +17,18 @@ RUN set -ex \ libmemcached-dev \ libsasl2-dev \ ' \ - && apt-get update \ + && apt-get install -y git xmlsec1 libmysqlclient18 \ && apt-get install -y $buildDeps --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* + +RUN set -ex \ + && pip install uwsgi + +COPY constraints.txt requirements.txt /reqs/ + +RUN set -ex \ && pip install --no-cache-dir -r /reqs/requirements.txt -c /reqs/constraints.txt \ - && pip install uwsgi \ && apt-get purge -y --auto-remove $buildDeps \ && rm -rf /usr/src/python ~/.cache From 5409d4974aedf5d01e50d72770eb53746b5029ad Mon Sep 17 00:00:00 2001 From: James Polley Date: Wed, 27 Sep 2017 23:46:13 +1000 Subject: [PATCH 03/40] The 2018ificiation I think this removes most references to "hobart", "pycon", and "2017" There are still some references to some images that we don't have a replacement for. --- pinaxcon/registrasion/admin.py | 5 + .../management/commands/populate_inventory.py | 4 +- .../migrations/0006_auto_20170927_2301.py | 26 +++++ pinaxcon/registrasion/models.py | 13 ++- pinaxcon/templates/_form_snippet.html | 2 +- pinaxcon/templates/content_page.html | 2 +- pinaxcon/templates/dashboard.html | 4 +- .../registrasion/_invoice_details.html | 4 +- .../registrasion/guided_registration.html | 2 +- pinaxcon/templates/registrasion/invoice.html | 10 +- .../registrasion/product_category.html | 2 +- .../templates/registrasion/profile_form.html | 2 +- pinaxcon/templates/registrasion/review.html | 4 +- .../stripe/credit_card_payment.html | 2 +- .../symposion/proposals/_proposal_fields.html | 2 +- .../templates/symposion/schedule/_grid.html | 2 +- .../schedule/presentation_detail.html | 4 +- .../symposion/schedule/public_base.html | 2 +- .../schedule/schedule_conference.html | 16 +-- .../symposion/schedule/schedule_detail.html | 2 +- .../symposion/schedule/schedule_list.html | 2 +- .../symposion/speakers/speaker_profile.html | 2 +- .../symposion/sponsorship/_sponsor_link.html | 2 +- .../templates/symposion/sponsorship/list.html | 2 +- .../{lca2017_tags.py => lca2018_tags.py} | 4 +- pinaxcon/templatetags/pyconau2017_tags.py | 100 ------------------ 26 files changed, 80 insertions(+), 142 deletions(-) create mode 100644 pinaxcon/registrasion/admin.py create mode 100644 pinaxcon/registrasion/migrations/0006_auto_20170927_2301.py rename pinaxcon/templatetags/{lca2017_tags.py => lca2018_tags.py} (93%) delete mode 100644 pinaxcon/templatetags/pyconau2017_tags.py diff --git a/pinaxcon/registrasion/admin.py b/pinaxcon/registrasion/admin.py new file mode 100644 index 00000000..09679267 --- /dev/null +++ b/pinaxcon/registrasion/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin + +from .models import PastEvent + +admin.site.register(PastEvent) diff --git a/pinaxcon/registrasion/management/commands/populate_inventory.py b/pinaxcon/registrasion/management/commands/populate_inventory.py index ae2a09e6..eb0011e0 100644 --- a/pinaxcon/registrasion/management/commands/populate_inventory.py +++ b/pinaxcon/registrasion/management/commands/populate_inventory.py @@ -13,7 +13,7 @@ from symposion import proposals class Command(BaseCommand): - help = 'Populates the inventory with the LCA2017 inventory model' + help = 'Populates the inventory with the LCA2018 inventory model' def add_arguments(self, parser): pass @@ -111,7 +111,7 @@ class Command(BaseCommand): inv.Category, ("name",), name="T-Shirt", - description="Commemorative conference t-shirts, featuring the" + description="Commemorative conference t-shirts, featuring the " "linux.conf.au 2018 artwork.", required=False, render_type=inv.Category.RENDER_TYPE_ITEM_QUANTITY, diff --git a/pinaxcon/registrasion/migrations/0006_auto_20170927_2301.py b/pinaxcon/registrasion/migrations/0006_auto_20170927_2301.py new file mode 100644 index 00000000..98330ac6 --- /dev/null +++ b/pinaxcon/registrasion/migrations/0006_auto_20170927_2301.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-27 13:01 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pinaxcon_registrasion', '0005_auto_20170702_2233'), + ] + + operations = [ + migrations.AddField( + model_name='attendeeprofile', + name='future_conference', + field=models.BooleanField(default=False, help_text='Select to have your login details made available to future Linux Australia conferences who share the same Single Sign On system.', verbose_name='Reuse my login for future Linux Australia conferences?'), + preserve_default=False, + ), + migrations.AlterField( + model_name='attendeeprofile', + name='lca_chat', + field=models.BooleanField(help_text='lca2018-chat is a high-traffic mailing list used by attendees during the week of the conference for general discussion.', verbose_name='Subscribe to the lca2018-chat list'), + ), + ] diff --git a/pinaxcon/registrasion/models.py b/pinaxcon/registrasion/models.py index f30af712..d341738d 100644 --- a/pinaxcon/registrasion/models.py +++ b/pinaxcon/registrasion/models.py @@ -179,13 +179,22 @@ class AttendeeProfile(rego.AttendeeProfileBase): ) lca_chat = models.BooleanField( - verbose_name="Subscribe to the lca2017-chat list", - help_text="lca2017-chat is a high-traffic mailing list used by " + verbose_name="Subscribe to the lca2018-chat list", + help_text="lca2018-chat is a high-traffic mailing list used by " "attendees during the week of the conference for general " "discussion.", blank=True, ) + future_conference = models.BooleanField( + verbose_name = "Reuse my login for future Linux Australia conferences?", + help_text="Select to have your login details made available to future " + "Linux Australia conferences who share the same Single Sign " + "On system.", + blank=True, + ) + + past_lca = models.ManyToManyField( PastEvent, verbose_name="Which past linux.conf.au events have you attended?", diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html index 7d64b937..1e5193a3 100644 --- a/pinaxcon/templates/_form_snippet.html +++ b/pinaxcon/templates/_form_snippet.html @@ -1,4 +1,4 @@ -{% load pyconau2017_tags %} +{% load lca2018_tags %} {% load bootstrap %} {% if form.non_field_errors %} diff --git a/pinaxcon/templates/content_page.html b/pinaxcon/templates/content_page.html index 1b87f005..7fb76a8e 100644 --- a/pinaxcon/templates/content_page.html +++ b/pinaxcon/templates/content_page.html @@ -1,7 +1,7 @@ {% extends "site_base.html" %} {% load staticfiles %} -{% load pyconau2017_tags %} +{% load lca2018_tags %} {% load i18n %} diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 70d0084b..eab991c5 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -5,7 +5,7 @@ {% load review_tags %} {% load teams_tags %} {% load registrasion_tags %} -{% load pyconau2017_tags %} +{% load lca2018_tags %} {% load staticfiles %} @@ -127,7 +127,7 @@ {% endfor %} - Show void invoices + diff --git a/pinaxcon/templates/registrasion/_invoice_details.html b/pinaxcon/templates/registrasion/_invoice_details.html index 12142037..0eba3c02 100644 --- a/pinaxcon/templates/registrasion/_invoice_details.html +++ b/pinaxcon/templates/registrasion/_invoice_details.html @@ -1,12 +1,12 @@ {% load registrasion_tags %} -{% load pyconau2017_tags %} +{% load lca2018_tags %}

Tax Invoice/Statement

Linux Australia

ABN 56 987 117 479

- Enquiries: please e-mail team@hobart.pyconau2017.org + Enquiries: please e-mail team@lca2018.org