diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 91bd49d075d6240d8226afca87b2b21d2130ba08..96d3266dd394a60374943c9628be6044ba18387b 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -2,9 +2,11 @@ import os import saml2 import saml2.saml from django.utils.crypto import get_random_string +import django PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) +DJANGO_ROOT = os.path.abspath(os.path.dirname(django.__file__)) BASE_DIR = PACKAGE_ROOT @@ -21,7 +23,6 @@ EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" THEME_CONTACT_EMAIL = "team@lca2018.org" SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", get_random_string(length=64)) - PINAX_STRIPE_PUBLIC_KEY = os.environ.get("STRIPE_PUBLIC_KEY", "your test public key") PINAX_STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "your test secret key") PINAX_STRIPE_SEND_EMAIL_RECEIPTS = False @@ -34,7 +35,7 @@ smal2_sp_slo_post = 'http://example.com/saml2/ls/post' saml2_base_dir = os.path.join(PACKAGE_ROOT, 'saml2') saml2_idp_metadata = { 'local': [os.path.join(saml2_base_dir, 'remote_metadata.xml')], - }, + } saml2_signing_key = os.path.join(saml2_base_dir, 'cert.key') saml2_signing_crt = os.path.join(saml2_base_dir, 'cert.pem') saml2_encr_key = os.path.join(saml2_base_dir, 'enc.key') @@ -71,7 +72,7 @@ USE_TZ = True MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media") MEDIA_URL = "/site_media/media/" -STATIC_ROOT = os.path.join(PROJECT_ROOT, "static", "distx") +STATIC_ROOT = os.path.join(PROJECT_ROOT, "static") STATIC_URL = "/static/dist/" STATICFILES_DIRS = [ @@ -83,11 +84,13 @@ STATICFILES_FINDERS = [ "django.contrib.staticfiles.finders.AppDirectoriesFinder", ] +FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", "DIRS": [ os.path.join(PACKAGE_ROOT, "templates"), + os.path.join(DJANGO_ROOT, 'forms/templates') ], "APP_DIRS": True, "OPTIONS": { diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html index c773460b6bf9356acc3d403d97299618f3147cbe..19ba3aa386972020bf9632508ea0a66dfa6d08ce 100644 --- a/pinaxcon/templates/_form_snippet.html +++ b/pinaxcon/templates/_form_snippet.html @@ -6,8 +6,8 @@
{% endif %} -
- Fields marked with (*) are required. -
+
+ Fields marked with * are required. +
{% include "forms/render.html" with form=form %} diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 5e90b131bbedcd8c00277135c44ec2d49dca8c7d..3a22c5bee68ebff796c8f6d9588b0ef6fccd8809 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -9,249 +9,322 @@ {% load staticfiles %} -{% block head_title %}Dashboard{% endblock %} +{% block header_title %}Dashboard{% endblock %} {% block content %} -
-

DASHBOARD

-{% available_categories as categories %} -{% if categories %} - -
-
-

{% trans "Attend" %} {% conference_name %}

-
-
- {% if not user.attendee.completed_registration %} - - Get your ticket - - {% else %} - - Edit attendee profile - +
+ {% available_categories as categories %} + {% if categories %} - {% items_pending as pending %} - {% if pending %} - - Check out and pay - - {% endif %} - {% endif %} - {% if user.is_staff %} - Reports - {% endif %} + {% if user.is_staff %} +
+
+

Administration

+
+
+
+ Reports
- + {% endif %} -
- {% if not user.attendee.completed_registration %} -

To attend the conference, you must purchase a ticket. Use our registration form to purchase your ticket. -

+
+
+

{% trans "Attend" %} {% conference_name %}

+
+
+ {% if not user.attendee.completed_registration %} +
+
+

Register

+
+
+

To attend the conference, you must register an attendee profile and purchase your ticket

+ Get your ticket +
+
{% else %} - -

Your items

- {% items_pending as pending %} - - {% if pending %} -

Items pending payment

- {% include "registrasion/_items_list.html" with items=pending %} -

- - Check out and pay for these items. -

- {% endif %} - - {% items_purchased as purchased %} - {% if purchased %} -

Paid items

- {% include "registrasion/_items_list.html" with items=purchased %} - {% endif %} - -

Add/Update items

- {% include "registrasion/_category_list.html" with categories=categories %} - - {% invoices as invoices %} - {% if invoices %} -

Invoices

-
    - {% for invoice in invoices %} - {% if invoice.is_void %} -
  • - {% endif %} - Invoice {{ invoice.id }} - - ${{ invoice.value }} ({{ invoice.get_status_display }}) -
    • - {% endfor %} -
-

- -

- {% endif %} - - {% available_credit as credit %} - {% if credit %} -

You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to - for a refund to your original payment source.

+
+
+
+

Attendee Profile

+
+
+

If you would like to change the details on your badge or your attendee statistics, you may edit your attendee profile up until the weekend before the conference

+ Edit attendee profile +
+
+
+ {% items_pending as pending %} + {% if pending %} +
+
+
+

Account

+
+
+ {% items_pending as pending %} + {% if pending %} +
+
+
+
Items pending payment
+
+
+ {% include "registrasion/_items_list.html" with items=pending %} +
+ Check out and pay +
+
+
+
+ {% endif %} + + {% items_purchased as purchased %} + {% if purchased %} +
+
+
+
Paid Items
+
+
+ {% include "registrasion/_items_list.html" with items=purchased %} +
+
+
+ {% endif %} +
+
+
+
Add/Update Items
+
+
+ {% include "registrasion/_category_list.html" with categories=categories %} +
+
+
+ + {% invoices as invoices %} + {% if invoices %} +
+
+
+
Invoices
+
+
+
    + {% for invoice in invoices %} + {% if invoice.is_void %} +
  • + {% endif %} + Invoice {{ invoice.id }} + - ${{ invoice.value }} ({{ invoice.get_status_display }}) + +
    • + {% endfor %} +
+
+
+
+ {% endif %} + + {% available_credit as credit %} + {% if credit %} +
+
+
+
Credit
+
+
+

You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to for a refund to your original payment source.

+
+
+
+ {% endif %} + +
+
+
{% endif %} -

{% endif %} +
- {% endif %} -
-
-

{% trans "Speaking and Miniconfs" %}

-
-
+ +
+
+

{% trans "Speaking and Miniconfs" %}

+
+
+
+
+
+
Speaker Profile
+
+
+ {% if not user.speaker_profile %} +

To create a speaking or miniconf proposal you must first create a speaker profile.

+ {% endif %} +

Your speaker profile is independent of your attendee profile and the details you provide here will be used during selection and to populate your speaker bio on the conference website.

{% if not user.speaker_profile %} - - Create profile - + Create Profile {% else %} - - Edit profile - - - New proposal - + Edit Profile {% endif %}
-
- -
+
- {% if not user.speaker_profile %} -

To submit a proposal, you must first create a speaker profile.

- {% else %} -

Your Proposals

+ {% if user.speaker_profile %} +
+
+
+
New Proposal
+
+
+

You may use the following form to create a speaking or miniconf proposal.

+

Once submitted you will be able to see the status of your proposals, as well manage the submission and co-speakers from this page

+ New Proposal +
+
+
+ {% endif %} - {% if not user.speaker_profile.proposals.exists %} -

No proposals submitted yet.

- {% else %} -

- {% endif %} +
+
- {% endif %} - {% if user.speaker_profile.proposals.exists %} +{% if user.speaker_profile %} + {% if user.speaker_profile.proposals.exists %} +
+
+

Your Proposals

+
+
+ {% if user.speaker_profile.proposals.exists %} {% for proposal in user.speaker_profile.proposals.all %} {% include "symposion/proposals/_proposal_row.html" %} {% endfor %} - {% endif %} - - {% if user.speaker_profile %} - {% associated_proposals as associated_proposals %} - {% if associated_proposals %} -

Proposals you have joined as an additional speaker

- - - - - - - - {% for proposal in associated_proposals %} - {% include "symposion/proposals/_proposal_row.html" %} - {% endfor %} -
TitleTypeStatusActions
- {% endif %} + {% endif %} +
+
+ {% endif %} +{% endif %} - {% pending_proposals as pending_proposals %} - {% if pending_proposals %} -

Proposals you have been invited to join

- - - - - - - - {% for proposal in pending_proposals %} - {% include "symposion/proposals/_pending_proposal_row.html" %} - {% endfor %} -
TitleTypeStatusActions
- {% endif %} - {% endif %} -
+{% if user.speaker_profile %} + {% associated_proposals as associated_proposals %} + {% pending_proposals as pending_proposals %} + {% if associated_proposals or pending_proposals %} +
+
+

Copresenter Proposals

+
+
+ {% for proposal in associated_proposals %} + {% include "symposion/proposals/_proposal_row.html" %} + {% endfor %} + {% for proposal in pending_proposals %} + {% include "symposion/proposals/_pending_proposal_row.html" %} + {% endfor %} +
+
+ {% endif %} +{% endif %} {# {% include 'registrasion/dashboard-widget.html' %} #} {% if review_sections %} - -
-

{% trans "Reviews" %}

- - {% for section in review_sections %} -

{{ section }}

- - {% endfor %} - +
+
+

{% trans "Reviews" %}

- +
+ {% for section in review_sections %} +
+
+
+
{{ section }}
+
+
+ +
+
+
+ {% endfor %} +
+
{% endif %} {% available_teams as available_teams %} {% if user.memberships.exists or available_teams %} -
-

{% trans "Teams" %}

- - {% if user.memberships.exists %} -

Your Teams

- - {% for membership in user.memberships.all %} - - - - - - {% endfor %} -
- {{ membership.team.name }} - {% if membership.team.description %}
{{ membership.team.description }}{% endif %} - 		+
+
+

{% trans "Teams" %}

+
+
+
+
+ {% if user.memberships.exists %} +
+

Your Teams

+
+
+ {% for membership in user.memberships.all %} +
+
+
+
{{ membership.team.name }}
+
+
+ {% if membership.team.description %}

{{ membership.team.description }}

{% endif %} + Details {{ membership.get_state_display }} -
{% if membership.state == "manager" or user.is_staff %} {% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %} - {% endif %} -
- - {% endif %} - - - {% if available_teams %} -

Available Teams

- - {% for team in available_teams %} - - - {% endfor %} -
- {{ team }} - {% if team.description %}
{{ team.description }}{% endif %} - 		- {{ team.get_access_display }} -
- {% endif %} - + {% endif %} +
+
+
+ {% endfor %} +
+ {% endif %}
+
+ {% if available_teams %} +
+

Available Teams

+
+
+ {% for team in available_teams %} +
+
+
+
{{ team }}
+
+
+ {% if team.description %}

{{ team.description }}

{% endif %} + {{ team.get_access_display }} + Details +
+ {% endfor %} +
+ {% endif %} +
+
{% endif %}
diff --git a/pinaxcon/templates/django/forms/widgets/checkbox.html b/pinaxcon/templates/django/forms/widgets/checkbox.html new file mode 100644 index 0000000000000000000000000000000000000000..ee66c9c283245c957777e890c47235e1baeb8e40 --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/checkbox.html @@ -0,0 +1 @@ + diff --git a/pinaxcon/templates/django/forms/widgets/checkbox_option.html b/pinaxcon/templates/django/forms/widgets/checkbox_option.html new file mode 100644 index 0000000000000000000000000000000000000000..fd57f435701ad711a5035af805af227865a84129 --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/checkbox_option.html @@ -0,0 +1,3 @@ +{% if wrap_label %}{% endif %} diff --git a/pinaxcon/templates/django/forms/widgets/input.html b/pinaxcon/templates/django/forms/widgets/input.html new file mode 100644 index 0000000000000000000000000000000000000000..87a8c06590b033e27086444324bff2304307e7d2 --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/input.html @@ -0,0 +1 @@ + diff --git a/pinaxcon/templates/django/forms/widgets/radio_option.html b/pinaxcon/templates/django/forms/widgets/radio_option.html new file mode 100644 index 0000000000000000000000000000000000000000..323bbbb36242303f9977db7374c59d83c52ec604 --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/radio_option.html @@ -0,0 +1,3 @@ +{% if wrap_label %}{% endif %} diff --git a/pinaxcon/templates/django/forms/widgets/select.html b/pinaxcon/templates/django/forms/widgets/select.html new file mode 100644 index 0000000000000000000000000000000000000000..8a6ecad8e5851dd4ce853297208aa4e660a94339 --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/select.html @@ -0,0 +1,5 @@ + diff --git a/pinaxcon/templates/django/forms/widgets/text.html b/pinaxcon/templates/django/forms/widgets/text.html new file mode 100644 index 0000000000000000000000000000000000000000..87a8c06590b033e27086444324bff2304307e7d2 --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/text.html @@ -0,0 +1 @@ + diff --git a/pinaxcon/templates/django/forms/widgets/textarea.html b/pinaxcon/templates/django/forms/widgets/textarea.html new file mode 100644 index 0000000000000000000000000000000000000000..3cdc0916a72a6fcfbadf33b9bc86c1063d07e43a --- /dev/null +++ b/pinaxcon/templates/django/forms/widgets/textarea.html @@ -0,0 +1,2 @@ + diff --git a/pinaxcon/templates/forms/render_fields.html b/pinaxcon/templates/forms/render_fields.html index b88573bf1582f58145c8d1e8c61bd58bc8988418..91b7e2b3829717136db9b1f57f3a5e53da41a17b 100644 --- a/pinaxcon/templates/forms/render_fields.html +++ b/pinaxcon/templates/forms/render_fields.html @@ -1,13 +1,5 @@ {% for field in form %} {% if not field.is_hidden %} -
-
- {% include "forms/widget.html" %} -
- - {% if field.help_text %} - {{ field.help_text|safe }} - {% endif %} -
+ {% include "forms/widget.html" %} {% endif %} {% endfor %} diff --git a/pinaxcon/templates/forms/widget.html b/pinaxcon/templates/forms/widget.html index 7b2c9e075352aa44e59a797517241d1768ca5c3c..cf1fc56c0e26737914fc24537019ab6f4329b4ca 100644 --- a/pinaxcon/templates/forms/widget.html +++ b/pinaxcon/templates/forms/widget.html @@ -1,12 +1,14 @@ {% load pyconau2017_tags %} -{% classname field.field.widget as widget %} -{% if widget == "CheckboxInput" %} - {% include "forms/widget_boolean_single.html" %} -{% elif widget == "RadioSelect" or widget == "CheckboxSelectMultiple" %} - {% include "forms/widget_boolean_multiple.html" %} -{% elif widget == "Select" or widget == "SelectMultiple" or widget == "LazySelect" or widget == "CountrySelectWidget" %} - {% include "forms/widget_basic.html" with widget_class="select" %} -{% else %} - {% include "forms/widget_basic.html" %} -{% endif %} +
+ {% classname field.field.widget as widget %} + {% if widget == "CheckboxInput" %} + {% include "forms/widget_boolean_single.html" %} + {% elif widget == "RadioSelect" or widget == "CheckboxSelectMultiple" %} + {% include "forms/widget_boolean_multiple.html" %} + {% elif widget == "Select" or widget == "SelectMultiple" or widget == "LazySelect" or widget == "CountrySelectWidget" %} + {% include "forms/widget_basic.html" with widget_class="select" %} + {% else %} + {% include "forms/widget_basic.html" %} + {% endif %} +
diff --git a/pinaxcon/templates/forms/widget_basic.html b/pinaxcon/templates/forms/widget_basic.html index a6f0213a39518b7180cb1ade50759ec204c29a37..d8ae1caa09600554a1ce105ece9b7883e1f20890 100644 --- a/pinaxcon/templates/forms/widget_basic.html +++ b/pinaxcon/templates/forms/widget_basic.html @@ -1,8 +1,8 @@ -

- - {% if field.field.required %} - (*) - {% endif %} -

+ {{ field.errors }} -
{{ field }}
+
+ {{ field }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} +
diff --git a/pinaxcon/templates/forms/widget_boolean_multiple.html b/pinaxcon/templates/forms/widget_boolean_multiple.html index 1cc5abd7f7657ef27f4687318c9e278531e15e06..d999891b341d1608b15b5604c461b2f072f6bec8 100644 --- a/pinaxcon/templates/forms/widget_boolean_multiple.html +++ b/pinaxcon/templates/forms/widget_boolean_multiple.html @@ -1,20 +1,13 @@ -

- {{ field.label }} - {% if field.field.required %} - (*) - {% endif %} -

-
    - {% for item in field %} - {% if True or widget == "CheckboxSelectMultiple" %} -
  • - {% else %} - -
  • - {% endif %} - {{ item }} - -
    • - {% endfor %} -
-{{ field.errors }} +

+ {{ field.label }}{% if field.field.required %} *{% endif %} + {{ field.errors }} +

+{% if field.help_text %} + {{ field.help_text|safe }} +{% endif %} + +{% for item in field %} +
+ {{ item }} +
+{% endfor%} diff --git a/pinaxcon/templates/forms/widget_boolean_single.html b/pinaxcon/templates/forms/widget_boolean_single.html index c9d3b854beb61461f07a01ea085853c937c3bf50..a9eb74efe15a42d045dffcd56507d8ea9521c654 100644 --- a/pinaxcon/templates/forms/widget_boolean_single.html +++ b/pinaxcon/templates/forms/widget_boolean_single.html @@ -1,12 +1,13 @@ -
    -
  • +

    + {{ field.label }}{% if field.field.required %} *{% endif %} + {{ field.errors }} +

    +
    +
    • -
-{{ field.errors }} +

Sign me up

+ {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} + +
diff --git a/pinaxcon/templates/registrasion/amend_registration.html b/pinaxcon/templates/registrasion/amend_registration.html index 19b60115c62e79b0c1f3fd3c53a55490819e5958..b996bf64590196d7b807d31bdc8f65c869d9dde5 100644 --- a/pinaxcon/templates/registrasion/amend_registration.html +++ b/pinaxcon/templates/registrasion/amend_registration.html @@ -25,7 +25,7 @@

Amend pending items

-
+ {% csrf_token %} {% include "_form_snippet.html" with form=form %}
@@ -44,7 +44,7 @@

Apply voucher

- + {% csrf_token %} {% include "_form_snippet.html" with form=voucher_form %}
diff --git a/pinaxcon/templates/registrasion/credit_note.html b/pinaxcon/templates/registrasion/credit_note.html index e24d79b7d39ce029136658ddb9e2bac21d8dedde..762740d17d8b0c5b223b9201e2503cb49cdc2bd7 100644 --- a/pinaxcon/templates/registrasion/credit_note.html +++ b/pinaxcon/templates/registrasion/credit_note.html @@ -18,7 +18,7 @@

This credit note was generated from funds excess from invoice {{ credit_note.invoice.id }}.

{% if credit_note.is_unclaimed %} - + {% csrf_token %}

Apply to invoice

You can apply this credit note to an unpaid invoice.

diff --git a/pinaxcon/templates/registrasion/guided_registration.html b/pinaxcon/templates/registrasion/guided_registration.html index 7695a97ee1d4ce5c5330a8a29867443375d4f458..5a2302f4a70d4356bb43d00ce3ed4acabf83f9cd 100644 --- a/pinaxcon/templates/registrasion/guided_registration.html +++ b/pinaxcon/templates/registrasion/guided_registration.html @@ -13,7 +13,7 @@ {% block content %} - + {% csrf_token %} {% for section in sections %} diff --git a/pinaxcon/templates/registrasion/manual_payment.html b/pinaxcon/templates/registrasion/manual_payment.html index cdfef2c21c6bb95176a63c32e9e20770cf4fd82a..212e46aa54595c2972102d8869c0eebc76a7de39 100644 --- a/pinaxcon/templates/registrasion/manual_payment.html +++ b/pinaxcon/templates/registrasion/manual_payment.html @@ -14,7 +14,7 @@

Enter a reference and the amount of the payment. A refund is a negative payment.

- + {% csrf_token %} diff --git a/pinaxcon/templates/registrasion/nag_unpaid.html b/pinaxcon/templates/registrasion/nag_unpaid.html index 7ef3eed505a95d2c833189131eeac28e5f644f1d..6ed6bb12428433a5c214f73921ad3d13c4673bbe 100644 --- a/pinaxcon/templates/registrasion/nag_unpaid.html +++ b/pinaxcon/templates/registrasion/nag_unpaid.html @@ -6,7 +6,7 @@

Send reminder e-mails

- + {% csrf_token %} {{ form | bootstrap}}
diff --git a/pinaxcon/templates/registrasion/product_category.html b/pinaxcon/templates/registrasion/product_category.html index 62836e12d5585738b97985607474a0d53d658b91..db531ab2591c056da68a403b135f0bd1fb50aaea 100644 --- a/pinaxcon/templates/registrasion/product_category.html +++ b/pinaxcon/templates/registrasion/product_category.html @@ -24,7 +24,7 @@ - + {% csrf_token %} - - - - - - - - + + + + diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html index f9378f08b5b08028fcf2dea4bbf28eb142cd1e9c..b4c4a503e7b6958fda39f05d6e665b1c4dfe0d3a 100644 --- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html +++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html @@ -96,7 +96,7 @@ {% endfor %} @@ -58,7 +58,7 @@ {% endfor %} @@ -71,8 +71,8 @@ {% endfor %} diff --git a/static/src/pyconau2017/css/pyconau.css b/static/src/pyconau2017/css/pyconau.css deleted file mode 100644 index 08ed5b170416e739c6e5b45878f297d38def176a..0000000000000000000000000000000000000000 --- a/static/src/pyconau2017/css/pyconau.css +++ /dev/null @@ -1,130 +0,0 @@ -body { - /* Unfortunately, we can't use django tags in here. So, we'll pull the bg image in from within the body tag itself */ - /* background: url({% static 'pyconau2017/images/pyconau-2016-collage.jpg' %}) no-repeat center center fixed; */ - background: no-repeat center center fixed; */ - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; - font-size: 14px; -} - - -.vertical-center { - min-height: 100%; /* Fallback for browsers do NOT support vh unit */ - min-height: 100vh; /* These two lines are counted as one :-) */ - - display: flex; - flex-direction: row-reverse; - align-items: center; -} - -.jumbotron { - background-color: rgba(0,0,0,0.9); - color: white; - margin-top: 60px; - margin-bottom: 60px; -} - -.jumbotron-white { - background-color: rgba(255,255,255,1.0); - color: black; - margin-bottom: 60px; - border-radius: 6px; -} - -@font-face { - font-family: 'Flux Regular'; - src: url('fonts/FLUXRegular.ttf'); -} - -.jumbotron h1 { - font-size: 3em; - font-family: 'Flux Regular'; -} - -#announcements { - /* - background-color: rgba(0,0,0,0.9); - color: white; - */ - border-radius: 6px; - padding: 2em; - margin-top: 60px; - margin-bottom: 60px; -} - -#announcements h2 { - font-size: 2em; - font-family: 'Flux Regular'; - /*color: white;*/ -} - -/* getting nav bar sorted ... (n6) */ - -nav { - background-color: #000; - width: 100%; - padding-top: 10px; - /*padding-bottom: 10px;*/ - padding-left: 20px; -} - -.l-header--nav { - font-size: 1.4em; - font-weight: bold; - color: #a6e9f5; -} - -.menu-dropdown { - background: #4c4c4b; -} - -#sponsors { - border-radius: 6px; - padding: 1em; - margin-top: 60px; - margin-bottom: 60px; - text-align: center; - width: 150px; /* this is a hack. need to figure out exactly where (else) it's being set. */ -} -btn -.thumbnail { - width: auto; - height: auto; - max-width: 100px; - max-height: 100px; - border: 0; - -} - -div.sponsor-list { - min-width: 100px; - display: block; - margin: 0 auto; -} - -legend { - color: #a6e9f5; -} - -.pad-buttons { - padding: 200px 0 20px 0; -} - -.team-table { - width: 80%; -} - -.dashboard-panel { - border: solid black 1px; - border-radius: 6px; - background-color: #eee; - padding: 20px 20px 20px 20px; - margin-top: 20px; -} - -.btn__black { - color: black; - border-color: black; -}
- {{ proposal.title }} - {{ proposal.kind.name }} - {% if proposal.cancelled %} - {% trans 'Cancelled' %} - {% else %} +
+
+
+
{{ proposal.title }}
+
+
+
    +
  • Type: {{ proposal.kind.name }}
    • +
  • + Status: + {% if proposal.cancelled %} + Cancelled + {% else %} {% if request.user == proposal.speaker.user %} - {% if proposal.result.status == "accepted" %} - {% trans 'Accepted' %} - {% else %} - {% trans 'Submitted' %} - {% endif %} + {% if proposal.result.status == "accepted" %} + Accepted + {% else %} + Submitted + {% endif %} {% else %} - {% trans 'Invited' %} + Invited {% endif %} + {% endif %} +
    • +
+
+ View Details + {% if not proposal.cancelled %} + Accept Copresenter Invitation + Decline Copresenter Invitation {% endif %} -
- {% if not proposal.cancelled %} - - {% endif %} -
{{ document.description }} - + {% csrf_token %} diff --git a/pinaxcon/templates/symposion/proposals/_proposal_row.html b/pinaxcon/templates/symposion/proposals/_proposal_row.html index fad92d9ebfc836c108a97e695c147b5889fc8bb7..012c3e84e0574f7c64e8f1f503f738aca8855059 100644 --- a/pinaxcon/templates/symposion/proposals/_proposal_row.html +++ b/pinaxcon/templates/symposion/proposals/_proposal_row.html @@ -1,35 +1,37 @@ -

- {{ proposal.title }} -

- -
    -
  • Type: {{ proposal.kind.name }}
    • -
  • - Status: - {% if proposal.cancelled %} +
    +
    +
    +
    {{ proposal.title }}
    +
    +
    +
      +
    • Type: {{ proposal.kind.name }}
      • +
    • + Status: + {% if proposal.cancelled %} Cancelled - {% else %} + {% else %} {% if request.user == proposal.speaker.user %} - {% if proposal.result.status == "accepted" %} - Accepted - {% else %} - Submitted - {% endif %} + {% if proposal.result.status == "accepted" %} + Accepted + {% else %} + Submitted + {% endif %} {% else %} - Associated + Associated {% endif %} + {% endif %} +
      • +
    +
    + View Details + {% if not proposal.cancelled %} + {% if request.user == proposal.speaker.user and proposal.can_edit %} + Edit + Manage Additional Speakers + {% endif %} {% endif %} -
    • -
- -
- View details - {% if not proposal.cancelled %} - {% if request.user == proposal.speaker.user and proposal.can_edit %} - Edit - Manage Additional Speakers - {% endif %} - {% endif %} +
+ - -
+ diff --git a/pinaxcon/templates/symposion/proposals/document_create.html b/pinaxcon/templates/symposion/proposals/document_create.html index 4ddb997a5cd0ebacb0e5cc3d20216921fa42fb8e..e238b136c1f7a9f50b53fba482ff3ef6cd2a3826 100644 --- a/pinaxcon/templates/symposion/proposals/document_create.html +++ b/pinaxcon/templates/symposion/proposals/document_create.html @@ -5,7 +5,7 @@ {% block page_title %}Upload Document to '{{ proposal.title }}'{% endblock %} {% block proposals_body %} -
+ {% csrf_token %}
{% include "_form_snippet.html" with form=form %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_cancel.html b/pinaxcon/templates/symposion/proposals/proposal_cancel.html index 68ee277117326ffb23dcacb05b797604d33aa26a..834055d1f2021a975489806f57219986eb55e28f 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_cancel.html +++ b/pinaxcon/templates/symposion/proposals/proposal_cancel.html @@ -6,7 +6,7 @@ {% block page_title %}Cancel: {{ proposal.title }}{% endblock %} {% block proposals_body %} - + {% csrf_token %}

Are you sure you want to cancel {{ proposal.title }}?

diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html index ac70c584d58762c9f3bd23aca558fcf339b92141..163e909675726861a320b69c9b994467ab33b2b7 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_detail.html +++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html @@ -45,7 +45,7 @@
{{ document.description }} - + {% csrf_token %} @@ -73,7 +73,7 @@

{% trans 'You can leave a message for the reviewers here.' %}

-
+ {% csrf_token %}
{% include "_form_snippet.html" with form=message_form %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html index 108bd672163098bbc914db5298b36824f28bda46..f9a0e81844984d0331f61e3e3c1a6da5d4dedacb 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_edit.html +++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html @@ -8,7 +8,7 @@ {% block proposals_body %}

Manage speakers

- + {% csrf_token %}
{% include "_form_snippet.html" with form=form %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_leave.html b/pinaxcon/templates/symposion/proposals/proposal_leave.html index edb5d076586901df2075ad399a57d2c9ca2cd81d..79f9ffbe3cb138aff0d0ffd378fc181ca280b1f9 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_leave.html +++ b/pinaxcon/templates/symposion/proposals/proposal_leave.html @@ -4,7 +4,7 @@ {% block head_title %}Leaving {{ proposal.title }}{% endblock %} {% block body %} - + {% csrf_token %}

Are you sure you wish to leave as a speaker on {{ proposal.title }}?

diff --git a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html index ac61919f5665ab149b701a8d21c04dacb13432b7..228b7352e440a0371d77de2ad6dc21d920fa31c2 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html +++ b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html @@ -26,7 +26,7 @@

{% trans 'Add another speaker' %}

- + {% csrf_token %}
{% include "_form_snippet.html" with form=add_speaker_form %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit.html b/pinaxcon/templates/symposion/proposals/proposal_submit.html index bd8253d52e00912c10607a8239dfce422755fedf..ae20f91f811bc6d8172f9374101a9076e0d498ee 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_submit.html +++ b/pinaxcon/templates/symposion/proposals/proposal_submit.html @@ -3,16 +3,17 @@ {% load i18n %} {% block head_title %}{% trans "Submit A Proposal" %}{% endblock %} +{% block header_title %}Submit A Proposal{% endblock %} {% block proposals_body %} {% if kinds %} -

Select what kind of proposal you'd like to submit:

+

Select what kind of proposal you'd like to submit:

{% for kind in kinds %} - {{ kind }} + {{ kind }} {% endfor %} {% else %} -

Proposals are not currently open for submission.

+

Proposals are not currently open for submission.

{% endif %} {% endblock %} diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html index 358f82a730952647a1967abce02c97c595f95539..f96abfed21c69058d079b774701a468e5e2086fd 100644 --- a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html +++ b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html @@ -2,11 +2,11 @@ {% load i18n %} -{% block page_title %}Submit a Proposal for a {{ kind.name }}{% endblock %} +{% block header_title %}Submit a Proposal for a {{ kind.name }}{% endblock %} {% block head_title %}Submit a Proposal for a {{ kind.name }}{% endblock %} {% block proposals_body %} - + {% csrf_token %}
{% include "_form_snippet.html" with form=proposal_form %} diff --git a/pinaxcon/templates/symposion/reviews/result_notification.html b/pinaxcon/templates/symposion/reviews/result_notification.html index 928bad4f3cb75bb34913cd4379e518eb7b1a0c71..0e0fc4f4c541ec2716a5adc6a6f31a66fd5d02d1 100644 --- a/pinaxcon/templates/symposion/reviews/result_notification.html +++ b/pinaxcon/templates/symposion/reviews/result_notification.html @@ -24,7 +24,7 @@

Result Notification

- + {% csrf_token %} diff --git a/pinaxcon/templates/symposion/reviews/result_notification_prepare.html b/pinaxcon/templates/symposion/reviews/result_notification_prepare.html index 2abc8f8354ef00e74adadb5928bdd62f60637011..c6c750b0e1a9f674c99719e4fe59e3b15429e052 100644 --- a/pinaxcon/templates/symposion/reviews/result_notification_prepare.html +++ b/pinaxcon/templates/symposion/reviews/result_notification_prepare.html @@ -23,7 +23,7 @@

Email

- + {% csrf_token %} diff --git a/pinaxcon/templates/symposion/reviews/review_assignment.html b/pinaxcon/templates/symposion/reviews/review_assignment.html index bfe60beccb1f36fcc7dffa754df27367c120025f..3786e3c8d7620c9179fdd7fac2135e7344d6ba23 100644 --- a/pinaxcon/templates/symposion/reviews/review_assignment.html +++ b/pinaxcon/templates/symposion/reviews/review_assignment.html @@ -18,7 +18,7 @@
- + {% csrf_token %} diff --git a/pinaxcon/templates/symposion/reviews/review_bulk_accept.html b/pinaxcon/templates/symposion/reviews/review_bulk_accept.html index 81f1e57c75cf4957ca2034f378b8f408bbd8b8e3..cdfb4e3c0e7660f0dc71a9e17d5cf17ebfabd6b1 100644 --- a/pinaxcon/templates/symposion/reviews/review_bulk_accept.html +++ b/pinaxcon/templates/symposion/reviews/review_bulk_accept.html @@ -5,7 +5,7 @@ {% block body %}

Bulk Accept

-
+ {% csrf_token %} {{ form|bootstrap }}
diff --git a/pinaxcon/templates/symposion/reviews/review_detail.html b/pinaxcon/templates/symposion/reviews/review_detail.html index 4930c3125122bb15cb550516c5a98af85232b8d2..35f3cf9a3e37226552ec0ba969777e1234ca057d 100644 --- a/pinaxcon/templates/symposion/reviews/review_detail.html +++ b/pinaxcon/templates/symposion/reviews/review_detail.html @@ -14,7 +14,7 @@ {% if is_manager %}
- + {% csrf_token %}
{% if proposal.result.status == "accepted" %} @@ -101,7 +101,7 @@
{% if review_form %} - + {% trans "Submit Review" %}

Enter your vote and any comment to go along with it. You can revise your vote or comment multiple times with an existing vote (your previously recorded score will be replaced during calculations). Your vote and comments are not public and will only be viewable by other reviewers.

{% csrf_token %} @@ -124,7 +124,7 @@
{% if is_manager %}
- + {% csrf_token %} @@ -162,7 +162,7 @@ {% endif %} {% if is_manager %} -
+ {% trans "Send a message" %}

{% blocktrans %} diff --git a/pinaxcon/templates/symposion/reviews/review_review.html b/pinaxcon/templates/symposion/reviews/review_review.html index 484cf7498c353de79d1f5f956072d686b5d80f69..86c25f8e9179a10a623188b8c10ebeb33ce1f64d 100644 --- a/pinaxcon/templates/symposion/reviews/review_review.html +++ b/pinaxcon/templates/symposion/reviews/review_review.html @@ -59,7 +59,7 @@

Review

- + {% csrf_token %}
{{ review_form|bootstrap }} @@ -71,7 +71,7 @@

Comment

- + {% csrf_token %}
{{ comment_form|bootstrap }} diff --git a/pinaxcon/templates/symposion/schedule/_slot_edit.html b/pinaxcon/templates/symposion/schedule/_slot_edit.html index 1283aab80937c38ae43577cdb5195550b6ded67c..3574ec2ff8b3fccf774c3fc35ed0d1f3d002cc72 100644 --- a/pinaxcon/templates/symposion/schedule/_slot_edit.html +++ b/pinaxcon/templates/symposion/schedule/_slot_edit.html @@ -1,5 +1,5 @@ {% load i18n bootstrap %} - +
×

{% trans "Edit Slot" %}

diff --git a/pinaxcon/templates/symposion/schedule/schedule_edit.html b/pinaxcon/templates/symposion/schedule/schedule_edit.html index 83d91ad8a201528da5cfab2d3d5d16a8384aeb52..adcd06226efcfc61d4534a84f1b65c8dff2d5c4b 100644 --- a/pinaxcon/templates/symposion/schedule/schedule_edit.html +++ b/pinaxcon/templates/symposion/schedule/schedule_edit.html @@ -24,7 +24,7 @@

{{ timetable.day.date }}

{% include "symposion/schedule/_edit_grid.html" %} {% endfor %} - {% csrf_token %} + {% csrf_token %} {{ form.as_p }} diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html index baeb677394768c47ea297f981b0df4a44a01df34..699434b9186e0709033b28afd16a0449206d0a35 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_create.html +++ b/pinaxcon/templates/symposion/speakers/speaker_create.html @@ -7,7 +7,7 @@ {% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %} {% block proposals_body %} - + {% csrf_token %}
{% include "_form_snippet.html" with form=speaker_form %} diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html index ac01471cf164d48700305471b9fab009b9c59c73..e09307b1e21959b4a7a2a823bc6fc21c39c686dc 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_edit.html +++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html @@ -7,7 +7,7 @@ {% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %} {% block proposals_body %} - + {% csrf_token %}
{% include "_form_snippet.html" with form=speaker_form %} diff --git a/pinaxcon/templates/symposion/teams/team_detail.html b/pinaxcon/templates/symposion/teams/team_detail.html index bbb933b34c9e7fc4a45b7975e35362af8b8648d1..9d2fcd6a3f41db3e5829fd72e99bab2252251937 100644 --- a/pinaxcon/templates/symposion/teams/team_detail.html +++ b/pinaxcon/templates/symposion/teams/team_detail.html @@ -7,21 +7,21 @@ {% block body_outer %}
{% if can_join %} - + {% csrf_token %} {% endif %} {% if can_leave %} -
+ {% csrf_token %}
{% endif %} {% if can_apply %} -
+ {% csrf_token %}
@@ -45,7 +45,7 @@
{{ membership.user.email }}{% if user == membership.user %} you{% endif %} -
{% csrf_token %}
+
{% csrf_token %}
{{ membership.user.email }}{% if user == membership.user %} you{% endif %} -
{% csrf_token %}
+
{% csrf_token %}
{{ membership.user.email }} -
{% csrf_token %}
-
{% csrf_token %}
+
{% csrf_token %}
+
{% csrf_token %}