From 6bb3754742a459e56140061eea8727dce523a9b1 Mon Sep 17 00:00:00 2001 From: Chaney Date: Fri, 13 May 2016 17:53:22 -0400 Subject: [PATCH 1/2] Add fancy material design scaffold and styling for forms. --- bands/templates/bandbase.html | 46 +++++++------- bands/templates/bands/agreement.html | 93 ++++++++++++++-------------- bands/templates/bands/bio.html | 90 +++++++++++++++------------ bands/templates/bands/panel.html | 35 ++++++----- 4 files changed, 138 insertions(+), 126 deletions(-) diff --git a/bands/templates/bandbase.html b/bands/templates/bandbase.html index eff03f3..1627928 100644 --- a/bands/templates/bandbase.html +++ b/bands/templates/bandbase.html @@ -1,27 +1,27 @@ {% extends "preregistration/preregbase.html" %} -{% block title %}Band Information{% endblock %} + +{% block title %} + Band Information +{% endblock title %} + +{% block additional_styles %} + + + +{% endblock additional_styles %} + +{% block header %} +
+

+ MAGStock +

+
+{% endblock header %} + {% block content %} - -
-
- {% block body %}{% endblock %} -
+
+ {% block body %}{% endblock body %} +
-{% endblock %} +{% endblock content %} diff --git a/bands/templates/bands/agreement.html b/bands/templates/bands/agreement.html index 8e2e1a3..9c863df 100644 --- a/bands/templates/bands/agreement.html +++ b/bands/templates/bands/agreement.html @@ -59,60 +59,57 @@

Your Information:

{% csrf_token %} -
- -
- -

+

    + +
  • + + + To ensure that we have assigned the correct number of badges to your band, please confirm the number of performers in your band. -

    -
-
- -
- -
- -

+ + +

  • + + + Please enter the cellphone number of your preferred Point of Contact for any issues we may need to contact you about on-site. -

    -
    • -
    - -
    - -
    - -

    + + +

  • + + + Please be as specific as possible about the day and time you plan on arriving at {{ c.EVENT_NAME }}. -

    -
    • -
    - -
    - -
    - {% checkbox band_info.bringing_vehicle %} We will be parking at MAGFest. -
    -
    - - - -
    -
    - -
    -
    + + +
  • + +
    • + + -

    Want a Panel?

    +

    + Want a Panel? +

    +

    Many of our musical guests are also interested in offering an panel. While we cannot guarantee that we'll have room in -our schedule to accommodate all requests, we definitely want to hear your ideas. Please fill out the - -

    +our schedule to accommodate all requests, we definitely want to hear your ideas. +

    +

    + If you have an idea please fill out the form below: +

    @@ -24,8 +29,8 @@

    Want a Panel?

    {% csrf_token %}
    - -
    + +
    - -
    + +

    An hour is typical, including time for Q&A. @@ -51,21 +56,21 @@

    Want a Panel?

    - -
    + +
    - -
    + +
    {% checkgroup band_panel.tech_needs %}
    -
    +
    From 5a460757a003b1dfd935d958f58cacf047b9aef9 Mon Sep 17 00:00:00 2001 From: Chaney Date: Mon, 16 May 2016 14:16:51 -0400 Subject: [PATCH 2/2] fix lots of band plugin UI / prereg / UX fixes - this is part of a large batch of changes - most of band plugin re-skin completed - update wood paneling for magstock - fix checkbox group generate code to provide ID to CSS - general CSS fixes / updates - removed most inline stylesheets - prereg: change base prereg to support better overriding later in plugins (needs testing with other things) --- bands/templates/bandbase.html | 14 ------ bands/templates/bands/charity.html | 2 +- bands/templates/bands/panel.html | 62 ++++++++++++++++----------- bands/templates/bands/stage_plot.html | 26 ++++++++--- bands/templates/bands/w9.html | 24 ++++++++--- 5 files changed, 76 insertions(+), 52 deletions(-) diff --git a/bands/templates/bandbase.html b/bands/templates/bandbase.html index 1627928..7b3464f 100644 --- a/bands/templates/bandbase.html +++ b/bands/templates/bandbase.html @@ -4,20 +4,6 @@ Band Information {% endblock title %} -{% block additional_styles %} - - - -{% endblock additional_styles %} - -{% block header %} -
    -

    - MAGStock -

    -
    -{% endblock header %} - {% block content %}
    diff --git a/bands/templates/bands/charity.html b/bands/templates/bands/charity.html index c77fcbb..3ecf0cd 100644 --- a/bands/templates/bands/charity.html +++ b/bands/templates/bands/charity.html @@ -6,7 +6,7 @@

    Charity Donations

    MAGFest hosts a yearly charity auction, with 100% of proceeds going to Child's Play. Do you have any cool stuff you can sign that you think would sell at the auction? Our attendees love it when performers they admire sign stuff! If you've got -anything to donate, please tell us what it is! +anything to donate, please tell us what it is! (We love silly things! If you have a silly thing, please suggest!)

    diff --git a/bands/templates/bands/panel.html b/bands/templates/bands/panel.html index b3ae4f2..bc3db38 100644 --- a/bands/templates/bands/panel.html +++ b/bands/templates/bands/panel.html @@ -28,52 +28,66 @@

    {% csrf_token %} -
    - -
    - -
    -
    +
    + + +
    -
    - +
      +
    • +
      -
    + -
    - +
  • +

    An hour is typical, including time for Q&A.

    -
    • + -
    - +
  • +
    -
    • + -
    - +
  • +
    {% checkgroup band_panel.tech_needs %}
    -
    • + -
    +
  • - +
    -
    • + + {% endblock %} diff --git a/bands/templates/bands/stage_plot.html b/bands/templates/bands/stage_plot.html index 56a4d74..f8096c2 100644 --- a/bands/templates/bands/stage_plot.html +++ b/bands/templates/bands/stage_plot.html @@ -1,19 +1,31 @@ {% extends "bandbase.html" %} {% block body %} -

    Stage Layout for {{ band.group.name }}

    +

    + Stage Layout for {{ band.group.name }} +

    -Please upload your desired stage layouts. This can be in the form of written directions, an image, PDF, or a zipfile -containing a collection of files explaining what you need. - -

    +

    + Please upload your desired stage layouts. This can be in the form of written directions, an image, PDF, or a zipfile + containing a collection of files explaining what you need. +

    {% csrf_token %} - - +
    +
    + Upload File + +
    +
    + +
    +
    +
    + +
    {% endblock %} diff --git a/bands/templates/bands/w9.html b/bands/templates/bands/w9.html index d375327..e6d4b1a 100644 --- a/bands/templates/bands/w9.html +++ b/bands/templates/bands/w9.html @@ -3,17 +3,29 @@

    Completed W9 for {{ band.group.name }}

    -You can find a blank W9 form here. Please upload -a filled out copy of this form below: - -

    +

    + You can find a blank W9 form here. +
    + Please upload a filled out copy of this form below: +

    {% csrf_token %} - - + +
    +
    + W-9 + +
    +
    + +
    +
    +
    + +
    {% endblock %}