diff --git a/fixtures/2019_flatpages.json b/fixtures/2019_flatpages.json index 0799f30d..69966572 100644 --- a/fixtures/2019_flatpages.json +++ b/fixtures/2019_flatpages.json @@ -103,5 +103,20 @@ 1 ] } +}, +{ + "model": "flatpages.flatpage", + "pk": 8, + "fields": { + "url": "/attend/tickets/", + "title": "Tickets & Prices -- LCA2019", + "content": "", + "enable_comments": false, + "template_name": "flatpages/tickets_prices.html", + "registration_required": false, + "sites": [ + 1 + ] + } } ] diff --git a/fixtures/2019_registrasion.json b/fixtures/2019_registrasion.json index 4278f0d7..c808905f 100644 --- a/fixtures/2019_registrasion.json +++ b/fixtures/2019_registrasion.json @@ -1143,7 +1143,6 @@ "enabling_category": 2, "products": [], "categories": [ - 1, 3, 4, 5, diff --git a/fixtures/2019_sitetree.json b/fixtures/2019_sitetree.json index 7ea75aa3..81caacbd 100644 --- a/fixtures/2019_sitetree.json +++ b/fixtures/2019_sitetree.json @@ -374,7 +374,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": 37, - "sort_order": 36, + "sort_order": 38, "access_permissions": [] } }, @@ -398,7 +398,7 @@ "access_restricted": false, "access_perm_type": 1, "parent": 37, - "sort_order": 30, + "sort_order": 36, "access_permissions": [] } }, @@ -546,30 +546,6 @@ "access_permissions": [] } }, -{ - "model": "sitetree.treeitem", - "pk": 36, - "fields": { - "title": "Call for Papers", - "hint": "", - "url": "/call-for-papers/", - "urlaspattern": false, - "tree": 1, - "hidden": true, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 24, - "access_permissions": [] - } -}, { "model": "sitetree.treeitem", "pk": 37, @@ -593,5 +569,29 @@ "sort_order": 31, "access_permissions": [] } +}, +{ + "model": "sitetree.treeitem", + "pk": 38, + "fields": { + "title": "Tickets & Prices", + "hint": "", + "url": "/attend/tickets/", + "urlaspattern": false, + "tree": 1, + "hidden": false, + "alias": null, + "description": "", + "inmenu": true, + "inbreadcrumbs": true, + "insitetree": true, + "access_loggedin": false, + "access_guest": false, + "access_restricted": false, + "access_perm_type": 1, + "parent": 37, + "sort_order": 30, + "access_permissions": [] + } } ] diff --git a/pinaxcon/templates/flatpages/tickets_prices.html b/pinaxcon/templates/flatpages/tickets_prices.html new file mode 100644 index 00000000..f5f1f19a --- /dev/null +++ b/pinaxcon/templates/flatpages/tickets_prices.html @@ -0,0 +1,162 @@ +{% extends "site_base.html" %} + +{% block head_title %}{{ flatpage.title }}{% endblock head_title %} +{% block body_class %}text-primary{% endblock body_class %} +{% block main_class %}container{% endblock main_class %} + + +{% block content %} +
+
+
+

Tickets
& Prices

+ +
+

Purchase your tickets + Register +

+
+ +
+ +
+

Key Dates

+
+
+
+

Early Bird
Registrations Close

+
+ +
+
+
+

Regular
Registrations Close

+
+ +
+
+
+

Extended
Registrations Close

+
+ +
+
+
+ +
+ +
+

Prices & Inclusions

+

All prices are in New Zealand Dollars and include 15% New Zealand Goods and Services Tax (GST).

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProfessionalHobbyistStudent
Early Bird Price$899$399n/a
Regular Price$1099$549$199
Inclusions
Main ConferenceYesYesYes
MiniconfsYesYesYes
Penguin DinnerYes
PDNSYes
Conference ShirtYesYesYes
Conference BagYes
+
+ +
+ +
+

Ticket types

+ +
+

Professional

+

+ The Professional ticket is the standard full inclusion conference ticket. + This rate applies to most people who have their companies pay the conference + fees and charge it as a professional development expense, or for individuals + who can legitimately claim it is a tax deduction. The benefits of a + Professional ticket include attendance at the Professional Delegates + Networking Session, attendance at the Penguin Dinner, and a Swag Bag. +

+
+ + +
+

Hobbyist

+

+ The Hobbyist rate is heavily discounted for free software enthusiasts who + are paying out of their own pockets and would otherwise find it difficult + to attend. +

+
+ +
+

Hobbyist

+

+ This is a concession rate ticket that is reserved for High School, + College, or University Students. linux.conf.au offers this rate as a form + of investment in the future of the free and open source software community. + As part of the registration process, a valid student ID card or proof of + enrolment must be presented to the onsite registration desk. Any Student + who cannot provide this will be required to register at LCA2018 as a + hobbyist by paying the difference in fees between the Student rate + and the Hobbyist rate. +

+
+
+
+ {% endblock %} \ No newline at end of file diff --git a/pinaxcon/templates/symposion/dashboard/_categories.html b/pinaxcon/templates/symposion/dashboard/_categories.html index 52a81268..feb1a343 100644 --- a/pinaxcon/templates/symposion/dashboard/_categories.html +++ b/pinaxcon/templates/symposion/dashboard/_categories.html @@ -34,9 +34,9 @@ {% if not user.attendee.completed_registration %}

Register

+

To attend the conference, you must create an attendee profile and purchase your ticket

+ Get your ticket
-

To attend the conference, you must create an attendee profile and purchase your ticket

- Get your ticket
diff --git a/static/src/scss/app.scss b/static/src/scss/app.scss index e3836569..efb46cba 100644 --- a/static/src/scss/app.scss +++ b/static/src/scss/app.scss @@ -347,11 +347,32 @@ a.a-img { .table { border-top: none; + + th, td { + padding: 1.25rem 0.75rem; + } } .table thead th { vertical-align: bottom; border-bottom: 1px solid $primary; + border-top: 0; +} + +.table th.bordered { + border-bottom: 1px solid $primary; + border-top: 0; +} + +.ticket-page hr { + margin-top: 2rem; + margin-bottom: 0rem; +} + +hr { + height: 1px; + border: none; + background-color: #CCD5C5; } .calendar.table { @@ -438,4 +459,19 @@ a.a-img { .hidden-print { display: none !important } +} + +.card-group.key-dates { + .card { + border: none; + } + + .card-body { + padding: 0; + } + + .card-footer { + border: none; + padding: 0; + } } \ No newline at end of file