symposion_app Changeset - ed7ae7e3e5e7

Changeset - ed7ae7e3e5e7

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Tobias - 6 years ago 2018-09-30 04:00:38
tobias@localhost.localdomain

Shirt order and link fixes

4 files changed with 21 insertions and 21 deletions:

fixtures/2019_registrasion.json

pinaxcon/templates/flatpages/homepage.html

pinaxcon/templates/flatpages/tickets_prices.html

pinaxcon/templates/registrasion/discount_list.html

0 comments (0 inline, 0 general)

fixtures/2019_registrasion.json

➞

Show inline comments

@@ ... / @@ -299,169 +299,169 @@ @@
     "name": "Men's Outline Tee S",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 10
+    "order": 70
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 23,
   "fields": {
     "name": "Men's Outline Tee M",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 20
+    "order": 80
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 24,
   "fields": {
     "name": "Men's Outline Tee L",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 30
+    "order": 90
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 25,
   "fields": {
     "name": "Men's Outline Tee XL",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 40
+    "order": 100
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 26,
   "fields": {
     "name": "Men's Outline Tee 2XL",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 50
+    "order": 110
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 27,
   "fields": {
     "name": "Men's Outline Tee 3XL",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 60
+    "order": 120
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 29,
   "fields": {
     "name": "Women's Silhouette Tee 8",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 80
+    "order": 10
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 30,
   "fields": {
     "name": "Women's Silhouette Tee 10",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 90
+    "order": 20
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 31,
   "fields": {
     "name": "Women's Silhouette Tee 12",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 100
+    "order": 30
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 32,
   "fields": {
     "name": "Women's Silhouette Tee 14",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 110
+    "order": 40
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 33,
   "fields": {
     "name": "Women's Silhouette Tee 16",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 120
+    "order": 50
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 34,
   "fields": {
     "name": "Women's Silhouette Tee 18",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 130
+    "order": 60
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 35,
   "fields": {
     "name": "Men's Outline Tee 5XL",
     "description": "",
     "category": 6,
     "price": "25.00",
     "limit_per_user": null,
     "reservation_duration": "01:00:00",
-    "order": 75
+    "order": 130
+  }
 },
+{
   "model": "registrasion.discountbase",
   "pk": 1,
   "fields": {

pinaxcon/templates/flatpages/homepage.html

➞

Show inline comments

@@ ... / @@ -28,13 +28,13 @@ crossorigin=""></script> @@
       </div>
       <div class="text-primary" id="bottom-wrapper" style="z-index: 1;">
         <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>
 </div>
 <div class="row bg-primary text-secondary ">
@@ ... / @@ -43,35 +43,35 @@ crossorigin=""></script> @@
       <div><img src="{% static 'assets/tram.jpg' %}" /></div>
       <div><img src="{% static 'assets/playground.jpg' %}" /></div>
       <div><img src="{% static 'assets/gardens.jpg' %}" /></div>
       <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.
     </p>
     <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.
     </p>
     <p>
       Behind this is an ever-increasing demand for always connected sensors and devices, exchanging, collating and analysing data, and often making decisions without us even noticing.
     </p>
     <p>
       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>
   </div>
 </div>
 <div id="map"></div>

pinaxcon/templates/flatpages/tickets_prices.html

➞

Show inline comments

@@ ... / @@ -10,13 +10,13 @@ @@
   <div class="col-md-1"></div>
   <div class="col-12 col-md-10 content text-page ticket-page">
     <h1>Tickets <br/>&amp; Prices</h1>
     <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>
     <hr />
     <div>

pinaxcon/templates/registrasion/discount_list.html

➞

Show inline comments

 {% 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>
   <ul>
     {% for discount in discount_type.list %}
     <li>{{ discount.quantity }} &times; {{ discount.clause }}</li>

0 comments (0 inline, 0 general)