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 17 insertions and 17 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

@@ ... / @@ -293,181 +293,181 @@ @@
+  }
 },
+{
   "model": "registrasion.product",
   "pk": 22,
   "fields": {
     "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": {
     "description": "Early Bird Discount - Hobbyist"
+  }
 },
+{
   "model": "registrasion.discountbase",
   "pk": 2,

pinaxcon/templates/flatpages/homepage.html

➞

Show inline comments

@@ ... / @@ -22,25 +22,25 @@ crossorigin=""></script> @@
         <span id="word" style="color: #ccd5c5;"></span>
       </h1>
       <canvas id="hero" style="z-index: -1;" width="0" height="0"></canvas>
       <div>
           <h1 id="things-heading" class="text-primary text-upper">Things</h1>
       </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 ">
   <div class="sidescroll-container">
     <div class="col-12 sidescroll dragscroll">
       <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>

pinaxcon/templates/flatpages/tickets_prices.html

➞

Show inline comments

@@ ... / @@ -4,25 +4,25 @@ @@
 {% block body_class %}text-primary{% endblock body_class %}
 {% block main_class %}container{% endblock main_class %}
 {% block content %}
 <div class="row">
   <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>
       <h2>Key Dates</h2>
       <div class="card-group key-dates">
         <div class="card">
           <div class="card-body">
             <p class="card-title"><strong>Early Bird <br />Registrations Close</strong></p>
           </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>
     {% endfor %}
   </ul>
   {% endfor %}
 </div>
 {% endif %}

0 comments (0 inline, 0 general)