symposion_app Changeset - 99ba4c177004

Changeset - 99ba4c177004

Parent rev.

Child rev.

[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:

pinaxcon/templates/registrasion/guided_registration.html

pinaxcon/templates/registrasion/product_category.html

static/src/lca2017/css/app.css

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 }} &ndash; {{ 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 %}
     <div class="btn-group">
       <input class="btn btn-primary" type="submit" value="Next Step" />
     </div>
   </form>
 {% endblock %}

pinaxcon/templates/registrasion/product_category.html

➞

Show inline comments

 {% extends "registrasion/base.html" %}
 {% load bootstrap %}
 {% load registrasion_tags %}
 {% load lca2017_tags %}
 {% block header_title %}Product Category: {{ category.name }}{% endblock %}
 {% block header_inset_image %}{% illustration "lavender.svg" %}{% endblock %}
 {% block scripts_extra %}
   {{ voucher_form.media.js }}
   {{ form.media.js }}
   <script type="text/javascript">
     function showVoucherForm() {
       $("#voucher-form").show();
       $("#voucher-form-button").hide();
+    }
   </script>
 {% endblock %}
 {% block content %}
   <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>
 {% endblock %}

static/src/lca2017/css/app.css

➞

Show inline comments

@@ ... / @@ -474,385 +474,385 @@ input[type="search"] { @@
   /* 2 */
   box-sizing: content-box;
+}
 /**
  * Remove inner padding and search cancel button in Safari 5 and Chrome
  * on OS X.
  */
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
+}
 /**
  * Remove inner padding and border in Firefox 4+.
  */
 button::-moz-focus-inner,
 input::-moz-focus-inner {
   border: 0;
   padding: 0;
+}
 /**
  * 1. Remove default vertical scrollbar in IE 8/9.
  * 2. Improve readability and alignment in all browsers.
  */
 textarea {
   overflow: auto;
   /* 1 */
   vertical-align: top;
   /* 2 */
+}
 /* ==========================================================================
    Tables
    ========================================================================== */
 /**
  * Remove most spacing between table cells.
  */
 table {
   border-collapse: collapse;
   border-spacing: 0;
   margin-top: 1em;
   margin-bottom: 1em;
+}
 /* ==========================================================================
    Custom Defaults
    ========================================================================== */
 *,
 *:before,
 *:after {
   box-sizing: border-box;
+}
 .form-field {
   border: 1px solid #3ab1c9;
+}
 .form-field input[type='text'], .form-field input[type='tel'], .form-field input[type='number'], .form-field input[type='password'], .form-field input[type='email'], textarea {
   color: #0c486c;
   padding: 10px;
   width: 100%;
   border: 0;
+}
 .form-field input[type='text']:focus::-webkit-input-placeholder, .form-field input[type='tel']:focus::-webkit-input-placeholder, .form-field input[type='number']:focus::-webkit-input-placeholder, .form-field input[type='password']:focus::-webkit-input-placeholder, .form-field input[type='email']:focus::-webkit-input-placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']:focus::-moz-placeholder, .form-field input[type='tel']:focus::-moz-placeholder, .form-field input[type='number']:focus::-moz-placeholder, .form-field input[type='password']:focus::-moz-placeholder, .form-field input[type='email']:focus::-moz-placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']:focus:-ms-input-placeholder, .form-field input[type='tel']:focus:-ms-input-placeholder, .form-field input[type='number']:focus:-ms-input-placeholder, .form-field input[type='password']:focus:-ms-input-placeholder, .form-field input[type='email']:focus:-ms-input-placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']:focus::placeholder, .form-field input[type='tel']:focus::placeholder, .form-field input[type='number']:focus::placeholder, .form-field input[type='password']:focus::placeholder, .form-field input[type='email']:focus::placeholder {
   opacity: 0.2;
