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 %}
{% block extra_style %}
<style type="text/css">
<style type="text/css">
.label-required:after { content: ' *'; }
</style>
</style>
{% endblock %}
{% if form.non_field_errors %}

View file

@ -14,11 +14,10 @@
{% block content %}
<div>
<div>
{% available_categories as categories %}
{% if categories %}
{% if user.is_staff %}
<div class="container">
<div class="page-header">
@ -32,7 +31,6 @@
</div>
{% endif %}
<div class="container">
<div class="page-header">
<h1>{% trans "Attend" %} {% conference_name %}</h1>
@ -156,10 +154,10 @@
{% endif %}
</div>
</div>
{% endif %}
{% endif %}
<div class="container">
<div class="container">
<div class="page-header">
<h1>{% trans "Speaking and Miniconfs" %}</h1>
</div>
@ -199,10 +197,10 @@
{% endif %}
</div>
</div>
</div>
{% if user.speaker_profile %}
{% if user.speaker_profile %}
{% if user.speaker_profile.proposals.exists %}
<div class="container">
<div class="page-header">
@ -217,10 +215,10 @@
</div>
</div>
{% endif %}
{% endif %}
{% endif %}
{% if user.speaker_profile %}
{% if user.speaker_profile %}
{% associated_proposals as associated_proposals %}
{% pending_proposals as pending_proposals %}
{% if associated_proposals or pending_proposals %}
@ -238,11 +236,9 @@
</div>
</div>
{% endif %}
{% endif %}
{% endif %}
{# {% include 'registrasion/dashboard-widget.html' %} #}
{% if review_sections %}
{% if review_sections %}
<div class="container">
<div class="page-header">
<h2>{% trans "Reviews" %}</h2>
@ -266,11 +262,10 @@
{% endfor %}
</div>
</div>
{% endif %}
{% endif %}
{% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %}
{% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %}
<div class="container">
<div class="page-header">
<h2>{% trans "Teams" %}</h2>
@ -325,8 +320,8 @@
{% endif %}
</div>
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endblock %} <!-- block content -->
@ -354,4 +349,4 @@
var toggleVoidInvoices = _toggleVoidInvoices();
_toggleVoidInvoices() = undefined;
</script>
{% endblock %} <!-- scripts_extra -->
{% endblock %}

View file

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