From 1c88ed807306c60f9090124efc964dbc7df222dd Mon Sep 17 00:00:00 2001 From: Thomas Flummer Date: Wed, 3 Jun 2020 21:30:10 +0200 Subject: [PATCH] Added title blocks to templates that did not have one (#511) In most cases this mirrors the primary header on the page, but in some cases the title is simplified and/or nested to reflect the depth of the current page Co-authored-by: Thomas Steen Rasmussen --- src/backoffice/templates/approve_feedback.html | 4 ++++ src/backoffice/templates/approve_public_credit_names.html | 5 +++++ src/backoffice/templates/badge_handout.html | 5 +++++ src/backoffice/templates/camp_select.html | 5 +++++ src/backoffice/templates/chain_detail_backoffice.html | 4 ++++ src/backoffice/templates/credebtor_detail_backoffice.html | 4 ++++ src/backoffice/templates/expense_detail_backoffice.html | 4 ++++ src/backoffice/templates/expense_list_backoffice.html | 4 ++++ src/backoffice/templates/index.html | 5 +++++ src/backoffice/templates/info_desk/scan.html | 4 ++++ src/backoffice/templates/merchandise_to_order.html | 5 +++++ src/backoffice/templates/orders_merchandise.html | 5 +++++ src/backoffice/templates/orders_village.html | 5 +++++ src/backoffice/templates/product_handout.html | 5 +++++ src/backoffice/templates/reimbursement_create.html | 4 ++++ .../templates/reimbursement_create_userselect.html | 5 +++++ src/backoffice/templates/reimbursement_delete.html | 4 ++++ .../templates/reimbursement_detail_backoffice.html | 4 ++++ src/backoffice/templates/reimbursement_form.html | 4 ++++ src/backoffice/templates/reimbursement_list_backoffice.html | 4 ++++ src/backoffice/templates/revenue_detail_backoffice.html | 4 ++++ src/backoffice/templates/revenue_list_backoffice.html | 4 ++++ src/backoffice/templates/shop_ticket_overview.html | 5 +++++ src/backoffice/templates/ticket_checkin.html | 5 +++++ src/backoffice/templates/village_to_order.html | 5 +++++ src/camps/templates/bornhack-2016_camp_detail.html | 5 +++++ src/camps/templates/bornhack-2017_camp_detail.html | 5 +++++ src/camps/templates/bornhack-2018_camp_detail.html | 5 +++++ src/camps/templates/bornhack-2019_camp_detail.html | 5 +++++ src/camps/templates/bornhack-2020_camp_detail.html | 5 +++++ src/camps/templates/bornhack-2021_camp_detail.html | 5 +++++ src/camps/templates/camp_list.html | 5 +++++ src/facilities/templates/facility_feedback.html | 4 ++++ src/feedback/templates/feedback/feedback_form.html | 4 ++++ src/profiles/templates/account/email.html | 4 ++++ src/profiles/templates/account/email_confirm.html | 4 ++++ src/profiles/templates/account/email_confirmed.html | 4 ++++ src/profiles/templates/account/login.html | 4 ++++ src/profiles/templates/account/logout.html | 4 ++++ src/profiles/templates/account/password_change.html | 4 ++++ src/profiles/templates/account/password_reset.html | 4 ++++ src/profiles/templates/account/password_reset_done.html | 4 ++++ src/profiles/templates/account/password_reset_from_key.html | 4 ++++ .../templates/account/password_reset_from_key_done.html | 4 ++++ src/profiles/templates/account/signup.html | 4 ++++ src/profiles/templates/account/verification_sent.html | 4 ++++ src/profiles/templates/allauth_2fa/authenticate.html | 4 ++++ src/profiles/templates/allauth_2fa/backup_tokens.html | 4 ++++ src/profiles/templates/allauth_2fa/remove.html | 4 ++++ src/profiles/templates/allauth_2fa/setup.html | 4 ++++ src/profiles/templates/profile_base.html | 4 ++++ src/profiles/templates/profile_detail.html | 4 ++++ src/profiles/templates/profile_form.html | 4 ++++ src/profiles/templates/tickets/ticket_detail.html | 4 ++++ src/profiles/templates/tickets/ticket_list.html | 4 ++++ src/program/templates/combined_proposal_submit.html | 4 ++++ src/program/templates/event_feedback_delete.html | 4 ++++ src/program/templates/event_feedback_detail.html | 4 ++++ src/program/templates/event_feedback_form.html | 4 ++++ src/program/templates/event_feedback_list.html | 4 ++++ src/program/templates/event_list.html | 4 ++++ src/program/templates/event_proposal_add_person.html | 4 ++++ src/program/templates/event_proposal_form.html | 4 ++++ src/program/templates/event_proposal_remove_person.html | 4 ++++ src/program/templates/noscript_schedule_view.html | 4 ++++ src/program/templates/program_base.html | 4 ++++ src/program/templates/proposal_delete.html | 4 ++++ src/program/templates/schedule_base.html | 4 ++++ src/program/templates/schedule_day.html | 4 ++++ src/program/templates/schedule_overview.html | 4 ++++ src/program/templates/speaker_detail.html | 4 ++++ src/program/templates/speaker_list.html | 4 ++++ src/program/templates/speaker_proposal_delete.html | 4 ++++ src/program/templates/speaker_proposal_submit.html | 4 ++++ src/program/templates/url_delete.html | 4 ++++ src/program/templates/url_form.html | 4 ++++ src/rideshare/templates/rideshare/ride_confirm_delete.html | 4 ++++ src/rideshare/templates/rideshare/ride_detail.html | 4 ++++ src/rideshare/templates/rideshare/ride_form.html | 4 ++++ src/rideshare/templates/rideshare/ride_list.html | 5 ++++- src/shop/templates/bank_transfer.html | 4 ++++ src/shop/templates/cash.html | 4 ++++ src/shop/templates/checkout.html | 4 ++++ src/shop/templates/coinify_thanks.html | 4 ++++ src/shop/templates/creditnote_list.html | 4 ++++ src/shop/templates/epay_form.html | 4 ++++ src/shop/templates/epay_thanks.html | 4 ++++ src/shop/templates/order_detail.html | 4 ++++ src/shop/templates/order_list.html | 4 ++++ src/shop/templates/order_review.html | 4 ++++ src/shop/templates/shop_base.html | 4 ++++ src/shop/templates/shop_index.html | 2 +- src/teams/templates/team_info_categories.html | 3 +++ src/teams/templates/team_members.html | 3 +++ src/teams/templates/team_shift_confirm_delete.html | 4 ++++ src/teams/templates/team_shift_form.html | 3 +++ src/teams/templates/team_shift_list.html | 3 +++ src/teams/templates/team_tasks.html | 4 ++++ src/teams/templates/team_user_shifts.html | 4 ++++ src/templates/403.html | 4 ++++ src/templates/404.html | 4 ++++ src/templates/500.html | 4 ++++ src/villages/templates/village_confirm_delete.html | 4 ++++ src/villages/templates/village_form.html | 4 ++++ 104 files changed, 428 insertions(+), 2 deletions(-) diff --git a/src/backoffice/templates/approve_feedback.html b/src/backoffice/templates/approve_feedback.html index dbabf133..dbdd64bf 100644 --- a/src/backoffice/templates/approve_feedback.html +++ b/src/backoffice/templates/approve_feedback.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bornhack %} +{% block title %} +Approve Event Feedback | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/backoffice/templates/approve_public_credit_names.html b/src/backoffice/templates/approve_public_credit_names.html index b712732c..22bb7fac 100644 --- a/src/backoffice/templates/approve_public_credit_names.html +++ b/src/backoffice/templates/approve_public_credit_names.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Approve Public Credit Names | {{ block.super }} +{% endblock %} + {% block content %}

Approve Public Credit Names

diff --git a/src/backoffice/templates/badge_handout.html b/src/backoffice/templates/badge_handout.html index aea8aedb..4623a939 100644 --- a/src/backoffice/templates/badge_handout.html +++ b/src/backoffice/templates/badge_handout.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Hand Out Badges | {{ block.super }} +{% endblock %} + {% block content %}

Hand Out Badges

diff --git a/src/backoffice/templates/camp_select.html b/src/backoffice/templates/camp_select.html index 68d89551..571411af 100644 --- a/src/backoffice/templates/camp_select.html +++ b/src/backoffice/templates/camp_select.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Camp Picker | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/backoffice/templates/chain_detail_backoffice.html b/src/backoffice/templates/chain_detail_backoffice.html index d4b5a831..547a3032 100644 --- a/src/backoffice/templates/chain_detail_backoffice.html +++ b/src/backoffice/templates/chain_detail_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Details for Chain {{ chain.name }} | {{ block.super }} +{% endblock %} + {% block content %}

Details for Chain {{ chain.name }}

Back to Chain list diff --git a/src/backoffice/templates/credebtor_detail_backoffice.html b/src/backoffice/templates/credebtor_detail_backoffice.html index bf4f7f16..8a0e7baa 100644 --- a/src/backoffice/templates/credebtor_detail_backoffice.html +++ b/src/backoffice/templates/credebtor_detail_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Details for Credebtor {{ credebtor.name }} (Chain {{ credebtor.chain.name }}) | {{ block.super }} +{% endblock %} + {% block content %}

Details for Credebtor {{ credebtor.name }} (Chain {{ credebtor.chain.name }})

Back to Credebtor list diff --git a/src/backoffice/templates/expense_detail_backoffice.html b/src/backoffice/templates/expense_detail_backoffice.html index 4b4a8165..17f7316a 100644 --- a/src/backoffice/templates/expense_detail_backoffice.html +++ b/src/backoffice/templates/expense_detail_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Manage Expense | {{ block.super }} +{% endblock %} + {% block content %}

Manage Expense

diff --git a/src/backoffice/templates/expense_list_backoffice.html b/src/backoffice/templates/expense_list_backoffice.html index adcaf923..6fd0f9fc 100644 --- a/src/backoffice/templates/expense_list_backoffice.html +++ b/src/backoffice/templates/expense_list_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load static %} +{% block title %} +Manage Expenses for {{ camp.title }} | {{ block.super }} +{% endblock %} + {% block content %}

