From f0385acaa9510d21ecb2d3159635d8a239553bd1 Mon Sep 17 00:00:00 2001 From: Dominic Cerquetti Date: Mon, 16 May 2016 21:19:19 -0400 Subject: [PATCH 1/3] convert band agreement into blocks (WIP) - turn parts of the band agreement into blocks for extending via plugins - requires venue INI settings PR --- bands/templates/bands/agreement-base.html | 164 ++++++++++++++++++++++ bands/templates/bands/agreement.html | 129 +---------------- 2 files changed, 165 insertions(+), 128 deletions(-) create mode 100644 bands/templates/bands/agreement-base.html diff --git a/bands/templates/bands/agreement-base.html b/bands/templates/bands/agreement-base.html new file mode 100644 index 0000000..50eb6d4 --- /dev/null +++ b/bands/templates/bands/agreement-base.html @@ -0,0 +1,164 @@ +{% extends "bandbase.html" %} + +{% block body %} +{% block band_text_venue %} +

+ Band agreement for {{ band.group.name }} to perform at {{ c.EVENT_NAME_AND_YEAR }}! +

+

+ {{ c.EVENT_NAME_AND_YEAR }} will be held at {{ c.EVENT_VENUE }}: {{ c.EVENT_VENUE_ADDRESS }}, + from {{ c.EPOCH|datetime:"%B %d" }} - {{ c.ESCHATON|datetime:"%d, %Y" }}. +
+ Performers are encouraged to attend the full event and interact with staff, fellow performers, and attendees + in a relaxed environment. +
+ If performers will not be attending the full event, we ask that they inform us in advance so we may better + allocate sleeping arrangements. +

+{% endblock %} + +{% block band_text_performance %} +

+ Performance +

+

+ Performance time and date for {{ band.group.name }} to be determined, and will be provided prior to the event + as an update to this document. +
+ Performer will be provided with {{ band.estimated_loadin_minutes }} minutes, + of set up and line-check, followed by {{ band.performance_minutes }} minutes for performance. +
+ {% block band_text_timer %} + These time-frames will be enforced, via an on-stage timer, to ensure that performances occur in a timely fashion. + {% endblock band_text_timer %} +

+{% endblock %} + +{% block band_text_merch %} +

+ Merch +

+

+ {% block band_text_merch_inner %} + Space will be provided in our marketplace area for merchandise sales; either at a dedicated table or at our + Rock Island sales area, where {{ c.EVENT_NAME }} staff will sell performer-provided merchandise throughout the festival. + It is recommended, but not required, for performers to use our Rock Island service in this area, as merchandise can be sold + more consistently, and for many more hours. On the night of the performance, table space will also be provided immediately + outside the concert hall for merchandise sales and signings. + {% endblock band_text_merch_inner %} +

+{% endblock %} + +{% block band_text_payment %} +{% if band.payment %} +

+ Payment +

+

+ ${{ band.payment }} by check on site after the show. +

+{% endif %} +{% endblock %} + +{% block band_text_hotel %} +

+ Hotel +

+

+ One hotel room with 2 queen beds will be provided, with check in and out times provided as part of our final agreement. +

+{% endblock %} + +{% block band_text_parking %} +

+ Parking +

+

+ To be included with hotel room for {{ band.vehicles }} vehicle{{ band.vehicles|pluralize }}. +

+{% endblock %} + +{% block band_text_badges %} +

+ Badges +

+

+ Each performer will receive one badge, and one additional complementary badge for a guest. + Additional complimentary badges may be issued upon request. +

+{% endblock %} + +{% block TODO_other_junk %} +

+ Your Information +

+
+ + + {% csrf_token %} + + +
+ + +{% endblock TODO_other_junk %} + +{% endblock body %} diff --git a/bands/templates/bands/agreement.html b/bands/templates/bands/agreement.html index 8e2e1a3..b04c4b2 100644 --- a/bands/templates/bands/agreement.html +++ b/bands/templates/bands/agreement.html @@ -1,128 +1 @@ -{% extends "bandbase.html" %} -{% block body %} - -

Band Agreement for {{ band.group.name }}

- -{{ c.EVENT_NAME_AND_YEAR }} will be held at the - - Gaylord National Hotel and Convention Center, 201 Waterfront St, National Harbor, MD 20745, - {{ c.EPOCH|datetime:"%B %d" }} - {{ c.ESCHATON|datetime:"%d, %Y" }}. - - - -

Performance:

- -Performance time and date for {{ band.group.name }} to be determined, and will be provided at a later time before our final -updated agreement is completed. - -

- -Performer will be provided with {{ band.performance_minutes }} minutes, to include line checks and performance, -with an additional {{ band.estimated_loadin_minutes }} minutes prior to performance for stage load-in and setup. - -

- -These time-frames will be enforced, via an on-stage timer, to ensure that performances occur in a timely fashion. - - -

Merch:

- -Space will be provided in our marketplace area for merchandise sales; either at a dedicated table or at our -Rock Island sales area, where {{ c.EVENT_NAME }} staff will sell performer-provided merchandise throughout the festival. -It is recommended, but not required, for performers to use our Rock Island service in this area, as merchandise can be sold -more consistently, and for many more hours. On the night of the performance, table space will also be provided immediately -outside the concert hall for merchandise sales and signings. - - -{% if band.payment %} -