+}
 .form-field input[type='text']::-webkit-input-placeholder, .form-field input[type='tel']::-webkit-input-placeholder, .form-field input[type='number']::-webkit-input-placeholder, .form-field input[type='password']::-webkit-input-placeholder, .form-field input[type='email']::-webkit-input-placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field input[type='text']::-moz-placeholder, .form-field input[type='tel']::-moz-placeholder, .form-field input[type='number']::-moz-placeholder, .form-field input[type='password']::-moz-placeholder, .form-field input[type='email']::-moz-placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field input[type='text']:-ms-input-placeholder, .form-field input[type='tel']:-ms-input-placeholder, .form-field input[type='number']:-ms-input-placeholder, .form-field input[type='password']:-ms-input-placeholder, .form-field input[type='email']:-ms-input-placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field input[type='text']::placeholder, .form-field input[type='tel']::placeholder, .form-field input[type='number']::placeholder, .form-field input[type='password']::placeholder, .form-field input[type='email']::placeholder {
   opacity: 1;
   color: #0c486c;
+}
 .form-field + .form-field {
   margin-top: 20px;
   margin-top: 1.25rem;
+}
 body {
   font-size: 16px;
   font-family: "Roboto", sans-serif;
   line-height: 1.4;
   color: #0c486c;
   font-size: 4vw;
+}
 @media (min-width: 25em) {
   body {
     font-size: 2.2vw;
+  }
+}
 @media (min-width: 64em) {
   body {
     font-size: 2vw;
+  }
+}
 @media (min-width: 80em) {
   body {
     font-size: 28px;
+  }
+}
 .lede {
   margin: 30px 0;
   margin: 1.875rem 0;
   font-size: 4.2vw;
+}
 @media (min-width: 25em) {
   .lede {
     font-size: 3vw;
+  }
+}
 @media (min-width: 64em) {
   .lede {
     font-size: 2vw;
     margin: 3.375rem 0;
+  }
+}
 @media (min-width: 80em) {
   .lede {
     font-size: 28px;
+  }
+}
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
   font-family: "Titillium Web", sans-serif;
   font-weight: 900;
   text-transform: uppercase;
   margin: 0;
   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) {
   border-left: 1px solid #0c486c;
+}
 table tr:not(:last-of-type) {
   border-bottom: 1px solid #0c486c;
+}
 table.alt th {
   font-family: "Titillium Web", sans-serif;
   font-weight: 900;
   text-transform: uppercase;
+}
 table.alt th, table.alt td {
   padding: 10px;
   padding: 0.625rem;
   text-align: left;
+}
 table.alt th:not(:first-of-type), table.alt td:not(:first-of-type) {
   border-left: 1px solid #3ab1c9;
+}
 table.alt tr:not(:last-of-type) {
   border-bottom: 1px solid #3ab1c9;
+}
 /*
 * Hide only visually, but have it available for screen readers: h5bp.com/v
 */
 .visuallyhidden {
   border: 0;
   clip: rect(0 0 0 0);
   height: 1px;
   margin: -1px;
   overflow: hidden;
   padding: 0 !important;
   position: absolute !important;
   width: 1px;
+}
 .visuallyhidden.focusable:active, .visuallyhidden.focusable:focus {
   clip: auto;
   height: auto;
   margin: 0;
   overflow: visible;
   position: static;
   width: auto;
+}
 .btn {
   display: inline-block;
   background: transparent;
   color: #0c486c;
   text-decoration: none;
   border: 1px solid #3ab1c9;
   padding: 10px 20px;
   padding: 0.625rem 1.25rem;
   border-radius: 0.625rem;
   transition: all 300ms ease-in-out;
   line-height: normal;
+}
 .btn:hover, .btn:focus, .btn:active {
   color: #3ab1c9;
   border-color: #3ab1c9;
   cursor: pointer;
+}
 .btn__white {
   color: white;
   border-color: white;
+}
 .btn__white:hover {
   background-color: white;
   border-color: white;
   color: #0c486c;
+}
 @media (min-width: 48em) {
   .btn {
     border: 3px solid #0c486c;
+  }
   .btn__white {
     border-color: white;
+  }
+}
 @media (min-width: 64em) {
   .btn {
     padding: 0.625rem 2.5rem;
+  }
+}
 .btn__compact {
   padding: 0.625rem 1.25rem;
   border: 1px solid #3ab1c9;
+}
 .btn__active {
   border: solid #3ab1c9;
+}
 .btn-group {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-align: center;
   align-items: center;
+}
 .btn-group > .btn,
 .btn-group > .btn-svg {
   display: inline-block;
   margin-right: 20px;
   margin-right: 1.25rem;
+}
 .btn-svg {
   width: 2em;
   height: 2em;
   position: relative;
   border-bottom: 0;
   display: block;
+}
 .btn-svg > svg {
   position: absolute;
   left: 0;
   top: 0;
   height: 100%;
   width: 100%;
+}
 .btn-svg__alt {
   color: #3ab1c9;
+}
 .btn-svg__alt:hover {
   color: #0c486c;
+}
 .select {
   position: relative;
+}
 .select select {
   outline: 0;
   border: 0;
   width: 100%;
   background-color: white;
   color: #0c486c;
   padding: 10px;
   padding-right: 35px;
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
+}
 .select select:active {
   background-color: whitesmoke;
+}
 .select select::-ms-expand {
   display: none;
+}

0 comments (0 inline, 0 general)