Manage Expenses for {{ camp.title }}

diff --git a/src/backoffice/templates/index.html b/src/backoffice/templates/index.html index 64642e9c..06729643 100644 --- a/src/backoffice/templates/index.html +++ b/src/backoffice/templates/index.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} Backoffice | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/backoffice/templates/info_desk/scan.html b/src/backoffice/templates/info_desk/scan.html index 3f566c65..57a95da3 100644 --- a/src/backoffice/templates/info_desk/scan.html +++ b/src/backoffice/templates/info_desk/scan.html @@ -2,6 +2,10 @@ {% load static %} {% load qrcode %} +{% block title %} +Scan | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/backoffice/templates/merchandise_to_order.html b/src/backoffice/templates/merchandise_to_order.html index 1b631d46..9e6dda86 100644 --- a/src/backoffice/templates/merchandise_to_order.html +++ b/src/backoffice/templates/merchandise_to_order.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Merchandise To Order | {{ block.super }} +{% endblock %} + {% block content %}

Merchandise To Order

diff --git a/src/backoffice/templates/orders_merchandise.html b/src/backoffice/templates/orders_merchandise.html index 80aec9ac..d5a88ab0 100644 --- a/src/backoffice/templates/orders_merchandise.html +++ b/src/backoffice/templates/orders_merchandise.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Merchandise Orders | {{ block.super }} +{% endblock %} + {% block content %}

