Many changes, mostly from lca to pyconau.
This commit is contained in:
parent
ce8e6b159e
commit
8d68cca01f
38 changed files with 328 additions and 51 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,4 +1,5 @@
|
||||||
*.pyc
|
*.pyc
|
||||||
|
*.sublime-workspace
|
||||||
node_modules/
|
node_modules/
|
||||||
_build/
|
_build/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
|
@ -44,6 +44,8 @@ ILLUSTRATION_DEVIL = "devil.svg"
|
||||||
ILLUSTRATION_FALLS = "falls.svg"
|
ILLUSTRATION_FALLS = "falls.svg"
|
||||||
ILLUSTRATION_HOBART = "hobart.svg"
|
ILLUSTRATION_HOBART = "hobart.svg"
|
||||||
ILLUSTRATION_LAVENDER = "lavender.svg"
|
ILLUSTRATION_LAVENDER = "lavender.svg"
|
||||||
|
ILLUSTRATION_PYCONAU = "logo-mel.png"
|
||||||
|
ILLUSTRATION_PYTHON = "Python-logo-notext.svg"
|
||||||
ILLUSTRATION_TUZ = "tuz.svg"
|
ILLUSTRATION_TUZ = "tuz.svg"
|
||||||
ILLUSTRATION_WINEGLASS = "wineglass.svg"
|
ILLUSTRATION_WINEGLASS = "wineglass.svg"
|
||||||
|
|
||||||
|
@ -56,6 +58,8 @@ ILLUSTRATION_TYPES = (
|
||||||
(ILLUSTRATION_FALLS, "Waterfall"),
|
(ILLUSTRATION_FALLS, "Waterfall"),
|
||||||
(ILLUSTRATION_HOBART, "Hobart"),
|
(ILLUSTRATION_HOBART, "Hobart"),
|
||||||
(ILLUSTRATION_LAVENDER, "Lavender"),
|
(ILLUSTRATION_LAVENDER, "Lavender"),
|
||||||
|
(ILLUSTRATION_PYCONAU, "Pycon AU"),
|
||||||
|
(ILLUSTRATION_PYTHON, "Python"),
|
||||||
(ILLUSTRATION_TUZ, "Tuz"),
|
(ILLUSTRATION_TUZ, "Tuz"),
|
||||||
(ILLUSTRATION_WINEGLASS, "Wineglass"),
|
(ILLUSTRATION_WINEGLASS, "Wineglass"),
|
||||||
)
|
)
|
||||||
|
|
|
@ -142,7 +142,7 @@ INSTALLED_APPS = [
|
||||||
"django.contrib.sites",
|
"django.contrib.sites",
|
||||||
"django.contrib.staticfiles",
|
"django.contrib.staticfiles",
|
||||||
"django.contrib.humanize",
|
"django.contrib.humanize",
|
||||||
|
|
||||||
# theme
|
# theme
|
||||||
"bootstrapform",
|
"bootstrapform",
|
||||||
"pinax_theme_bootstrap",
|
"pinax_theme_bootstrap",
|
||||||
|
@ -299,7 +299,7 @@ PINAX_STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "your test secret
|
||||||
PINAX_STRIPE_SEND_EMAIL_RECEIPTS = False
|
PINAX_STRIPE_SEND_EMAIL_RECEIPTS = False
|
||||||
|
|
||||||
# Wagtail config
|
# Wagtail config
|
||||||
WAGTAIL_SITE_NAME = 'linux.conf.au 2017'
|
WAGTAIL_SITE_NAME = 'Pycon Australia 2017'
|
||||||
WAGTAIL_APPEND_SLASH = True
|
WAGTAIL_APPEND_SLASH = True
|
||||||
WAGTAILIMAGES_IMAGE_MODEL = 'cms_pages.CustomImage'
|
WAGTAILIMAGES_IMAGE_MODEL = 'cms_pages.CustomImage'
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% if form.non_field_errors %}
|
{% if form.non_field_errors %}
|
||||||
<div class="has-errors">
|
<div class="has-errors">
|
||||||
{{ form.non_field_errors }}
|
{{ form.non_field_errors }}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{% extends "lca2017/content_page.html" %}
|
{% extends "pyconau2017/content_page.html" %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load wagtailcore_tags %}
|
{% load wagtailcore_tags %}
|
||||||
{% load wagtailimages_tags %}
|
{% load wagtailimages_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "cms_pages/abstract_content_page.html" %}
|
{% extends "cms_pages/abstract_content_page.html" %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
{% all_images as images %}
|
{% all_images as images %}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load wagtailcore_tags %}
|
{% load wagtailcore_tags %}
|
||||||
{% load wagtailimages_tags %}
|
{% load wagtailimages_tags %}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<div class="panel--1-3">
|
<div class="panel--1-3">
|
||||||
<div class="illustration">
|
<div class="illustration">
|
||||||
<img
|
<img
|
||||||
src="{% static 'lca2017/images/svgs/illustrations/' %}{{ value.inset_illustration }}"
|
src="{% static 'pyconau2017/images/svgs/illustrations/' %}{{ value.inset_illustration }}"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% if value.link.page %}
|
{% if value.link.page %}
|
||||||
{% define value.link.page.url as url %}
|
{% define value.link.page.url as url %}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load wagtailcore_tags %}
|
{% load wagtailcore_tags %}
|
||||||
{% load wagtailimages_tags %}
|
{% load wagtailimages_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
{% load review_tags %}
|
{% load review_tags %}
|
||||||
{% load teams_tags %}
|
{% load teams_tags %}
|
||||||
{% load registrasion_tags %}
|
{% load registrasion_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% block head_title %}Dashboard{% endblock %}
|
{% block head_title %}Dashboard{% endblock %}
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
{% available_categories as categories %}
|
{% available_categories as categories %}
|
||||||
{% if categories %}
|
{% if categories %}
|
||||||
<div class="panel panel__compact panel__bg panel__last">
|
<div class="panel panel__compact panel__bg panel__last">
|
||||||
<div style="background-image: url('{% static "lca2017/images/wp_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
<div style="background-image: url('{% static "pyconau2017/images/wp_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
||||||
<div class="panel--content">
|
<div class="panel--content">
|
||||||
<div >
|
<div >
|
||||||
<h2>{% trans "Attend" %} {% conference_name %}</h2>
|
<h2>{% trans "Attend" %} {% conference_name %}</h2>
|
||||||
|
@ -115,7 +115,7 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="panel panel__compact panel__bg panel__last">
|
<div class="panel panel__compact panel__bg panel__last">
|
||||||
<div style="background-image: url('{% static "lca2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
<div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
||||||
<div class="panel--content">
|
<div class="panel--content">
|
||||||
<div class="panel--2-3">
|
<div class="panel--2-3">
|
||||||
<h2>{% trans "Speaking and Miniconfs" %}</h2>
|
<h2>{% trans "Speaking and Miniconfs" %}</h2>
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
{% if review_sections %}
|
{% if review_sections %}
|
||||||
|
|
||||||
<div class="panel panel__compact panel__bg panel__last">
|
<div class="panel panel__compact panel__bg panel__last">
|
||||||
<div style="background-image: url('{% static "lca2017/images/conference_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
<div style="background-image: url('{% static "pyconau2017/images/conference_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
||||||
<div class="panel--content">
|
<div class="panel--content">
|
||||||
<div class="panel--2-3">
|
<div class="panel--2-3">
|
||||||
<h2>{% trans "Reviews" %}</h2>
|
<h2>{% trans "Reviews" %}</h2>
|
||||||
|
@ -233,7 +233,7 @@
|
||||||
{% available_teams as available_teams %}
|
{% available_teams as available_teams %}
|
||||||
{% if user.memberships.exists or available_teams %}
|
{% if user.memberships.exists or available_teams %}
|
||||||
<div class="panel panel__compact panel__bg">
|
<div class="panel panel__compact panel__bg">
|
||||||
<div style="background-image: url('{% static "lca2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
<div style="background-image: url('{% static "pyconau2017/images/hobart_bg_optimised.jpg" %}');" class="panel--bg"></div>
|
||||||
<div class="panel--content">
|
<div class="panel--content">
|
||||||
<div class="panel--2-3">
|
<div class="panel--2-3">
|
||||||
<h2>{% trans "Teams" %}</h2>
|
<h2>{% trans "Teams" %}</h2>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% classname field.field.widget as widget %}
|
{% classname field.field.widget as widget %}
|
||||||
{% if widget == "CheckboxInput" %}
|
{% if widget == "CheckboxInput" %}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load wagtailcore_tags %}
|
{% load wagtailcore_tags %}
|
||||||
|
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
|
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<div class="right-floating-image" >
|
||||||
|
<div class="portrait">
|
||||||
|
<div style="background-image: url('{{ image_url }}');" class="portrait--img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
50
pinaxcon/templates/pyconau2017/content_page.html
Normal file
50
pinaxcon/templates/pyconau2017/content_page.html
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
{% extends "site_base_wagtail.html" %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
{% load wagtailcore_tags %}
|
||||||
|
|
||||||
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
|
|
||||||
|
{% load sitetree %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
{% block body_class %}template-content-page{% endblock %}
|
||||||
|
|
||||||
|
{% block head_title %}{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
{% block heading_panel %}
|
||||||
|
<div class="panel panel__compact panel__bg">
|
||||||
|
|
||||||
|
<div style="background-image: url('{% block header_background_image %}{% endblock %}');" class="panel--bg"></div>
|
||||||
|
|
||||||
|
<div class="panel--content">
|
||||||
|
<div class="panel--2-3">
|
||||||
|
<h2>{% block header_title %}{% endblock %}</h2>
|
||||||
|
<p class="lede">{% block header_paragraph %}{% endblock %}</p>
|
||||||
|
</div>
|
||||||
|
{% block header_inset_image_base %}
|
||||||
|
<div class="panel--1-3">
|
||||||
|
<div class="portrait">
|
||||||
|
<div style="background-image: url('{% block header_inset_image %}{% endblock %}');" class="portrait--img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content_base %}
|
||||||
|
<div class="l-content-page">
|
||||||
|
<div class="l-content-page--richtext">
|
||||||
|
{% block content %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block extra_script %}
|
||||||
|
<script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
|
||||||
|
{% endblock %}
|
|
@ -1,12 +1,12 @@
|
||||||
{% load registrasion_tags %}
|
{% load registrasion_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
<h2>Tax Invoice/Statement</h2>
|
<h2>Tax Invoice/Statement</h2>
|
||||||
<h3>Linux Australia</h3>
|
<h3>Linux Australia</h3>
|
||||||
<h4>ABN 56 987 117 479</h4>
|
<h4>ABN 56 987 117 479</h4>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Enquiries: please e-mail <a href="mailto:team@hobart.lca2017.org">team@hobart.lca2017.org</a>
|
Enquiries: please e-mail <a href="mailto:team@hobart.pyconau2017.org">team@hobart.pyconau2017.org</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{% extends "registrasion/base.html" %}
|
{% extends "registrasion/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% block header_title %}Buy Your Ticket{% endblock %}
|
{% block header_title %}Buy Your Ticket{% endblock %}
|
||||||
{% block header_paragraph %}Step {{ current_step }} of {{ total_steps|add:1 }} – {{ title }} {% endblock %}
|
{% block header_paragraph %}Step {{ current_step }} of {{ total_steps|add:1 }} – {{ title }} {% endblock %}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "registrasion/base.html" %}
|
{% extends "registrasion/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load registrasion_tags %}
|
{% load registrasion_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block header_title %}{% conference_name %}{% endblock %}
|
{% block header_title %}{% conference_name %}{% endblock %}
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
<p>Wrest Point Convention Centre, Hobart, Tasmania, Australia.</p>
|
<p>Wrest Point Convention Centre, Hobart, Tasmania, Australia.</p>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block header_inset_image %}{% illustration "tuz.svg" %}{% endblock %}
|
{% block header_inset_image %}{% illustration "tuz.svg" %}{% endblock %}
|
||||||
{% block header_background_image %}{% static "lca2017/images/wp_bg_optimised.jpg" %}{% endblock %}
|
{% block header_background_image %}{% static "pyconau2017/images/wp_bg_optimised.jpg" %}{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "registrasion/base.html" %}
|
{% extends "registrasion/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load registrasion_tags %}
|
{% load registrasion_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% block header_title %}Product Category: {{ category.name }}{% endblock %}
|
{% block header_title %}Product Category: {{ category.name }}{% endblock %}
|
||||||
{% block header_inset_image %}{% illustration "lavender.svg" %}{% endblock %}
|
{% block header_inset_image %}{% illustration "lavender.svg" %}{% endblock %}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{% extends "registrasion/base.html" %}
|
{% extends "registrasion/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% block header_title %}Your profile{% endblock %}
|
{% block header_title %}Your profile{% endblock %}
|
||||||
{% block header_inset_image %}{% illustration "antarctica.svg" %}{% endblock %}
|
{% block header_inset_image %}{% illustration "antarctica.svg" %}{% endblock %}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "registrasion/base.html" %}
|
{% extends "registrasion/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load registrasion_tags %}
|
{% load registrasion_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% block header_title %}Review your selection{% endblock %}
|
{% block header_title %}Review your selection{% endblock %}
|
||||||
{% block header_inset_image %}{% illustration "wineglass.svg" %}{% endblock %}
|
{% block header_inset_image %}{% illustration "wineglass.svg" %}{% endblock %}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "registrasion/base.html" %}
|
{% extends "registrasion/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load registrasion_tags %}
|
{% load registrasion_tags %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
|
|
||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
|
|
|
@ -27,15 +27,15 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<!--Twitter-->
|
<!--Twitter-->
|
||||||
<meta name="twitter:card" content="summary">
|
<meta name="twitter:card" content="summary">
|
||||||
<meta name="twitter:site" content="@linuxconfau">
|
<meta name="twitter:site" content="@pyconau2017">
|
||||||
<meta name="twitter:title" content="linux.conf.au – 16-20 January 2017 – Hobart, Tasmania"
|
<meta name="twitter:title" content="Pycon AU – 3 - 8 2017 – Melbourne, Victoria"
|
||||||
<meta name="twitter:description"content="Discover the future of Open Source at linux.conf.au 2017. Tickets on sale from October.">
|
<meta name="twitter:description"content="Discover the future of Open Source at linux.conf.au 2017. Tickets on sale from October.">
|
||||||
<meta name="twitter:image" content="{{ request.scheme }}://{{ request.get_host }}{% static 'lca2017/images/socmed/twitter-tuz.png' %}">
|
<meta name="twitter:image" content="{{ request.scheme }}://{{ request.get_host }}{% static 'pyconau2017/images/socmed/twitter-tuz.png' %}">
|
||||||
<meta name="twitter:image:alt" content="Tuz">
|
<meta name="twitter:image:alt" content="Tuz">
|
||||||
<!--Open Graph-->
|
<!--Open Graph-->
|
||||||
<meta property="og:url" content="https://linux.conf.au/">
|
<meta property="og:url" content="https://2017.pycon-au.org/">
|
||||||
<meta property="og:title" content="linux.conf.au – 16-20 January 2017 – Hobart, Tasmania">
|
<meta property="og:title" content="Pycon AU – 3 - 8 2017 – Melbourne, Victoria">
|
||||||
<meta property="og:description" content="Discover the future of Open Source at linux.conf.au 2017. Tickets on sale from October.">
|
<meta property="og:description" content="Discover Python at Pycon AU 2017. Tickets on sale from February.">
|
||||||
<meta property="og:type" content="website">
|
<meta property="og:type" content="website">
|
||||||
<meta property="fb:admins" content="729577430">
|
<meta property="fb:admins" content="729577430">
|
||||||
<meta property="fb:profile_id" content="293907417664731">
|
<meta property="fb:profile_id" content="293907417664731">
|
||||||
|
@ -49,11 +49,11 @@
|
||||||
<div class="l-header--logo">
|
<div class="l-header--logo">
|
||||||
{% block site_brand %}
|
{% block site_brand %}
|
||||||
<a href="/"
|
<a href="/"
|
||||||
title="linux.conf.au | 16–20 January, Hobart | The Future of Open Source"
|
title="2017.pycon-au.org | 3-8 August, Melbourne | Python FTW!"
|
||||||
>
|
>
|
||||||
<img src="{% static 'lca2017/images/svgs/lca2017-website-logo.svg' %}"
|
<img src="{% static 'pyconau2017/images/logo-mel-17.png' %}"
|
||||||
width="100%"
|
width="100%"
|
||||||
title="linux.conf.au | 16–20 January, Hobart | The Future of Open Source"
|
title="pycon-au.org | 3-8 August, Melbourne | Python FTW!"
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -97,8 +97,8 @@
|
||||||
{% block footer %}
|
{% block footer %}
|
||||||
<div class="l-footer--text">
|
<div class="l-footer--text">
|
||||||
<h3>Sponsors</h3>
|
<h3>Sponsors</h3>
|
||||||
<p class="lede">We thank our Emperor Penguin sponsors for their
|
<p class="lede">We thank our sponsors for their
|
||||||
generous contribution to linux.conf.au 2017.</p>
|
generous contribution to Pycon Australia 2017.</p>
|
||||||
<a href="/sponsors" class="btn btn__white">Other Sponsors</a>
|
<a href="/sponsors" class="btn btn__white">Other Sponsors</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="l-footer--logos">
|
<div class="l-footer--logos">
|
||||||
|
@ -111,7 +111,7 @@
|
||||||
<br />
|
<br />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p class="lede">©2016 Linux Australia and linux.conf.au 2017. Linux is a registered trademark of Linus Torvalds. Site design by <a href="http://takeflight.com.au" >Takeflight</a>. Image credits can be found on our <a href="/about/colophon">Colophon</a>.</p>
|
<p class="lede">©2016 Pycon Australia 2017. Linux is a registered trademark of Linus Torvalds. Site design by <a href="http://takeflight.com.au" >Takeflight</a>. Image credits can be found on our <a href="/about/colophon">Colophon</a>.</p>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</footer>
|
</footer>
|
||||||
|
@ -119,7 +119,7 @@
|
||||||
</main>
|
</main>
|
||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
{% comment%}
|
{% comment%}
|
||||||
<script src="{% static 'lca2017/js/app.js' %}"></script>
|
<script src="{% static 'pyconau2017/js/app.js' %}"></script>
|
||||||
{% include "_scripts.html" %}
|
{% include "_scripts.html" %}
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
|
||||||
{% endcomment %}
|
{% endcomment %}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
<h4>{% trans "Submitted by" %}</h4>
|
<h4>{% trans "Submitted by" %}</h4>
|
||||||
<p>{{ proposal.speaker }} <{{ proposal.speaker.email }}></p>
|
<p>{{ proposal.speaker }} <{{ proposal.speaker.email }}></p>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
<table class="calendar table table-bordered">
|
<table class="calendar table table-bordered">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{% extends "symposion/schedule/public_base.html" %}
|
{% extends "symposion/schedule/public_base.html" %}
|
||||||
|
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load thumbnail %}
|
{% 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_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 "lca2017/images/mt_anne_bg_optimised.jpg" %}{% elif bg_number == 1 %}{% static "lca2017/images/the_neck_bg_optimised.jpg" %}{% elif bg_number == 2 %}{% static "lca2017/images/snug_falls_bg_optimised.jpg" %}{% elif bg_number == 3 %}{% static "lca2017/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 "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_title %}{{ presentation.title }}{% endblock %}
|
{% block header_title %}{{ presentation.title }}{% endblock %}
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
<h2>Presented by</h2>
|
<h2>Presented by</h2>
|
||||||
{% for speaker in presentation.speakers %}
|
{% for speaker in presentation.speakers %}
|
||||||
{% speaker_photo speaker 512 as speaker_photo_url %}
|
{% speaker_photo speaker 512 as speaker_photo_url %}
|
||||||
{% include "lca2017/_right_floating_image.html" with image_url=speaker_photo_url %}
|
{% include "pyconau2017/_right_floating_image.html" with image_url=speaker_photo_url %}
|
||||||
|
|
||||||
<h3><a href="{% url "speaker_profile" speaker.pk %}">{{ speaker }}</a></h3>
|
<h3><a href="{% url "speaker_profile" speaker.pk %}">{{ speaker }}</a></h3>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load pinax_boxes_tags %}
|
{% load pinax_boxes_tags %}
|
||||||
{% load cache %}
|
{% load cache %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
|
|
||||||
{% block head_title %}Conference Schedule{% endblock %}
|
{% block head_title %}Conference Schedule{% endblock %}
|
||||||
{% block header_title %}Conference Schedule{% endblock %}
|
{% block header_title %}Conference Schedule{% endblock %}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load pinax_boxes_tags %}
|
{% load pinax_boxes_tags %}
|
||||||
{% load cache %}
|
{% load cache %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
|
|
||||||
{% block head_title %}{{ schedule.section }} Schedule{% endblock %}
|
{% block head_title %}{{ schedule.section }} Schedule{% endblock %}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load cache %}
|
{% load cache %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% load sitetree %}
|
{% load sitetree %}
|
||||||
|
|
||||||
{% block head_title %}Presentation Listing{% endblock %}
|
{% block head_title %}Presentation Listing{% endblock %}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% extends "symposion/schedule/public_base.html" %}
|
{% extends "symposion/schedule/public_base.html" %}
|
||||||
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load lca2017_tags %}
|
{% load pyconau2017_tags %}
|
||||||
{% load thumbnail %}
|
{% load thumbnail %}
|
||||||
|
|
||||||
{% if speaker.photo %}
|
{% if speaker.photo %}
|
||||||
|
|
|
@ -36,11 +36,11 @@ def proposal_permission(context, permname, proposal):
|
||||||
return context.request.user.has_perm(perm)
|
return context.request.user.has_perm(perm)
|
||||||
|
|
||||||
|
|
||||||
# {% load statictags %}{% static 'lca2017/images/svgs/illustrations/' %}{{ illustration }}
|
# {% load statictags %}{% static 'pyconau2017/images/svgs/illustrations/' %}{{ illustration }}
|
||||||
|
|
||||||
@register.simple_tag(takes_context=False)
|
@register.simple_tag(takes_context=False)
|
||||||
def illustration(name):
|
def illustration(name):
|
||||||
return staticfiles.static('lca2017/images/svgs/illustrations/') + name
|
return staticfiles.static('pyconau2017/images/svgs/illustrations/') + name
|
||||||
|
|
||||||
|
|
||||||
@register.simple_tag(takes_context=True)
|
@register.simple_tag(takes_context=True)
|
||||||
|
|
103
pinaxcon/templatetags/pyconau2017_tags.py
Normal file
103
pinaxcon/templatetags/pyconau2017_tags.py
Normal file
|
@ -0,0 +1,103 @@
|
||||||
|
import cms_pages
|
||||||
|
import hashlib
|
||||||
|
import urllib
|
||||||
|
|
||||||
|
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()
|
||||||
|
url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, "https://2017.pycon-au.org/site_media/static/pyconau23017/images/speaker-fallback-devil.jpg")
|
||||||
|
|
||||||
|
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.simple_tag()
|
||||||
|
def header_paragraph(name):
|
||||||
|
model = cms_pages.models.NamedHeaderParagraph
|
||||||
|
try:
|
||||||
|
return model.objects.get(name=name).text
|
||||||
|
except model.DoesNotExist:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
@register.simple_tag()
|
||||||
|
def all_images():
|
||||||
|
return cms_pages.models.CustomImage.objects.all().order_by("title")
|
||||||
|
|
||||||
|
|
||||||
|
@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
|
1
static/dist/pyconau2017
vendored
Symbolic link
1
static/dist/pyconau2017
vendored
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../src/pyconau2017
|
BIN
static/src/pyconau2017/images/logo-mel-17.png
Normal file
BIN
static/src/pyconau2017/images/logo-mel-17.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
BIN
static/src/pyconau2017/images/logo-mel.png
Normal file
BIN
static/src/pyconau2017/images/logo-mel.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 36 KiB |
|
@ -0,0 +1,113 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://web.resource.org/cc/"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="110.4211"
|
||||||
|
height="109.8461"
|
||||||
|
id="svg2169"
|
||||||
|
sodipodi:version="0.32"
|
||||||
|
inkscape:version="0.45.1"
|
||||||
|
version="1.0"
|
||||||
|
sodipodi:docbase="/home/bene/Desktop"
|
||||||
|
sodipodi:docname="dessin-1.svg"
|
||||||
|
inkscape:output_extension="org.inkscape.output.svg.inkscape">
|
||||||
|
<defs
|
||||||
|
id="defs2171">
|
||||||
|
<linearGradient
|
||||||
|
id="linearGradient11301"
|
||||||
|
inkscape:collect="always">
|
||||||
|
<stop
|
||||||
|
id="stop11303"
|
||||||
|
offset="0"
|
||||||
|
style="stop-color:#ffe052;stop-opacity:1" />
|
||||||
|
<stop
|
||||||
|
id="stop11305"
|
||||||
|
offset="1"
|
||||||
|
style="stop-color:#ffc331;stop-opacity:1" />
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
y2="168.1012"
|
||||||
|
x2="147.77737"
|
||||||
|
y1="111.92053"
|
||||||
|
x1="89.136749"
|
||||||
|
id="linearGradient11307"
|
||||||
|
xlink:href="#linearGradient11301"
|
||||||
|
inkscape:collect="always" />
|
||||||
|
<linearGradient
|
||||||
|
id="linearGradient9515"
|
||||||
|
inkscape:collect="always">
|
||||||
|
<stop
|
||||||
|
id="stop9517"
|
||||||
|
offset="0"
|
||||||
|
style="stop-color:#387eb8;stop-opacity:1" />
|
||||||
|
<stop
|
||||||
|
id="stop9519"
|
||||||
|
offset="1"
|
||||||
|
style="stop-color:#366994;stop-opacity:1" />
|
||||||
|
</linearGradient>
|
||||||
|
<linearGradient
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
y2="131.85291"
|
||||||
|
x2="110.14919"
|
||||||
|
y1="77.070274"
|
||||||
|
x1="55.549179"
|
||||||
|
id="linearGradient9521"
|
||||||
|
xlink:href="#linearGradient9515"
|
||||||
|
inkscape:collect="always" />
|
||||||
|
</defs>
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="0.24748737"
|
||||||
|
inkscape:cx="-260.46312"
|
||||||
|
inkscape:cy="316.02744"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
width="131.10236px"
|
||||||
|
height="184.25197px"
|
||||||
|
inkscape:window-width="872"
|
||||||
|
inkscape:window-height="624"
|
||||||
|
inkscape:window-x="5"
|
||||||
|
inkscape:window-y="48" />
|
||||||
|
<metadata
|
||||||
|
id="metadata2174">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Calque 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(-473.36088,-251.72485)">
|
||||||
|
<g
|
||||||
|
id="g1894"
|
||||||
|
transform="translate(428.42338,184.2561)">
|
||||||
|
<path
|
||||||
|
style="opacity:1;color:#000000;fill:url(#linearGradient9521);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
|
||||||
|
d="M 99.75,67.46875 C 71.718268,67.468752 73.46875,79.625 73.46875,79.625 L 73.5,92.21875 L 100.25,92.21875 L 100.25,96 L 62.875,96 C 62.875,96 44.9375,93.965724 44.9375,122.25 C 44.937498,150.53427 60.59375,149.53125 60.59375,149.53125 L 69.9375,149.53125 L 69.9375,136.40625 C 69.9375,136.40625 69.433848,120.75 85.34375,120.75 C 101.25365,120.75 111.875,120.75 111.875,120.75 C 111.875,120.75 126.78125,120.99096 126.78125,106.34375 C 126.78125,91.696544 126.78125,82.125 126.78125,82.125 C 126.78125,82.124998 129.04443,67.46875 99.75,67.46875 z M 85,75.9375 C 87.661429,75.937498 89.8125,78.088571 89.8125,80.75 C 89.812502,83.411429 87.661429,85.5625 85,85.5625 C 82.338571,85.562502 80.1875,83.411429 80.1875,80.75 C 80.187498,78.088571 82.338571,75.9375 85,75.9375 z "
|
||||||
|
id="path8615" />
|
||||||
|
<path
|
||||||
|
id="path8620"
|
||||||
|
d="M 100.5461,177.31485 C 128.57784,177.31485 126.82735,165.1586 126.82735,165.1586 L 126.7961,152.56485 L 100.0461,152.56485 L 100.0461,148.7836 L 137.4211,148.7836 C 137.4211,148.7836 155.3586,150.81787 155.3586,122.53359 C 155.35861,94.249323 139.70235,95.252343 139.70235,95.252343 L 130.3586,95.252343 L 130.3586,108.37734 C 130.3586,108.37734 130.86226,124.03359 114.95235,124.03359 C 99.042448,124.03359 88.421098,124.03359 88.421098,124.03359 C 88.421098,124.03359 73.514848,123.79263 73.514848,138.43985 C 73.514848,153.08705 73.514848,162.6586 73.514848,162.6586 C 73.514848,162.6586 71.251668,177.31485 100.5461,177.31485 z M 115.2961,168.8461 C 112.63467,168.8461 110.4836,166.69503 110.4836,164.0336 C 110.4836,161.37217 112.63467,159.2211 115.2961,159.2211 C 117.95753,159.2211 120.1086,161.37217 120.1086,164.0336 C 120.10861,166.69503 117.95753,168.8461 115.2961,168.8461 z "
|
||||||
|
style="opacity:1;color:#000000;fill:url(#linearGradient11307);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 5.4 KiB |
BIN
static/src/pyconau2017/images/svgs/illustrations/logo-mel.png
Normal file
BIN
static/src/pyconau2017/images/svgs/illustrations/logo-mel.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 36 KiB |
Loading…
Reference in a new issue