Template cleanup of base dir templates
This commit is contained in:
parent
8e8f46276f
commit
e562b61521
3 changed files with 256 additions and 266 deletions
|
@ -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 %}
|
||||||
|
|
|
@ -14,11 +14,10 @@
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
{% available_categories as categories %}
|
{% available_categories as categories %}
|
||||||
{% if categories %}
|
{% if categories %}
|
||||||
|
|
||||||
|
|
||||||
{% if user.is_staff %}
|
{% if user.is_staff %}
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
|
@ -32,7 +31,6 @@
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1>{% trans "Attend" %} {% conference_name %}</h1>
|
<h1>{% trans "Attend" %} {% conference_name %}</h1>
|
||||||
|
@ -156,10 +154,10 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1>{% trans "Speaking and Miniconfs" %}</h1>
|
<h1>{% trans "Speaking and Miniconfs" %}</h1>
|
||||||
</div>
|
</div>
|
||||||
|
@ -199,10 +197,10 @@
|
||||||
{% endif %}
|
{% 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="container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
|
@ -217,10 +215,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
{% if user.speaker_profile %}
|
{% if user.speaker_profile %}
|
||||||
{% associated_proposals as associated_proposals %}
|
{% associated_proposals as associated_proposals %}
|
||||||
{% pending_proposals as pending_proposals %}
|
{% pending_proposals as pending_proposals %}
|
||||||
{% if associated_proposals or pending_proposals %}
|
{% if associated_proposals or pending_proposals %}
|
||||||
|
@ -238,11 +236,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{# {% include 'registrasion/dashboard-widget.html' %} #}
|
{% if review_sections %}
|
||||||
|
|
||||||
{% if review_sections %}
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h2>{% trans "Reviews" %}</h2>
|
<h2>{% trans "Reviews" %}</h2>
|
||||||
|
@ -266,11 +262,10 @@
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% available_teams as available_teams %}
|
||||||
{% available_teams as available_teams %}
|
{% if user.memberships.exists or available_teams %}
|
||||||
{% if user.memberships.exists or available_teams %}
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h2>{% trans "Teams" %}</h2>
|
<h2>{% trans "Teams" %}</h2>
|
||||||
|
@ -325,8 +320,8 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</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 %}
|
||||||
|
|
|
@ -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 %}
|
||||||
|
|
Loading…
Reference in a new issue