Merchandise Orders

diff --git a/src/backoffice/templates/orders_village.html b/src/backoffice/templates/orders_village.html index 22d9dabe..7e4e0eea 100644 --- a/src/backoffice/templates/orders_village.html +++ b/src/backoffice/templates/orders_village.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Village Orders | {{ block.super }} +{% endblock %} + {% block content %}

Village Orders

diff --git a/src/backoffice/templates/product_handout.html b/src/backoffice/templates/product_handout.html index bb7cfab4..cc94e416 100644 --- a/src/backoffice/templates/product_handout.html +++ b/src/backoffice/templates/product_handout.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Hand Out Products | {{ block.super }} +{% endblock %} + {% block content %}

Hand Out Products

diff --git a/src/backoffice/templates/reimbursement_create.html b/src/backoffice/templates/reimbursement_create.html index 056493f1..298a0a2c 100644 --- a/src/backoffice/templates/reimbursement_create.html +++ b/src/backoffice/templates/reimbursement_create.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Create Reimbursement for User {{ reimbursement_user }} | {{ block.super }} +{% endblock %} + {% block content %}

Create Reimbursement for User {{ reimbursement_user }}

diff --git a/src/backoffice/templates/reimbursement_create_userselect.html b/src/backoffice/templates/reimbursement_create_userselect.html index 12efaaa3..d0d9a8c7 100644 --- a/src/backoffice/templates/reimbursement_create_userselect.html +++ b/src/backoffice/templates/reimbursement_create_userselect.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Create Reimbursement - Select User | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/backoffice/templates/reimbursement_delete.html b/src/backoffice/templates/reimbursement_delete.html index 19dcbbcb..307e9a8a 100644 --- a/src/backoffice/templates/reimbursement_delete.html +++ b/src/backoffice/templates/reimbursement_delete.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Delete Reimbursement for User {{ reimbursement_user }} | {{ block.super }} +{% endblock %} + {% block content %}

