Template cleanup of base dir templates

This commit is contained in:
Sachi King 2017-04-25 15:59:35 +10:00
parent 8e8f46276f
commit e562b61521
3 changed files with 256 additions and 266 deletions

View file

@ -2,9 +2,9 @@
{% load bootstrap %} {% load bootstrap %}
{% block extra_style %} {% block extra_style %}
<style type="text/css"> <style type="text/css">
.label-required:after { content: ' *'; } .label-required:after { content: ' *'; }
</style> </style>
{% endblock %} {% endblock %}
{% if form.non_field_errors %} {% if form.non_field_errors %}

View file

@ -14,319 +14,314 @@
{% block content %} {% block content %}
<div> <div>
{% available_categories as categories %} {% available_categories as categories %}
{% if categories %} {% if categories %}
{% if user.is_staff %}
<div class="container">
<div class="page-header">
<h1>Administration</h1>
</div>
<div class="page-row">
<div class="col-xs-12">
<a class="btn btn-lg btn-info" role="button" href="{% url "reports_list" %}">Reports</a>
</div>
</div>
</div>
{% endif %}
{% if user.is_staff %}
<div class="container"> <div class="container">
<div class="page-header"> <div class="page-header">
<h1>Administration</h1> <h1>{% trans "Attend" %} {% conference_name %}</h1>
</div> </div>
<div class="page-row"> <div class="page-row">
<div class="col-xs-12"> {% if not user.attendee.completed_registration %}
<a class="btn btn-lg btn-info" role="button" href="{% url "reports_list" %}">Reports</a>
</div>
</div>
</div>
{% endif %}
<div class="container">
<div class="page-header">
<h1>{% trans "Attend" %} {% conference_name %}</h1>
</div>
<div class="page-row">
{% if not user.attendee.completed_registration %}
<div class="panel panel-default">
<div class="panel-heading">
<h4>Register</h4>
</div>
<div class="panel-body">
<p>To attend the conference, you must register an attendee profile and purchase your ticket</p>
<a class="btn btn-lg btn-primary" role="button" href="{% url "guided_registration" %}">Get your ticket</a>
</div>
</div>
{% else %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4>Attendee Profile</h4> <h4>Register</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p>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</p> <p>To attend the conference, you must register an attendee profile and purchase your ticket</p>
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "attendee_edit" %}">Edit attendee profile</a> <a class="btn btn-lg btn-primary" role="button" href="{% url "guided_registration" %}">Get your ticket</a>
</div> </div>
</div> </div>
</div> {% else %}
{% items_pending as pending %} <div class="col-xs-12 col-sm-6 col-lg-6">
{% if pending %}
<div class="col-xs-12 col-sm-12 col-lg-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4>Account</h4> <h4>Attendee Profile</h4>
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% items_pending as pending %} <p>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</p>
{% if pending %} <a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "attendee_edit" %}">Edit attendee profile</a>
<div class="col-xs-12 col-sm-6 col-lg-6"> </div>
<div class="panel panel-warning"> </div>
<div class="panel-heading"> </div>
<h5>Items pending payment</h5> {% items_pending as pending %}
</div> {% if pending %}
<div class="panel-body"> <div class="col-xs-12 col-sm-12 col-lg-12">
{% include "registrasion/_items_list.html" with items=pending %} <div class="panel panel-default">
<div class="right"> <div class="panel-heading">
<a class="btn btn-lg btn-success pull-right" role="button" href="{% url "checkout" %}">Check out and pay</a> <h4>Account</h4>
</div>
<div class="panel-body">
{% items_pending as pending %}
{% if pending %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-warning">
<div class="panel-heading">
<h5>Items pending payment</h5>
</div>
<div class="panel-body">
{% include "registrasion/_items_list.html" with items=pending %}
<div class="right">
<a class="btn btn-lg btn-success pull-right" role="button" href="{% url "checkout" %}">Check out and pay</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endif %}
{% endif %}
{% items_purchased as purchased %} {% items_purchased as purchased %}
{% if purchased %} {% if purchased %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-success">
<div class="panel-heading">
<h5>Paid Items</h5>
</div>
<div class="panel-body">
{% include "registrasion/_items_list.html" with items=purchased %}
</div>
</div>
</div>
{% endif %}
<div class="col-xs-12 col-sm-6 col-lg-6"> <div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-success"> <div class="panel panel-success">
<div class="panel-heading"> <div class="panel-heading">
<h5>Paid Items</h5> <h5>Add/Update Items</h5>
</div> </div>
<div class="panel-body"> <div class="panel-body">
{% include "registrasion/_items_list.html" with items=purchased %} {% include "registrasion/_category_list.html" with categories=categories %}
</div> </div>
</div> </div>
</div> </div>
{% endif %}
<div class="col-xs-12 col-sm-6 col-lg-6"> {% invoices as invoices %}
<div class="panel panel-success"> {% if invoices %}
<div class="panel-heading"> <div class="col-xs-12 col-sm-12 col-lg-12">
<h5>Add/Update Items</h5> <div class="panel panel-info">
<div class="panel-heading">
<h5>Invoices</h5>
</div>
<div class="panel-body">
<ul>
{% for invoice in invoices %}
{% if invoice.is_void %}
<li class="void-invoice" style="display: none;">
{% else %}
<li>
{% endif %}
<a href="{% url "invoice" invoice.id %}" >Invoice {{ invoice.id }}</a>
- ${{ invoice.value }} ({{ invoice.get_status_display }})
<button class="btn btn-lg btn-default" type="button" id="toggle-void-invoices" href="" onclick="toggleVoidInvoices();">Show void invoices</button>
</li>
{% endfor %}
</ul>
</div>
</div>
</div> </div>
<div class="panel-body"> {% endif %}
{% include "registrasion/_category_list.html" with categories=categories %}
{% available_credit as credit %}
{% if credit %}
<div class="col-xs-12 col-sm-12 col-lg-12">
<div class="panel panel-danger">
<div class="panel-heading">
<h5>Credit</h5>
</div>
<div class="panel-body">
<p>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.</p>
</div>
</div>
</div> </div>
</div> {% endif %}
</div> </div>
{% invoices as invoices %}
{% if invoices %}
<div class="col-xs-12 col-sm-12 col-lg-12">
<div class="panel panel-info">
<div class="panel-heading">
<h5>Invoices</h5>
</div>
<div class="panel-body">
<ul>
{% for invoice in invoices %}
{% if invoice.is_void %}
<li class="void-invoice" style="display: none;">
{% else %}
<li>
{% endif %}
<a href="{% url "invoice" invoice.id %}" >Invoice {{ invoice.id }}</a>
- ${{ invoice.value }} ({{ invoice.get_status_display }})
<button class="btn btn-lg btn-default" type="button" id="toggle-void-invoices" href="" onclick="toggleVoidInvoices();">Show void invoices</button>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% endif %}
{% available_credit as credit %}
{% if credit %}
<div class="col-xs-12 col-sm-12 col-lg-12">
<div class="panel panel-danger">
<div class="panel-heading">
<h5>Credit</h5>
</div>
<div class="panel-body">
<p>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.</p>
</div>
</div>
</div>
{% endif %}
</div> </div>
</div> </div>
</div> {% endif %}
{% endif %} {% endif %}
{% endif %}
</div>
</div>
{% endif %}
<div class="container">
<div class="page-header">
<h1>{% trans "Speaking and Miniconfs" %}</h1>
</div>
<div class="page-row">
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>Speaker Profile</h5>
</div>
<div class="panel-body">
{% if not user.speaker_profile %}
<p>To create a speaking or miniconf proposal you must first create a speaker profile.</p>
{% endif %}
<p>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.</p>
{% if not user.speaker_profile %}
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "speaker_create" %}">Create Profile</a>
{% else %}
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "speaker_edit" %}">Edit Profile</a>
{% endif %}
</div>
</div> </div>
</div> </div>
{% endif %}
{% if user.speaker_profile %}
<div class="container">
<div class="page-header">
<h1>{% trans "Speaking and Miniconfs" %}</h1>
</div>
<div class="page-row">
<div class="col-xs-12 col-sm-6 col-lg-6"> <div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
<h5>New Proposal</h5> <h5>Speaker Profile</h5>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p>You may use the following form to create a speaking or miniconf proposal.</p> {% if not user.speaker_profile %}
<p>Once submitted you will be able to see the status of your proposals, as well manage the submission and co-speakers from this page</p> <p>To create a speaking or miniconf proposal you must first create a speaker profile.</p>
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "proposal_submit" %}">New Proposal</a> {% endif %}
<p>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.</p>
{% if not user.speaker_profile %}
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "speaker_create" %}">Create Profile</a>
{% else %}
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "speaker_edit" %}">Edit Profile</a>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
{% endif %}
{% if user.speaker_profile %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>New Proposal</h5>
</div>
<div class="panel-body">
<p>You may use the following form to create a speaking or miniconf proposal.</p>
<p>Once submitted you will be able to see the status of your proposals, as well manage the submission and co-speakers from this page</p>
<a class="btn btn-lg btn-primary pull-right" role="button" href="{% url "proposal_submit" %}">New Proposal</a>
</div>
</div>
</div>
{% endif %}
</div>
</div> </div>
</div>
{% if user.speaker_profile %} {% if user.speaker_profile %}
{% if user.speaker_profile.proposals.exists %} {% if user.speaker_profile.proposals.exists %}
<div class="container">
<div class="page-header">
<h2>Your Proposals</h2>
</div>
<div class="page-row">
{% if user.speaker_profile.proposals.exists %}
{% for proposal in user.speaker_profile.proposals.all %}
{% include "symposion/proposals/_proposal_row.html" %}
{% endfor %}
{% endif %}
</div>
</div>
{% endif %}
{% endif %}
{% if user.speaker_profile %}
{% associated_proposals as associated_proposals %}
{% pending_proposals as pending_proposals %}
{% if associated_proposals or pending_proposals %}
<div class="container">
<div class="page-header">
<h2>Copresenter Proposals</h2>
</div>
<div class="page-row">
{% 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 %}
</div>
</div>
{% endif %}
{% endif %}
{% if review_sections %}
<div class="container"> <div class="container">
<div class="page-header"> <div class="page-header">
<h2>Your Proposals</h2> <h2>{% trans "Reviews" %}</h2>
</div> </div>
<div class="page-row"> <div class="page-row">
{% if user.speaker_profile.proposals.exists %} {% for section in review_sections %}
{% for proposal in user.speaker_profile.proposals.all %} <div class="col-xs-12 col-sm-6 col-lg-6">
{% include "symposion/proposals/_proposal_row.html" %} <div class="panel panel-primary">
{% endfor %} <div class="panel-heading">
<h5>{{ section }}</h5>
</div>
<div class="panel-body">
<ul>
<li><a href="{% url "review_section" section.section.slug %}">All</a></li>
<li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
<li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
</ul>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
{% endif %}
{% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %}
<div class="container">
<div class="page-header">
<h2>{% trans "Teams" %}</h2>
</div>
</div>
<div class="container">
<div class="page-row">
{% if user.memberships.exists %}
<div class="page-header">
<h3>Your Teams</h3>
</div>
<div clas="page-row">
{% for membership in user.memberships.all %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>{{ membership.team.name }}</h5>
</div>
<div class="panel-body">
{% if membership.team.description %}<p>{{ membership.team.description }}</p>{% endif %}
<a class="btn btn-lg btn-primary" role="button" href="{% url "team_detail" membership.team.slug %}">Details</a>
<span class="{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
{% if membership.state == "manager" or user.is_staff %}
{% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
{% endif %}
</div>
</div>
</div>
{% endfor %}
</div>
{% endif %}
</div>
<div class="container">
{% if available_teams %}
<div class="page-header">
<h3>Available Teams</h3>
</div>
<div clas="page-row">
{% for team in available_teams %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>{{ team }}</h5>
</div>
<div class="panel-body">
{% if team.description %}<p>{{ team.description }}</p>{% endif %}
<span class="label label-default">{{ team.get_access_display }}</span>
<a class="btn btn-lg btn-primary" role="button" href="{% url "team_detail" team.slug %}">Details</a>
</div>
{% endfor %}
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endif %}
{% if user.speaker_profile %}
{% associated_proposals as associated_proposals %}
{% pending_proposals as pending_proposals %}
{% if associated_proposals or pending_proposals %}
<div class="container">
<div class="page-header">
<h2>Copresenter Proposals</h2>
</div>
<div class="page-row">
{% 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 %}
</div>
</div>
{% endif %}
{% endif %}
{# {% include 'registrasion/dashboard-widget.html' %} #}
{% if review_sections %}
<div class="container">
<div class="page-header">
<h2>{% trans "Reviews" %}</h2>
</div>
<div class="page-row">
{% for section in review_sections %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>{{ section }}</h5>
</div>
<div class="panel-body">
<ul>
<li><a href="{% url "review_section" section.section.slug %}">All</a></li>
<li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
<li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
</ul>
</div>
</div>
</div>
{% endfor %}
</div>
</div> </div>
{% endif %}
{% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %}
<div class="container">
<div class="page-header">
<h2>{% trans "Teams" %}</h2>
</div>
</div>
<div class="container">
<div class="page-row">
{% if user.memberships.exists %}
<div class="page-header">
<h3>Your Teams</h3>
</div>
<div clas="page-row">
{% for membership in user.memberships.all %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>{{ membership.team.name }}</h5>
</div>
<div class="panel-body">
{% if membership.team.description %}<p>{{ membership.team.description }}</p>{% endif %}
<a class="btn btn-lg btn-primary" role="button" href="{% url "team_detail" membership.team.slug %}">Details</a>
<span class="{% if membership.state == 'invited' %} label-info{% endif %}">{{ membership.get_state_display }}</span>
{% if membership.state == "manager" or user.is_staff %}
{% if membership.team.applicants %}{{ membership.team.applicants.count }} applicant{{ membership.team.applicants.count|pluralize }}{% endif %}
{% endif %}
</div>
</div>
</div>
{% endfor %}
</div>
{% endif %}
</div>
<div class="container">
{% if available_teams %}
<div class="page-header">
<h3>Available Teams</h3>
</div>
<div clas="page-row">
{% for team in available_teams %}
<div class="col-xs-12 col-sm-6 col-lg-6">
<div class="panel panel-primary">
<div class="panel-heading">
<h5>{{ team }}</h5>
</div>
<div class="panel-body">
{% if team.description %}<p>{{ team.description }}</p>{% endif %}
<span class="label label-default">{{ team.get_access_display }}</span>
<a class="btn btn-lg btn-primary" role="button" href="{% url "team_detail" team.slug %}">Details</a>
</div>
{% endfor %}
</div>
{% endif %}
</div>
</div>
{% endif %}
</div>
{% endblock %} <!-- block content --> {% endblock %} <!-- block content -->
@ -354,4 +349,4 @@
var toggleVoidInvoices = _toggleVoidInvoices(); var toggleVoidInvoices = _toggleVoidInvoices();
_toggleVoidInvoices() = undefined; _toggleVoidInvoices() = undefined;
</script> </script>
{% endblock %} <!-- scripts_extra --> {% endblock %}

View file

@ -1,12 +1,7 @@
{% extends "content_page.html" %} {% extends "content_page.html" %}
{% load staticfiles %} {% 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_title %}{% block page_title %}{% endblock %}{% endblock %}
{% block header_inset_image_base %}{% endblock %}
{% block content_base %} {% block content_base %}
{% block utility_body_outer %} {% block utility_body_outer %}
@ -14,8 +9,8 @@
<div class="l-content-page--richtext"> <div class="l-content-page--richtext">
{% block content %} {% block content %}
<div class="jumbotron"> <div class="jumbotron">
{% block utility_body %} {% block utility_body %}
{% endblock %} {% endblock %}
</div> </div>
{% endblock content %} {% endblock content %}
</div> </div>