From e562b61521c00f29dfeeada049894bbb8fa8a4d6 2017-04-25 05:59:35 From: Sachi King Date: 2017-04-25 05:59:35 Subject: [PATCH] Template cleanup of base dir templates --- diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html index d39c2b19923def9a47df4f64aa3a73d735b8a038..9f547b20444fb9bc0262c3f20db8f60a9c62032b 100644 --- a/pinaxcon/templates/_form_snippet.html +++ b/pinaxcon/templates/_form_snippet.html @@ -2,9 +2,9 @@ {% load bootstrap %} {% block extra_style %} - + {% endblock %} {% if form.non_field_errors %} diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html index 3a22c5bee68ebff796c8f6d9588b0ef6fccd8809..11dc0e14e4b1be4bef731b35f74f8b7b4d9abb60 100644 --- a/pinaxcon/templates/dashboard.html +++ b/pinaxcon/templates/dashboard.html @@ -14,319 +14,314 @@ {% block content %} -
- {% available_categories as categories %} - {% if categories %} +
+ {% available_categories as categories %} + {% if categories %} + {% if user.is_staff %} +
+
+

Administration

+
+
+
+ Reports +
+
+
+ {% endif %} - {% if user.is_staff %}
-

Administration

+

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

-
- Reports -
-
-
- {% endif %} - - -
-
-

{% 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 %} -
+ {% if not user.attendee.completed_registration %}
-

Attendee Profile

+

Register

-

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 +

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

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

Account

+

Attendee Profile

- {% items_pending as pending %} - {% if pending %} -
-
-
-
Items pending payment
-
-
- {% include "registrasion/_items_list.html" with items=pending %} -
- Check out and pay +

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 %} + {% endif %} - {% items_purchased as purchased %} - {% if purchased %} + {% items_purchased as purchased %} + {% if purchased %} +
+
+
+
Paid Items
+
+
+ {% include "registrasion/_items_list.html" with items=purchased %} +
+
+
+ {% endif %}
-
Paid Items
+
Add/Update Items
- {% include "registrasion/_items_list.html" with items=purchased %} + {% include "registrasion/_category_list.html" with categories=categories %}
- {% 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 %} -
+ {% 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 %} + {% 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.

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

{% trans "Speaking and Miniconfs" %}

- - {% if user.speaker_profile %} +
-
New Proposal
+
Speaker Profile
-

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 + {% 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 %}
- {% endif %} - -
-
- -{% 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 %} -
-
- {% 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 %} + {% if user.speaker_profile %}
-
{{ section }}
+
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
- {% endfor %} + {% endif %} +
-{% endif %} -{% available_teams as available_teams %} -{% if user.memberships.exists or available_teams %} -
-
-

{% trans "Teams" %}

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

Your Teams

+

Your Proposals

-
- {% 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 %} -
+
+ {% if user.speaker_profile.proposals.exists %} + {% 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 }}
+
+
+
- {% endfor %} -
- {% endif %} +
+ {% endfor %} +
+ {% endif %} + + {% available_teams as available_teams %} + {% if user.memberships.exists or available_teams %}
- {% if available_teams %} -
-

Available Teams

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

{{ team.description }}

{% endif %} - {{ team.get_access_display }} - Details +
+

{% 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 %} +
- {% 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 %}
-{% endif %} -
{% endblock %} @@ -354,4 +349,4 @@ var toggleVoidInvoices = _toggleVoidInvoices(); _toggleVoidInvoices() = undefined; -{% endblock %} +{% endblock %} diff --git a/pinaxcon/templates/utility_page.html b/pinaxcon/templates/utility_page.html index 38964b8f8fa235c47503388bf20005203dbe63f1..43903bef04ba289bc726260f371a9cf56c3b377c 100644 --- a/pinaxcon/templates/utility_page.html +++ b/pinaxcon/templates/utility_page.html @@ -1,12 +1,7 @@ {% extends "content_page.html" %} {% load staticfiles %} -{% comment %} -{% block header_background_image %}{% static 'pyconau2017/images/wineglass_bg_optimised.jpg' %}{% endblock %} -{% endcomment %} - {% block header_title %}{% block page_title %}{% endblock %}{% endblock %} -{% block header_inset_image_base %}{% endblock %} {% block content_base %} {% block utility_body_outer %} @@ -14,8 +9,8 @@
{% block content %}
- {% block utility_body %} - {% endblock %} + {% block utility_body %} + {% endblock %}
{% endblock content %}