Delete Reimbursement for User {{ reimbursement_user }}

diff --git a/src/backoffice/templates/reimbursement_detail_backoffice.html b/src/backoffice/templates/reimbursement_detail_backoffice.html index 6a649f6c..44e72dca 100644 --- a/src/backoffice/templates/reimbursement_detail_backoffice.html +++ b/src/backoffice/templates/reimbursement_detail_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Reimbursement Details | {{ block.super }} +{% endblock %} + {% block content %}

Reimbursement Details

diff --git a/src/backoffice/templates/reimbursement_form.html b/src/backoffice/templates/reimbursement_form.html index 43764be4..ab96e369 100644 --- a/src/backoffice/templates/reimbursement_form.html +++ b/src/backoffice/templates/reimbursement_form.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Update Reimbursement for User {{ reimbursement_user }} | {{ block.super }} +{% endblock %} + {% block content %}

Update Reimbursement for User {{ reimbursement_user }}

diff --git a/src/backoffice/templates/reimbursement_list_backoffice.html b/src/backoffice/templates/reimbursement_list_backoffice.html index 8ff9e0bc..64e33057 100644 --- a/src/backoffice/templates/reimbursement_list_backoffice.html +++ b/src/backoffice/templates/reimbursement_list_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load static %} +{% block title %} +Reimbursements for {{ camp.title }} | {{ block.super }} +{% endblock %} + {% block content %}

Reimbursements for {{ camp.title }}

diff --git a/src/backoffice/templates/revenue_detail_backoffice.html b/src/backoffice/templates/revenue_detail_backoffice.html index 95fd2048..38f7008f 100644 --- a/src/backoffice/templates/revenue_detail_backoffice.html +++ b/src/backoffice/templates/revenue_detail_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load bootstrap3 %} +{% block title %} +Manage Revenue | {{ block.super }} +{% endblock %} + {% block content %}

Manage Revenue

diff --git a/src/backoffice/templates/revenue_list_backoffice.html b/src/backoffice/templates/revenue_list_backoffice.html index 10ba28bf..93bb5705 100644 --- a/src/backoffice/templates/revenue_list_backoffice.html +++ b/src/backoffice/templates/revenue_list_backoffice.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} {% load static %} +{% block title %} +Manage Revenues for {{ camp.title }} | {{ block.super }} +{% endblock %} + {% block content %}

Manage Revenues for {{ camp.title }}

diff --git a/src/backoffice/templates/shop_ticket_overview.html b/src/backoffice/templates/shop_ticket_overview.html index 9876b04c..6c5cb7db 100644 --- a/src/backoffice/templates/shop_ticket_overview.html +++ b/src/backoffice/templates/shop_ticket_overview.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Shop Tickets | {{ block.super }} +{% endblock %} + {% block content %}

Shop Tickets

diff --git a/src/backoffice/templates/ticket_checkin.html b/src/backoffice/templates/ticket_checkin.html index 217a3c34..6d46cc42 100644 --- a/src/backoffice/templates/ticket_checkin.html +++ b/src/backoffice/templates/ticket_checkin.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Ticket Check-In | {{ block.super }} +{% endblock %} + {% block content %}

Ticket Check-In

diff --git a/src/backoffice/templates/village_to_order.html b/src/backoffice/templates/village_to_order.html index 94f0d9c3..d9000cd1 100644 --- a/src/backoffice/templates/village_to_order.html +++ b/src/backoffice/templates/village_to_order.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Village Gear To Order | {{ block.super }} +{% endblock %} + {% block content %}

Village Gear To Order

