From ed7ae7e3e5e71e36e4dfab5f1c9f81dffb0c073e 2018-09-30 04:00:38
From: Tobias <tobias@localhost.localdomain>
Date: 2018-09-30 04:00:38
Subject: [PATCH] Shirt order and link fixes

---

diff --git a/fixtures/2019_registrasion.json b/fixtures/2019_registrasion.json
index 87f640b8c567e67a7af21bc98af1c1736f130c33..014244b5084fc6fc70a206c0f75f93bc4ea20f16 100644
--- a/fixtures/2019_registrasion.json
+++ b/fixtures/2019_registrasion.json
@@ -302,7 +302,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 10
+    "order": 70
   }
 },
 {
@@ -315,7 +315,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 20
+    "order": 80
   }
 },
 {
@@ -328,7 +328,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 30
+    "order": 90
   }
 },
 {
@@ -341,7 +341,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 40
+    "order": 100
   }
 },
 {
@@ -354,7 +354,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 50
+    "order": 110
   }
 },
 {
@@ -367,7 +367,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 60
+    "order": 120
   }
 },
 {
@@ -380,7 +380,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 80
+    "order": 10
   }
 },
 {
@@ -393,7 +393,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 90
+    "order": 20
   }
 },
 {
@@ -406,7 +406,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 100
+    "order": 30
   }
 },
 {
@@ -419,7 +419,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 110
+    "order": 40
   }
 },
 {
@@ -432,7 +432,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 120
+    "order": 50
   }
 },
 {
@@ -445,7 +445,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 130
+    "order": 60
   }
 },
 {
@@ -458,7 +458,7 @@
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 75
+    "order": 130
   }
 },
 {
diff --git a/pinaxcon/templates/flatpages/homepage.html b/pinaxcon/templates/flatpages/homepage.html
index c5a1e8678bf56af82c05c34240f3c8203019f7cd..f37851fd686c7a65f057d730af19f8fe5a266fc7 100644
--- a/pinaxcon/templates/flatpages/homepage.html
+++ b/pinaxcon/templates/flatpages/homepage.html
@@ -31,7 +31,7 @@ crossorigin=""></script>
         <h2>21-25<br/>Jan 19<br/></h2>
         <h4><small>University of Canterbury<br/>Christchurch, New Zealand</small></h4>
       </div>
-      <a id="register-link" class="btn btn-secondary border-primary text-primary" href="/dashboard/">Register</a>
+      <a id="register-link" class="btn btn-secondary border-primary text-primary" href="/tickets/register">Register</a>
 
     </div>
   </div>
@@ -46,7 +46,7 @@ crossorigin=""></script>
       <div><img src="{% static 'assets/memorial.jpg' %}" /></div>
     </div>
   </div>
-  
+
   <div class="col-12 col-xl-6 content pt-5 pb-xl-5">
     <p>
       Themed <strong>Linux of Things</strong>, the 2019 linux.conf.au will again attract speakers and attendees from across the world to socialise, fraternise, lecture, listen, ask, answer and share with their peers.
@@ -54,9 +54,9 @@ crossorigin=""></script>
     <p>
       The conference will explore the use of free open source software and hardware for internet of things devices, along with security concerns, privacy and legal aspects, environmental impacts, everyday communication, health, ethics, and much more.
     </p>
-    
+
   </div>
-  
+
   <div class="col-12 col-xl-6 content pt-xl-5 pb-5">
     <p>
       The <strong>Internet of Things</strong> has become ubiquitous in our lives – phones, TVs, fridges cars, homes and whole cities have become “smart” in the last couple of years.
@@ -68,7 +68,7 @@ crossorigin=""></script>
       Linux, with its lightweight footprint and robust security, and importantly its open source nature, has become a core component in this: Linux of Things
     </p>
   </div>
-  
+
   <div class="col-12 content homepage-venue pt-xl-5 pt-2">
     <h2>Venue</h2>
     <p>University&nbsp;of&nbsp;Canterbury<br/>Christchurch, New&nbsp;Zealand</p>
diff --git a/pinaxcon/templates/flatpages/tickets_prices.html b/pinaxcon/templates/flatpages/tickets_prices.html
index 5d846825a473345edca79e096b972c6ea298c154..001b68b419acfd5df252ca0e471eaa115cf24edf 100644
--- a/pinaxcon/templates/flatpages/tickets_prices.html
+++ b/pinaxcon/templates/flatpages/tickets_prices.html
@@ -13,7 +13,7 @@
 
     <div>
       <h2>Purchase your tickets
-        <a id="register-link" class="btn btn-secondary border-primary text-primary float-right" href="/dashboard/">Register</a>
+        <a id="register-link" class="btn btn-secondary border-primary text-primary float-right" href="/tickets/register">Register</a>
       </h2>
     </div>
 
diff --git a/pinaxcon/templates/registrasion/discount_list.html b/pinaxcon/templates/registrasion/discount_list.html
index 7bee317cd3658b3462b19c159362a952b4340402..521794c8f65a2aad6eb230ea652e961c3417ec01 100644
--- a/pinaxcon/templates/registrasion/discount_list.html
+++ b/pinaxcon/templates/registrasion/discount_list.html
@@ -1,7 +1,7 @@
 {% if discounts %}
-<div class="my-4">
+<div class="my-4 py-4 px-4 bg-primary text-secondary">
   <h2>Discounts and Complimentary Items</h2>
-  <p>The following discounts and complimentary items are available to you. If you wish to take advantage of this offer, you must choose your items below. This discounts will be applied automatically when you check out.</p>
+  <p>The following discounts and complimentary items are available to you. If you wish to take advantage of this offer, you must choose your items below. The discounts will be applied automatically when you check out.</p>
   {% regroup discounts by discount.description as discounts_grouped %}
   {% for discount_type in discounts_grouped %}
   <strong>{{ discount_type.grouper }}</strong>