Changeset - 99ba4c177004
[Not reviewed]
0 3 0
Christopher Neugebauer - 8 years ago 2016-10-05 17:25:44
chrisjrn@gmail.com
1) Fixes list display
2) Lets us put links in category descriptions
3 files changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/registrasion/guided_registration.html
Show inline comments
 
{% extends "registrasion/base.html" %}
 
{% load bootstrap %}
 
{% load lca2017_tags %}
 

	
 
{% block header_title %}Buy Your Ticket{% endblock %}
 
{% block header_paragraph %}Step {{ current_step }} of {{ total_steps|add:1 }} – {{ title }} {% endblock %}
 
{% block header_inset_image %}{% illustration "tuz.svg" %}{% endblock %}
 

	
 
{% block scripts_extra %}
 
  {% for section in sections %}
 
    {{ section.form.media.js }}
 
  {% endfor %}
 
{% endblock %}
 

	
 
{% block content %}
 

	
 
  <form method="post" action="">
 
    {% csrf_token %}
 

	
 
    {% for section in sections %}
 
      <h2>{{ section.title }}</h2>
 

	
 
      {% if section.description %}
 
        <blockquote>{{ section.description }}</blockquote>
 
        <blockquote>{{ section.description|safe }}</blockquote>
 
      {% endif %}
 

	
 
      <fieldset>
 

	
 
        {% if section.discounts %}
 
          {% include "registrasion/discount_list.html" with discounts=section.discounts %}
 

	
 
          <blockquote><small>
 
            You must select a product to receive any discounts.<br/>
 
            Applicable discounts will be applied automatically when you check out.
 
          </small></blockquote>
 

	
 
          <hr />
 

	
 
        {% endif %}
 

	
 
        <h3>Available options</h3>
 

	
 
        {% include "_form_snippet.html" with form=section.form %}
 
      </fieldset>
 

	
 
      <br />
 
    {% endfor %}
 

	
pinaxcon/templates/registrasion/product_category.html
Show inline comments
...
 
@@ -25,49 +25,49 @@
 
  <button id="voucher-form-button" class="btn" onclick="showVoucherForm()">Enter voucher code</button>
 

	
 
  <form method="post" action="">
 
    {% csrf_token %}
 

	
 
    <fieldset id="voucher-form" style="display: none;">
 
      {% include "_form_snippet.html" with form=voucher_form %}
 
      <div class="btn-group" />
 
        <input class="btn btn-primary" type="submit" value="Add voucher" />
 
      </div>
 
    </fieldset>
 

	
 
    <div class="vertical-bigger"></div>
 

	
 
    {% items_purchased category as items %}
 
    {% if items %}
 
      <h3>Paid items</h3>
 
      <p>You have already paid for the following items:</p>
 
      {% include "registrasion/_items_list.html" with items=items %}
 

	
 
    {% endif %}
 

	
 

	
 
    <h2>{{ category.name }}</h2>
 
    <blockquote>{{ category.description }}</blockquote>
 
    <blockquote>{{ category.description|safe }}</blockquote>
 

	
 
    <fieldset>
 

	
 
      {% if discounts %}
 
        <h3>Discounts and Complimentary Items</h3>
 
        <div class="vertical-small"></div>
 
        {% include "registrasion/discount_list.html" with discounts=discounts %}
 
        <blockquote><small>Any applicable discounts will be applied automatically when you check out.</small></blockquote>
 

	
 
        <hr />
 

	
 
      {% endif %}
 

	
 
      <h3>Make a selection</h3>
 
      {% include "_form_snippet.html" with form=form %}
 

	
 
      <br />
 
      <div class="btn-group">
 
          <input class="btn btn-primary" type="submit" value="Add to cart" />
 
          <a href="{% url "dashboard" %}" class="btn btn-default">Return to dashboard</a>
 
      </div>
 
    </fieldset>
 
  </form>
 

	
static/src/lca2017/css/app.css
Show inline comments
...
 
@@ -642,49 +642,49 @@ h6 {
 
  line-height: 0.9;
 
  -webkit-font-smoothing: antialiased;
 
  -moz-osx-font-smoothing: grayscale;
 
}
 

	
 
a {
 
  color: inherit;
 
  text-decoration: none;
 
  border-bottom: 1px solid #3ab1c9;
 
  transition: color 300ms;
 
}
 

	
 
a:hover, a:focus, a:active {
 
  color: #3ab1c9;
 
}
 

	
 
ul,
 
ol {
 
  padding: 0;
 
  /* margin: 0; */
 
}
 

	
 
ul > li,
 
ol > li {
 
  list-style-position: inside;
 
  list-style-position: outside;
 
  margin-left: 1em;
 
}
 

	
 
blockquote {
 
  margin-left: 0;
 
  padding-left: 20px;
 
  padding-left: 1.25rem;
 
  font-style: italic;
 
  border-left: 1px solid #3ab1c9;
 
}
 

	
 
table th {
 
  font-family: "Titillium Web", sans-serif;
 
  font-weight: 900;
 
  text-transform: uppercase;
 
}
 

	
 
table th, table td {
 
  padding: 10px;
 
  padding: 0.625rem;
 
  text-align: left;
 
}
 

	
 
table th:not(:first-of-type), table td:not(:first-of-type) {
0 comments (0 inline, 0 general)