diff --git a/src/camps/templates/bornhack-2016_camp_detail.html b/src/camps/templates/bornhack-2016_camp_detail.html index aff703aa..209da220 100644 --- a/src/camps/templates/bornhack-2016_camp_detail.html +++ b/src/camps/templates/bornhack-2016_camp_detail.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} +{% endblock %} + {% block content %}
diff --git a/src/camps/templates/bornhack-2017_camp_detail.html b/src/camps/templates/bornhack-2017_camp_detail.html index 65731ec4..f1cccf1d 100644 --- a/src/camps/templates/bornhack-2017_camp_detail.html +++ b/src/camps/templates/bornhack-2017_camp_detail.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} +{% endblock %} + {% block content %}
diff --git a/src/camps/templates/bornhack-2018_camp_detail.html b/src/camps/templates/bornhack-2018_camp_detail.html index 15c0b862..1996acd0 100644 --- a/src/camps/templates/bornhack-2018_camp_detail.html +++ b/src/camps/templates/bornhack-2018_camp_detail.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} +{% endblock %} + {% block content %}
diff --git a/src/camps/templates/bornhack-2019_camp_detail.html b/src/camps/templates/bornhack-2019_camp_detail.html index 6b2c1881..5b61259c 100644 --- a/src/camps/templates/bornhack-2019_camp_detail.html +++ b/src/camps/templates/bornhack-2019_camp_detail.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} +{% endblock %} + {% block content %}
diff --git a/src/camps/templates/bornhack-2020_camp_detail.html b/src/camps/templates/bornhack-2020_camp_detail.html index 9e8545c3..fb1296ac 100644 --- a/src/camps/templates/bornhack-2020_camp_detail.html +++ b/src/camps/templates/bornhack-2020_camp_detail.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} +{% endblock %} + {% block content %}
diff --git a/src/camps/templates/bornhack-2021_camp_detail.html b/src/camps/templates/bornhack-2021_camp_detail.html index 2e0ea936..bd79f014 100644 --- a/src/camps/templates/bornhack-2021_camp_detail.html +++ b/src/camps/templates/bornhack-2021_camp_detail.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +{{ camp.title }} +{% endblock %} + {% block content %}
diff --git a/src/camps/templates/camp_list.html b/src/camps/templates/camp_list.html index 92638a07..d2b1801c 100644 --- a/src/camps/templates/camp_list.html +++ b/src/camps/templates/camp_list.html @@ -2,6 +2,11 @@ {% load commonmark %} {% load static %} {% load imageutils %} + +{% block title %} +Camp List | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/facilities/templates/facility_feedback.html b/src/facilities/templates/facility_feedback.html index 67fbef52..642d51f5 100644 --- a/src/facilities/templates/facility_feedback.html +++ b/src/facilities/templates/facility_feedback.html @@ -2,6 +2,10 @@ {% load bootstrap3 %} {% load bornhack %} +{% block title %} +{{ facility.name }} Feedback | {{ block.super }} +{% endblock %} + {% block content %}

{{ facility.name }} Feedback

