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.
This commit is contained in:
parent
fbdf841f33
commit
5409d4974a
26 changed files with 80 additions and 142 deletions
5
pinaxcon/registrasion/admin.py
Normal file
5
pinaxcon/registrasion/admin.py
Normal file
|
@ -0,0 +1,5 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from .models import PastEvent
|
||||
|
||||
admin.site.register(PastEvent)
|
|
@ -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,
|
||||
|
|
26
pinaxcon/registrasion/migrations/0006_auto_20170927_2301.py
Normal file
26
pinaxcon/registrasion/migrations/0006_auto_20170927_2301.py
Normal file
|
@ -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'),
|
||||
),
|
||||
]
|
|
@ -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?",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load bootstrap %}
|
||||
|
||||
{% if form.non_field_errors %}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{% extends "site_base.html" %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
|
||||
{% load i18n %}
|
||||
|
|
|
@ -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 @@
|
|||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<a id="toggle-void-invoices" href="#" onclick="toggleVoidInvoices();">Show void invoices</a>
|
||||
<button id="toggle-void-invoices" onclick="toggleVoidInvoices();">Show void invoices</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{% load registrasion_tags %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
<h2>Tax Invoice/Statement</h2>
|
||||
<h3>Linux Australia</h3>
|
||||
<h4>ABN 56 987 117 479</h4>
|
||||
|
||||
<p>
|
||||
Enquiries: please e-mail <a href="mailto:team@hobart.pyconau2017.org">team@hobart.pyconau2017.org</a>
|
||||
Enquiries: please e-mail <a href="mailto:team@lca2018.org">team@lca2018.org</a>
|
||||
</p>
|
||||
|
||||
<ul>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "registrasion/base.html" %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
{% block header_title %}Buy Your Ticket{% endblock %}
|
||||
{% block header_paragraph %}Step {{ current_step }} of {{ total_steps|add:1 }} – {{ title }} {% endblock %}
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{% extends "registrasion/base.html" %}
|
||||
{% load registrasion_tags %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block header_title %}{% conference_name %}{% endblock %}
|
||||
{% block header_paragraph %}
|
||||
<p>Monday 16 January–Friday 20 January 2017.</p>
|
||||
<p>Wrest Point Convention Centre, Hobart, Tasmania, Australia.</p>
|
||||
<p>Monday 22 January–Friday 26 January 2018.</p>
|
||||
<p>University of Technology Sydney, New South Wales, Australia.</p>
|
||||
{% endblock %}
|
||||
{% block header_inset_image %}{% illustration "tuz.svg" %}{% endblock %}
|
||||
{% block header_background_image %}{% static "pyconau2017/images/wp_bg_optimised.jpg" %}{% endblock %}
|
||||
{% block header_background_image %}{% static "lca2018/images/wp_bg_optimised.jpg" %}{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
|||
{% url "invoice_access" invoice.user.attendee.access_code as access_url %}
|
||||
<p>Your most recent unpaid invoice will be available at
|
||||
<a href="{{ access_url }}">{{ request.scheme }}://{{ request.get_host }}{{ access_url }}</a>
|
||||
You can give this URL to your accounts department to pay for this invoice.</p>
|
||||
You can print that page for your records, or give this URL to your accounts department to pay for this invoice</p>
|
||||
|
||||
<div class="btn-group">
|
||||
<a class="btn btn-default" href='{% url "registripe_card" invoice.id invoice.user.attendee.access_code %}'>Pay this invoice by card</a>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "registrasion/base.html" %}
|
||||
{% load registrasion_tags %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
{% block header_title %}Product Category: {{ category.name }}{% endblock %}
|
||||
{% block header_inset_image %}{% illustration "lavender.svg" %}{% endblock %}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% extends "registrasion/base.html" %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
{% block header_title %}Your profile{% endblock %}
|
||||
{% block header_paragraph %}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "registrasion/base.html" %}
|
||||
{% load registrasion_tags %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
{% block header_title %}Review your selection{% endblock %}
|
||||
{% block header_inset_image %}{% illustration "wineglass.svg" %}{% endblock %}
|
||||
|
@ -58,7 +58,7 @@
|
|||
the dashboard.</p>
|
||||
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="{% url "checkout" %}">
|
||||
<a class="btn btn-success" href="{% url "checkout" %}">
|
||||
<i class="fa fa-credit-card"></i> Check out and pay
|
||||
</a>
|
||||
<a class="btn btn-primary" href="{% url "dashboard" %}">Return to dashboard</a>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "registrasion/base.html" %}
|
||||
{% load registrasion_tags %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
|
||||
{% block scripts %}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% load i18n %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
<div>
|
||||
<label class="col-sm-2 col-lg-2">Submitted by</label>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
<table class="calendar table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "symposion/schedule/public_base.html" %}
|
||||
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load sitetree %}
|
||||
{% load staticfiles %}
|
||||
{% load thumbnail %}
|
||||
|
@ -11,7 +11,7 @@
|
|||
|
||||
{% block header_inset_image %}{% with audience=presentation.proposal.get_target_audience_display %}{% if audience == "Business" %}{% illustration "falls.svg" %}{% elif audience == "Community" %}{% illustration "bridge.svg" %}{% elif audience == "Developer"%}{% illustration "hobart.svg" %}{% elif audience == "User" %}{% illustration "antarctica.svg" %}{% else %}{% illustration "casino.svg" %}{% endif %}{% endwith %}{% endblock %}
|
||||
|
||||
{% block header_background_image %}{% presentation_bg_number presentation 4 as bg_number %}{% if bg_number == 0 %}{% static "pyconau2017/images/mt_anne_bg_optimised.jpg" %}{% elif bg_number == 1 %}{% static "pyconau2017/images/the_neck_bg_optimised.jpg" %}{% elif bg_number == 2 %}{% static "pyconau2017/images/snug_falls_bg_optimised.jpg" %}{% elif bg_number == 3 %}{% static "pyconau2017/images/sleepy_bay_bg_optimised.jpg" %}{% endif %}{% endblock %}
|
||||
{% block header_background_image %}{% presentation_bg_number presentation 4 as bg_number %}{% if bg_number == 0 %}{% static "lca2018/images/mt_anne_bg_optimised.jpg" %}{% elif bg_number == 1 %}{% static "lca2018/images/the_neck_bg_optimised.jpg" %}{% elif bg_number == 2 %}{% static "lca2018/images/snug_falls_bg_optimised.jpg" %}{% elif bg_number == 3 %}{% static "lca2018/images/sleepy_bay_bg_optimised.jpg" %}{% endif %}{% endblock %}
|
||||
|
||||
{% block header_title %}{{ presentation.title }}{% endblock %}
|
||||
|
||||
|
|
|
@ -3,5 +3,5 @@
|
|||
{% load staticfiles %}
|
||||
|
||||
{% comment %}
|
||||
{% block header_background_image %}{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}{% endblock %}
|
||||
{% block header_background_image %}{% static "lca2018/images/hobart_bg_optimised.jpg" %}{% endblock %}
|
||||
{% endcomment %}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% load i18n %}
|
||||
{% load cache %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
{% block head_title %}Conference Schedule{% endblock %}
|
||||
{% block header_title %}Conference Schedule{% endblock %}
|
||||
|
@ -57,16 +57,16 @@
|
|||
fragment = window.location.hash.toLowerCase().substring(1);
|
||||
|
||||
if (!fragment) {
|
||||
OFFSET = -11 * (60 * 60 * 1000); // Hobart is 11 hours ahead of UTC in Jan.
|
||||
OFFSET = -11 * (60 * 60 * 1000); // Sydney is 11 hours ahead of UTC in Jan.
|
||||
JAN = 0; // because January is 0, not 1
|
||||
|
||||
fragments = [
|
||||
{"day": "monday", "time": Date.UTC(2017, JAN, 16)},
|
||||
{"day": "tuesday", "time": Date.UTC(2017, JAN, 17)},
|
||||
{"day": "wednesday", "time": Date.UTC(2017, JAN, 18)},
|
||||
{"day": "thursday", "time": Date.UTC(2017, JAN, 19)},
|
||||
{"day": "friday", "time": Date.UTC(2017, JAN, 20)},
|
||||
{"day": "saturday", "time": Date.UTC(2017, JAN, 21)},
|
||||
{"day": "monday", "time": Date.UTC(2018, JAN, 22)},
|
||||
{"day": "tuesday", "time": Date.UTC(2018, JAN, 23)},
|
||||
{"day": "wednesday", "time": Date.UTC(2018, JAN, 24)},
|
||||
{"day": "thursday", "time": Date.UTC(2018, JAN, 25)},
|
||||
{"day": "friday", "time": Date.UTC(2018, JAN, 26)},
|
||||
{"day": "saturday", "time": Date.UTC(2018, JAN, 27)},
|
||||
];
|
||||
|
||||
now = new Date().getTime();
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% load i18n %}
|
||||
{% load cache %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load sitetree %}
|
||||
|
||||
{% block head_title %}{{ schedule.section }} Schedule{% endblock %}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% load i18n %}
|
||||
{% load cache %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load sitetree %}
|
||||
|
||||
{% block head_title %}Presentation Listing{% endblock %}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{% extends "symposion/schedule/public_base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load thumbnail %}
|
||||
|
||||
{% if speaker.photo %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
|
||||
{% spaceless %}
|
||||
<a href="{{ sponsor.external_url }}">
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{% extends "site_base.html" %}
|
||||
|
||||
{% load sponsorship_tags %}
|
||||
{% load pyconau2017_tags %}
|
||||
{% load lca2018_tags %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block head_title %}{% trans "About Our Sponsors" %}{% endblock %}
|
||||
|
|
|
@ -34,11 +34,9 @@ def proposal_permission(context, permname, proposal):
|
|||
return context.request.user.has_perm(perm)
|
||||
|
||||
|
||||
# {% load statictags %}{% static 'pyconau2017/images/svgs/illustrations/' %}{{ illustration }}
|
||||
|
||||
@register.simple_tag(takes_context=False)
|
||||
def illustration(name):
|
||||
return staticfiles.static('pyconau2017/images/svgs/illustrations/') + name
|
||||
return staticfiles.static('lca2018/images/svgs/illustrations/') + name
|
||||
|
||||
|
||||
@register.simple_tag(takes_context=True)
|
|
@ -1,100 +0,0 @@
|
|||
import hashlib
|
||||
|
||||
import os
|
||||
|
||||
from decimal import Decimal
|
||||
from django import template
|
||||
from django.conf import settings
|
||||
from django.contrib.staticfiles.templatetags import staticfiles
|
||||
from easy_thumbnails.files import get_thumbnailer
|
||||
from symposion.conference import models as conference_models
|
||||
from symposion.schedule.models import Track
|
||||
|
||||
CONFERENCE_ID = settings.CONFERENCE_ID
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@register.assignment_tag()
|
||||
def classname(ob):
|
||||
return ob.__class__.__name__
|
||||
|
||||
|
||||
@register.simple_tag(takes_context=True)
|
||||
def can_manage(context, proposal):
|
||||
return proposal_permission(context, "manage", proposal)
|
||||
|
||||
|
||||
@register.simple_tag(takes_context=True)
|
||||
def can_review(context, proposal):
|
||||
return proposal_permission(context, "review", proposal)
|
||||
|
||||
|
||||
def proposal_permission(context, permname, proposal):
|
||||
slug = proposal.kind.section.slug
|
||||
perm = "reviews.can_%s_%s" % (permname, slug)
|
||||
return context.request.user.has_perm(perm)
|
||||
|
||||
|
||||
# {% load statictags %}{% static 'pyconau2017/images/svgs/illustrations/' %}{{ illustration }}
|
||||
|
||||
@register.simple_tag(takes_context=False)
|
||||
def illustration(name):
|
||||
return staticfiles.static('pyconau2017/images/svgs/illustrations/') + name
|
||||
|
||||
|
||||
@register.simple_tag(takes_context=True)
|
||||
def speaker_photo(context, speaker, size):
|
||||
''' Provides the speaker profile, or else fall back to libravatar or gravatar. '''
|
||||
|
||||
if speaker.photo:
|
||||
thumbnailer = get_thumbnailer(speaker.photo)
|
||||
thumbnail_options = {'crop': True, 'size': (size, size)}
|
||||
thumbnail = thumbnailer.get_thumbnail(thumbnail_options)
|
||||
return thumbnail.url
|
||||
else:
|
||||
email = speaker.user.email.encode("utf-8")
|
||||
md5sum = hashlib.md5(email.strip().lower()).hexdigest()
|
||||
fallback_image = ("https://2017.pycon-au.org/site_media/static"
|
||||
"/pyconau23017/images/speaker-fallback-devil.jpg")
|
||||
url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, fallback_image)
|
||||
|
||||
return url
|
||||
|
||||
|
||||
@register.simple_tag()
|
||||
def define(value):
|
||||
return value
|
||||
|
||||
|
||||
@register.simple_tag()
|
||||
def presentation_bg_number(presentation, count):
|
||||
return sum(ord(i) for i in presentation.title) % count
|
||||
|
||||
|
||||
@register.filter()
|
||||
def gst(amount):
|
||||
two_places = Decimal(10) ** -2
|
||||
return Decimal(amount / 11).quantize(two_places)
|
||||
|
||||
|
||||
@register.simple_tag()
|
||||
def conference_name():
|
||||
return conference_models.Conference.objects.get(id=CONFERENCE_ID).title
|
||||
|
||||
|
||||
@register.filter()
|
||||
def trackname(room, day):
|
||||
try:
|
||||
track_name = room.track_set.get(day=day).name
|
||||
except Track.DoesNotExist:
|
||||
track_name = None
|
||||
return track_name
|
||||
|
||||
|
||||
@register.simple_tag()
|
||||
def sponsor_thumbnail(sponsor_logo):
|
||||
if sponsor_logo is not None:
|
||||
if sponsor_logo.upload:
|
||||
return sponsor_logo.upload.url
|
||||
return ""
|
Loading…
Reference in a new issue