Payment:

- ${{ band.payment }} by check on site after the show. -{% endif %} - - -

Hotel:

-One hotel room with 2 queen beds will be provided, with check in and out times provided as part of our final agreement. - - -

Parking:

-To be included with hotel room for {{ band.vehicles }} vehicle{{ band.vehicles|pluralize }}. - - -

Badges:

-Each performer will receive one badge, and one additional complementary badge for a guest. -Additional complimentary badges may be issued upon request. - - -

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. -
-
- - - -
-
- -
-
-
- - - -{% endblock %} +{% extends "bands/agreement-base.html" %} From 2def3590d56affb6c683d38fa3387a9dcf21e183 Mon Sep 17 00:00:00 2001 From: Dominic Cerquetti Date: Tue, 17 May 2016 09:05:01 -0400 Subject: [PATCH 2/3] break out more of performer agreement into blocks - for overridding by downstream plugins, like magstock --- bands/templates/bands/agreement-base.html | 63 ++++++++++++++--------- bands/templates/bands/agreement.html | 3 ++ 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/bands/templates/bands/agreement-base.html b/bands/templates/bands/agreement-base.html index 50eb6d4..437a0de 100644 --- a/bands/templates/bands/agreement-base.html +++ b/bands/templates/bands/agreement-base.html @@ -51,44 +51,60 @@

{% block band_text_payment %} {% if band.payment %} -

- Payment -

+

+ Payment +

${{ band.payment }} by check on site after the show.

-{% endif %} + {% endif %} {% endblock %} -{% block band_text_hotel %} -

- Hotel -

+{% block band_text_accommodations %} +

+ Accommodations +

- One hotel room with 2 queen beds will be provided, with check in and out times provided as part of our final agreement. + {% block band_text_accommodations_inner %} + One hotel room with 2 queen beds will be provided, + with check in and out times provided as part of our final agreement. + {% endblock %}

{% endblock %} {% block band_text_parking %} -

- Parking -

+

+ Parking +

+ {% block band_text_parking_inner %} To be included with hotel room for {{ band.vehicles }} vehicle{{ band.vehicles|pluralize }}. + {% endblock %}

{% endblock %} -{% block band_text_badges %} -

- Badges -

+{% block band_text_admission %} +

+ Admission +

+ {% block band_text_admission_inner %} Each performer will receive one badge, and one additional complementary badge for a guest. Additional complimentary badges may be issued upon request. + {% endblock %} +

+{% endblock %} + +{% block band_text_agreement_confirm %} +

+ Agreement +

+

+ By submitting your band's information below, you agree to the above terms.

{% endblock %} -{% block TODO_other_junk %} +{% block band_information_form %}

Your Information

@@ -105,8 +121,8 @@

- To ensure that we have assigned the correct number of badges to your band, please confirm the number - of performers in your band. + To ensure that we have assigned the correct number of registrations for your band, + please confirm the number of performers in your band.
  • @@ -130,7 +146,7 @@

  • {% checkbox band_info.bringing_vehicle %} - +
    • ​
    • @@ -159,6 +176,6 @@

    $.field('bringing_vehicle').on('click', showOrHideVehicleInfo); }); -{% endblock TODO_other_junk %} +{% endblock band_information_form %} {% endblock body %} diff --git a/bands/templates/bands/agreement.html b/bands/templates/bands/agreement.html index b04c4b2..8776190 100644 --- a/bands/templates/bands/agreement.html +++ b/bands/templates/bands/agreement.html @@ -1 +1,4 @@ {% extends "bands/agreement-base.html" %} + +{# By default, this page renders exactly what's in the base template. #} +{# Downstream plugins may override this file and change base blocks, so leave this file in place. #} From fea202b7bed547d30ef6e17ecdcd0bb79503eaad Mon Sep 17 00:00:00 2001 From: Dominic Cerquetti Date: Thu, 19 May 2016 17:31:34 -0400 Subject: [PATCH 3/3] reset form formatting back to original version - revert Chaney's WIP formatting I accidentally pulled in, use original --- bands/templates/bands/agreement-base.html | 105 +++++++++++----------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/bands/templates/bands/agreement-base.html b/bands/templates/bands/agreement-base.html index 437a0de..e074359 100644 --- a/bands/templates/bands/agreement-base.html +++ b/bands/templates/bands/agreement-base.html @@ -106,65 +106,69 @@

    {% block band_information_form %}

    - Your Information + Your Information:

    {% csrf_token %} -
      - -
    • - - - - To ensure that we have assigned the correct number of registrations for your band, - please confirm the number of performers in your band. - -
      • -
    • - - - +
      + +
      + +

      + 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 %} - -
      • -​ - -
    • - -
      • - -
    +

    + + + +
    + +
    + {% checkbox band_info.bringing_vehicle %} We will be parking at MAGFest. +
    +
    + + + +
    +
    + +
    +
    + {% endblock band_information_form %} {% endblock body %}