{% if unhandled_feedbacks %} diff --git a/src/feedback/templates/feedback/feedback_form.html b/src/feedback/templates/feedback/feedback_form.html index 37b149ab..cf9701b7 100644 --- a/src/feedback/templates/feedback/feedback_form.html +++ b/src/feedback/templates/feedback/feedback_form.html @@ -2,6 +2,10 @@ {% load commonmark %} {% load bootstrap3 %} +{% block title %} +Feedback | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/email.html b/src/profiles/templates/account/email.html index 998d1b98..4457ba20 100644 --- a/src/profiles/templates/account/email.html +++ b/src/profiles/templates/account/email.html @@ -2,6 +2,10 @@ {% load bootstrap3 %} +{% block title %} +E-mail Addresses | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/account/email_confirm.html b/src/profiles/templates/account/email_confirm.html index e7950cd3..f146dfe0 100644 --- a/src/profiles/templates/account/email_confirm.html +++ b/src/profiles/templates/account/email_confirm.html @@ -2,6 +2,10 @@ {% load i18n %} {% load account %} +{% block title %} +Confirm E-mail Address | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/email_confirmed.html b/src/profiles/templates/account/email_confirmed.html index b88e157f..e0dbf5d9 100644 --- a/src/profiles/templates/account/email_confirmed.html +++ b/src/profiles/templates/account/email_confirmed.html @@ -2,6 +2,10 @@ {% load i18n %} {% load account %} +{% block title %} +E-mail Address Confirmed | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/login.html b/src/profiles/templates/account/login.html index c00da18e..93971f1d 100644 --- a/src/profiles/templates/account/login.html +++ b/src/profiles/templates/account/login.html @@ -4,6 +4,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Login | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/logout.html b/src/profiles/templates/account/logout.html index 8aa906ea..6d955bf6 100644 --- a/src/profiles/templates/account/logout.html +++ b/src/profiles/templates/account/logout.html @@ -1,5 +1,9 @@ {% extends 'base.html' %} +{% block title %} +Logout | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/password_change.html b/src/profiles/templates/account/password_change.html index 1e00a9d3..1176be4d 100644 --- a/src/profiles/templates/account/password_change.html +++ b/src/profiles/templates/account/password_change.html @@ -3,6 +3,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Change password | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/account/password_reset.html b/src/profiles/templates/account/password_reset.html index d87cfa86..bb7056ac 100644 --- a/src/profiles/templates/account/password_reset.html +++ b/src/profiles/templates/account/password_reset.html @@ -3,6 +3,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Lost your password? | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/password_reset_done.html b/src/profiles/templates/account/password_reset_done.html index 1acab9fa..3cb1c68f 100644 --- a/src/profiles/templates/account/password_reset_done.html +++ b/src/profiles/templates/account/password_reset_done.html @@ -2,6 +2,10 @@ {% load account %} +{% block title %} +Reset e-mail sent | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/password_reset_from_key.html b/src/profiles/templates/account/password_reset_from_key.html index 526761bc..d360f4f3 100644 --- a/src/profiles/templates/account/password_reset_from_key.html +++ b/src/profiles/templates/account/password_reset_from_key.html @@ -3,6 +3,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +{% if token_fail %}Invalid link{% else %}Reset password{% endif %} | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/password_reset_from_key_done.html b/src/profiles/templates/account/password_reset_from_key_done.html index 2dfda23a..ee491099 100644 --- a/src/profiles/templates/account/password_reset_from_key_done.html +++ b/src/profiles/templates/account/password_reset_from_key_done.html @@ -2,6 +2,10 @@ {% load account %} +{% block title %} +Password reset | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/signup.html b/src/profiles/templates/account/signup.html index 2e83b5c6..83460da3 100644 --- a/src/profiles/templates/account/signup.html +++ b/src/profiles/templates/account/signup.html @@ -4,6 +4,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Signup | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/account/verification_sent.html b/src/profiles/templates/account/verification_sent.html index 0c809ebf..6dc639dc 100644 --- a/src/profiles/templates/account/verification_sent.html +++ b/src/profiles/templates/account/verification_sent.html @@ -1,5 +1,9 @@ {% extends 'base.html' %} +{% block title %} +Verify Your E-mail Address | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/allauth_2fa/authenticate.html b/src/profiles/templates/allauth_2fa/authenticate.html index 4ed4008f..e23f3010 100644 --- a/src/profiles/templates/allauth_2fa/authenticate.html +++ b/src/profiles/templates/allauth_2fa/authenticate.html @@ -3,6 +3,10 @@ {% load bootstrap3 %} {% load i18n %} +{% block title %} +Two-Factor Authentication | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/allauth_2fa/backup_tokens.html b/src/profiles/templates/allauth_2fa/backup_tokens.html index 8b7dd4b6..503c886c 100644 --- a/src/profiles/templates/allauth_2fa/backup_tokens.html +++ b/src/profiles/templates/allauth_2fa/backup_tokens.html @@ -3,6 +3,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Two-Factor Authentication Backup Tokens | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/allauth_2fa/remove.html b/src/profiles/templates/allauth_2fa/remove.html index 0cb5e590..f2848a1a 100644 --- a/src/profiles/templates/allauth_2fa/remove.html +++ b/src/profiles/templates/allauth_2fa/remove.html @@ -3,6 +3,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Disable Two-Factor Authentication | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/allauth_2fa/setup.html b/src/profiles/templates/allauth_2fa/setup.html index b0673953..ea5f1630 100644 --- a/src/profiles/templates/allauth_2fa/setup.html +++ b/src/profiles/templates/allauth_2fa/setup.html @@ -4,6 +4,10 @@ {% load bootstrap3 %} {% load i18n %} +{% block title %} +Setup Two-Factor Authentication | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/profile_base.html b/src/profiles/templates/profile_base.html index b529cb43..b1a9f0be 100644 --- a/src/profiles/templates/profile_base.html +++ b/src/profiles/templates/profile_base.html @@ -3,6 +3,10 @@ {% load account %} {% load bootstrap3 %} +{% block title %} +Profile | {{ block.super }} +{% endblock %} + {% block content %}
diff --git a/src/profiles/templates/profile_detail.html b/src/profiles/templates/profile_detail.html index b69514ee..3beb84a3 100644 --- a/src/profiles/templates/profile_detail.html +++ b/src/profiles/templates/profile_detail.html @@ -1,5 +1,9 @@ {% extends 'profile_base.html' %} +{% block title %} +Your information | {{ block.super }} +{% endblock %} + {% block profile_content %} {% if not profile.description %}
diff --git a/src/profiles/templates/profile_form.html b/src/profiles/templates/profile_form.html index eed90371..c73c43db 100644 --- a/src/profiles/templates/profile_form.html +++ b/src/profiles/templates/profile_form.html @@ -1,6 +1,10 @@ {% extends 'profile_base.html' %} {% load bootstrap3 %} +{% block title %} +Update profile | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/tickets/ticket_detail.html b/src/profiles/templates/tickets/ticket_detail.html index a234a668..33ae7c0e 100644 --- a/src/profiles/templates/tickets/ticket_detail.html +++ b/src/profiles/templates/tickets/ticket_detail.html @@ -2,6 +2,10 @@ {% load bootstrap3 %} {% load tickets_tags %} +{% block title %} +Your Tickets | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/profiles/templates/tickets/ticket_list.html b/src/profiles/templates/tickets/ticket_list.html index 807be910..a32b1d31 100644 --- a/src/profiles/templates/tickets/ticket_list.html +++ b/src/profiles/templates/tickets/ticket_list.html @@ -2,6 +2,10 @@ {% load bootstrap3 %} {% load tickets_tags %} +{% block title %} +Your Tickets | {{ block.super }} +{% endblock %} + {% block profile_content %}
diff --git a/src/program/templates/combined_proposal_submit.html b/src/program/templates/combined_proposal_submit.html index 9749ad33..3956917f 100644 --- a/src/program/templates/combined_proposal_submit.html +++ b/src/program/templates/combined_proposal_submit.html @@ -2,6 +2,10 @@ {% load bootstrap3 %} {% load program %} +{% block title %} +Submit {{ camp.title }} {{ eventtype.name }} | {{ block.super }} +{% endblock %} + {% block program_content %}

