diff --git a/pinaxcon/templates/_form_btns.html b/pinaxcon/templates/_form_btns.html new file mode 100644 index 00000000..a38a9ce7 --- /dev/null +++ b/pinaxcon/templates/_form_btns.html @@ -0,0 +1,2 @@ + + Cancel \ No newline at end of file diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html index 1e5193a3..09f49b88 100644 --- a/pinaxcon/templates/_form_snippet.html +++ b/pinaxcon/templates/_form_snippet.html @@ -1,5 +1,6 @@ {% load lca2018_tags %} {% load bootstrap %} +{% load crispy_forms_tags %} {% if form.non_field_errors %}
@@ -9,7 +10,7 @@ {% endif %}
- Fields marked with * are required. + Fields marked with a
* are required
-{{ form|bootstrap_horizontal }} +{% crispy form %} diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 94366cf5..d041014f 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -11,363 +11,362 @@ {% block header_title %}linux.conf.au 2019{% endblock %} {% block header_lead %}User Dashboard{% endblock %} - +{% block main_class %}{% endblock %} {% block content %} - {% available_categories as categories %} - {% if categories %} +{% available_categories as categories %} +
+

Dashboard

+
+{% if categories %} - {% if user.is_staff %} -
-
-

Administration

+{% if user.is_staff %} +
+

Administration

+
+
+ Reports +
+
+
+{% endif %} + +
+
+

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

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

Register

+
+
+

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

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

Attendee Profile

-
-
- Reports -
+
+

If you would like to change the details on your badge or your attendee statistics, you may edit your attendee profile up until the 15th January 2018

+ Preview my badge + Edit attendee profile
- {% endif %} - -
-
-

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

+
+
+
+
+

Account Management

+
+
+

If you would like to change your registered email address or password, you can use our self-service account management portal

+ Account Management +
-
- {% if not user.attendee.completed_registration %} -
-
-

Register

-
-
-

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

- Get your ticket -
-
- {% else %} +
+ + {% items_pending as pending %} + +
+
+
+

Account

+
+
+ + {% if pending %}
-
+
-

Attendee Profile

+
Items pending payment
-

If you would like to change the details on your badge or your attendee statistics, you may edit your attendee profile up until the 15th January 2018

- Preview my badge - Edit attendee profile + {% include "registrasion/_items_list.html" with items=pending %} +
+ Check out and pay +
+ {% endif %} + + {% items_purchased as purchased %} + {% if purchased %}
-
+
-

Account Management

+
Paid Items
-

If you would like to change your registered email address or password, you can use our self-service account management portal

- Account Management + {% include "registrasion/_items_list.html" with items=purchased %}
- - {% items_pending as pending %} - + {% 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 %}
-
+
-

Account

+
Credit
- - {% 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 %} - +

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 %} - - -
-
-

{% trans "Speaking and Miniconfs" %}

-
-
- Speaker Profile -
-
-

- 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 %} -

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

- Create Profile - {% else %} - Edit Profile - {% endif %} -
+ {% endif %} +
+
+
- - {% 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 %} -
-
+
+ {% endif %} + + +
+
+
+

{% 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 + {% else %} + Edit Profile + {% endif %} +
+
+ + {% 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 user.speaker_profile %} +{% if user.speaker_profile %} +{% if user.speaker_profile.proposals.exists %} +
+
+

Your Proposals

+
+
{% 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 %} + {% for proposal in user.speaker_profile.proposals.all %} + {% include "symposion/proposals/_proposal_row.html" %} + {% endfor %} + {% endif %} +
+
+{% 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 %} + +
+
+ +{% if review_sections %} +
+

{% trans "Reviews" %}

+ {% for section in review_sections %} +
+

{{ section }}

+ + {% if section in manage_sections %} + {% endif %} -
-
- {% 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 %} - - {% if review_sections %} -
-
-

{% trans "Reviews" %}

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

{% trans "Teams" %}

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

Your Teams

- {% 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 %} +
+
+
+
{{ membership.team.name }}
-
- {% 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 %} -
-
-
- {% endfor %} +
+ {% 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 %} -
-
-
-
{{ team }}
-
-
- {% if team.description %}

{{ team.description }}

{% endif %} - {{ team.get_access_display }} - Details -
-
-
- {% endfor %} -
- {% 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 %} {% endblock %} {% block scripts_extra %} - + return toggleVoidInvoices; + } + var toggleVoidInvoices = _toggleVoidInvoices(); + _toggleVoidInvoices = undefined; + {% endblock %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index 5d695d1d..b23e56ed 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -52,7 +52,7 @@ {% endif %} - +

{% block page_title %}{% endblock %}

{% block body_base %} {% block body %} diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html index 5086dfe6..e6eb79b7 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_create.html +++ b/pinaxcon/templates/symposion/speakers/speaker_create.html @@ -10,10 +10,7 @@ {% csrf_token %}
{% include "_form_snippet.html" with form=speaker_form %} -
- - Cancel -
+ {% include "_form_btns.html" %}
{% endblock %} diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html index a43ef42e..c52c598f 100644 --- a/pinaxcon/templates/symposion/speakers/speaker_edit.html +++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html @@ -10,10 +10,7 @@ {% csrf_token %}
{% include "_form_snippet.html" with form=speaker_form %} -
- - Cancel -
+ {% include "_form_btns.html" %}
{% endblock %} diff --git a/static/src/scss/app.scss b/static/src/scss/app.scss index 012e76dc..ba91d57e 100644 --- a/static/src/scss/app.scss +++ b/static/src/scss/app.scss @@ -41,6 +41,10 @@ body { } } +.text-upper { + text-transform: uppercase; +} + .navbar-collapse { margin-left: $padding-left-default; } @@ -183,4 +187,66 @@ main.container-fluid { width: 100%; height: 480px; filter: grayscale(100%); -} \ No newline at end of file +} + +.btn-lg { + padding: 0.8rem 4.5rem; + font-size: 1rem; + line-height: 1.5; +} + +.btn { + padding: 0.4rem 2.25rem; + font-size: 1rem; + border-radius: 0; + text-transform: uppercase; +} + +.jumbotron { + border-radius: 0; + background-color: rgba(204, 213, 197, 0.1); + border: 1px $primary solid; + color: $primary; + padding: 5rem 6rem ; +} + +.col-form-label, .form-check-label { + font-weight: bold; +} + +.form-text.text-muted { + color: $primary !important; + margin-bottom: 1rem; +} + +fieldset { + blockquote { + font-size: 80%; + } +} + +.form-control { + border-radius: 0; + border: 2px $primary solid; + + &:focus { + border: 2px $primary solid; + } +} + +label.form-check-label { + display: flex; + align-items: center +} + +h3 { + text-transform: uppercase; +} + + +main { + a { + color: #f5843e; + font-weight: 600; + } +}