Submit {{ camp.title }} {{ event_type.name }}

diff --git a/src/program/templates/event_feedback_delete.html b/src/program/templates/event_feedback_delete.html index 4f9f8499..14e46acd 100644 --- a/src/program/templates/event_feedback_delete.html +++ b/src/program/templates/event_feedback_delete.html @@ -2,6 +2,10 @@ {% load commonmark %} {% load bootstrap3 %} +{% block title %} +Delete Your Feedback? | {{ block.super }} +{% endblock %} + {% block program_content %}

Delete Your Feedback?

diff --git a/src/program/templates/event_feedback_detail.html b/src/program/templates/event_feedback_detail.html index 8590eb5a..62b4b080 100644 --- a/src/program/templates/event_feedback_detail.html +++ b/src/program/templates/event_feedback_detail.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load commonmark %} +{% block title %} +Event Feedback | {{ block.super }} +{% endblock %} + {% block program_content %} {% include 'includes/event_feedback_detail_panel.html' with buttoninclude="includes/event_feedback_buttons.html"%} {% endblock program_content %} diff --git a/src/program/templates/event_feedback_form.html b/src/program/templates/event_feedback_form.html index cae1c950..069d79d3 100644 --- a/src/program/templates/event_feedback_form.html +++ b/src/program/templates/event_feedback_form.html @@ -2,6 +2,10 @@ {% load commonmark %} {% load bootstrap3 %} +{% block title %} +{% if request.resolver_match.url_name == "eventfeedback_update" %}Update{% else %}Submit{% endif %} Feedback for {{ camp.title }} event: {{ event.title }} | {{ block.super }} +{% endblock %} + {% block program_content %}

{% if request.resolver_match.url_name == "event_feedback_update" %}Update{% else %}Submit{% endif %} Feedback for {{ camp.title }} event: {{ event.title }}

diff --git a/src/program/templates/event_feedback_list.html b/src/program/templates/event_feedback_list.html index 12098b36..cb1550aa 100644 --- a/src/program/templates/event_feedback_list.html +++ b/src/program/templates/event_feedback_list.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load program %} +{% block title %} +Feedback List | {{ block.super }} +{% endblock %} + {% block program_content %}

Feedback List

This is a list of all the approved feedback for your {{ camp.title }} event {{ event.title }}. We currently have feedback from {{ event_feedback_list|length }} users.

diff --git a/src/program/templates/event_list.html b/src/program/templates/event_list.html index 0d946ef0..8acd480f 100644 --- a/src/program/templates/event_list.html +++ b/src/program/templates/event_list.html @@ -1,5 +1,9 @@ {% extends 'program_base.html' %} +{% block title %} +Event List | {{ block.super }} +{% endblock %} + {% block program_content %} {% if event_list %}

A list of all talks, workshops, keynotes and other events at {{ camp.title }}.

diff --git a/src/program/templates/event_proposal_add_person.html b/src/program/templates/event_proposal_add_person.html index 187fe958..a367b619 100644 --- a/src/program/templates/event_proposal_add_person.html +++ b/src/program/templates/event_proposal_add_person.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load bootstrap3 %} +{% block title %} +Add {{ eventproposal.event_type.host_title }} {{ speakerproposal.name }} to {{ eventproposal.title }} | {{ block.super }} +{% endblock %} + {% block program_content %}
Add {{ event_proposal.event_type.host_title }} {{ speaker_proposal.name }} to {{ event_proposal.title }}?
diff --git a/src/program/templates/event_proposal_form.html b/src/program/templates/event_proposal_form.html index 64be9fb6..b42aa2fe 100644 --- a/src/program/templates/event_proposal_form.html +++ b/src/program/templates/event_proposal_form.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load bootstrap3 %} +{% block title %} +{% if speaker %}Submit new {{ event_type.name }} by {{ speaker.name }}{% else %}{% if object %}Update{% else %}Create{% endif %} {{ camp.title }} {{ event_type.name }}{% endif %} | {{ block.super }} +{% endblock %} + {% block program_content %} {% if speaker %}

Submit new {{ event_type.name }} by {{ speaker.name }}

diff --git a/src/program/templates/event_proposal_remove_person.html b/src/program/templates/event_proposal_remove_person.html index d78ff4e1..3e185fcb 100644 --- a/src/program/templates/event_proposal_remove_person.html +++ b/src/program/templates/event_proposal_remove_person.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load bootstrap3 %} +{% block title %} +Remove "{{ speakerproposal.name }}" from "{{ eventproposal.title }}"? | {{ block.super }} +{% endblock %} + {% block program_content %}

Remove "{{ speaker_proposal.name }}" from "{{ event_proposal.title }}"?

Really remove this {{ event_proposal.event_type.host_title }} from this event?

diff --git a/src/program/templates/noscript_schedule_view.html b/src/program/templates/noscript_schedule_view.html index 827f13f3..96e0d5a2 100644 --- a/src/program/templates/noscript_schedule_view.html +++ b/src/program/templates/noscript_schedule_view.html @@ -3,6 +3,10 @@ {% load commonmark %} {% load static %} +{% block title %} +Schedule | {{ block.super }} +{% endblock %} + {% block program_content %}
diff --git a/src/program/templates/program_base.html b/src/program/templates/program_base.html index 28afdb44..88974015 100644 --- a/src/program/templates/program_base.html +++ b/src/program/templates/program_base.html @@ -1,5 +1,9 @@ {% extends 'base.html' %} +{% block title %} +Program | {{ block.super }} +{% endblock %} + {% block content %} {% with url_name=request.resolver_match.url_name proposal_urls="proposal_list,speaker_proposal_create,speaker_proposal_detail,speaker_proposal_update,speaker_proposal_submit,speaker_proposal_picture,event_proposal_create,event_proposal_detail,event_proposal_update,event_proposal_submit" %} diff --git a/src/program/templates/proposal_delete.html b/src/program/templates/proposal_delete.html index 89842635..89fb064d 100644 --- a/src/program/templates/proposal_delete.html +++ b/src/program/templates/proposal_delete.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load bootstrap3 %} +{% block title %} +{% if object.name %}Delete "{{ object.name }}"{% else %}Delete "{{ object.title }}"{% endif %} | {{ block.super }} +{% endblock %} + {% block program_content %} {% if object.name %}

Delete "{{ object.name }}"

diff --git a/src/program/templates/schedule_base.html b/src/program/templates/schedule_base.html index 063af2ce..918e92af 100644 --- a/src/program/templates/schedule_base.html +++ b/src/program/templates/schedule_base.html @@ -1,6 +1,10 @@ {% extends 'program_base.html' %} {% load dateutils %} +{% block title %} +Schedule | {{ block.super }} +{% endblock %} + {% block program_content %}
diff --git a/src/program/templates/schedule_day.html b/src/program/templates/schedule_day.html index 692edca2..b0bee60f 100644 --- a/src/program/templates/schedule_day.html +++ b/src/program/templates/schedule_day.html @@ -1,6 +1,10 @@ {% extends 'schedule_base.html' %} {% load static %} +{% block title %} +Schedule | {{ block.super }} +{% endblock %} + {% block schedule_content %} {% for timeslot in timeslots %} diff --git a/src/program/templates/schedule_overview.html b/src/program/templates/schedule_overview.html index 53772ec6..fef5dfdd 100644 --- a/src/program/templates/schedule_overview.html +++ b/src/program/templates/schedule_overview.html @@ -9,6 +9,10 @@ {% endblock %} +{% block title %} +Schedule | {{ block.super }} +{% endblock %} + {% block program_content %}