Starting to get Teams and Proposals (and Sponsors -- more ) working.

This commit is contained in:
Nick Seidenman (N6) 2017-02-22 20:17:24 +11:00 committed by Sachi King
parent 5347a7efae
commit bc07865ac0
9 changed files with 179 additions and 10 deletions

View file

@ -0,0 +1,145 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2017-02-22 09:14
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('proposals', '0008_openhardwareproposal'),
]
operations = [
migrations.AlterField(
model_name='gamesproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='gamesproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='kernelproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='kernelproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='knowledgeproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='knowledgeproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='lawproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='lawproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='openhardwareproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='openhardwareproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='openradioproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='openradioproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='securityproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='securityproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='sysadminproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='sysadminproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='talkproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='talkproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='testingproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='testingproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='tutorialproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='tutorialproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='wootconfproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='wootconfproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='writethedocsproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='writethedocsproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text=b"I allow PyCon Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
]

View file

@ -21,7 +21,7 @@ class Proposal(ProposalBase):
recording_release = models.BooleanField(
default=True,
help_text="I allow Linux Australia to release any recordings of "
help_text="I allow PyCon Australia to release any recordings of "
"presentations covered by this proposal, under the <a "
"href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "
"Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"
@ -29,7 +29,7 @@ class Proposal(ProposalBase):
materials_release = models.BooleanField(
default=True,
help_text="I allow Linux Australia to release any other material "
help_text="I allow PyCon Australia to release any other material "
"(such as slides) from presentations covered by this proposal, under "
"the <a "
"href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "

View file

@ -68,7 +68,10 @@
{% block body %}
<div class="container">
<div class="row">
<div class="col-md-1"></div>
<div class="col-md-1">
{% block body_outer %}
{% endblock %}
</div>
<div class="col-md-10" >
{% block content %}
{% endblock %}

View file

@ -3,7 +3,6 @@
{% load pinax_boxes_tags %}
{% load i18n %}
{% block page_title %}{% trans "Submit A Proposal" %}{% endblock %}
{% block head_title %}{% trans "Submit A Proposal" %}{% endblock %}
{% block proposals_body %}

View file

@ -14,6 +14,7 @@
{% block breadcrumbs %}{% sitetree_breadcrumbs from "main" %}{% endblock %}
{% block content %}
<div class="jumbotron">
{% cache 600 "schedule-list" schedule.section.name %}
<ul>
{% for presentation in presentations %}
@ -30,4 +31,5 @@
{% endfor %}
</ul>
{% endcache %}
</div>
{% endblock %}

View file

@ -4,19 +4,23 @@
{% load i18n %}
{% load pinax_boxes_tags %}
{% block head_title %}{% trans "Add a Sponsor" %}{% endblock %}
{% block head_title %}<div style="color: white;">{% trans "Add a Sponsor" %}</div>{% endblock %}
{% block body_class %}sponsorships{% endblock %}
{% block body %}
{% block content %}
<div class="jumbotron"
<form method="POST" action="{% url "sponsor_add" %}" class="form-horizontal">
{% csrf_token %}
<legend>{% trans "Add a Sponsor" %}</legend>
{{ form|bootstrap_horizontal }}
<div class="form-actions">
<div class="form-actions pad-buttons">
<br/>
<input class="btn btn-primary" type="submit" value="Add" />
<a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
</div>
</form>
</div>
{% endblock %}

View file

@ -27,7 +27,10 @@
</form>
{% endif %}
</div>
{% endblock %}
{% block content %}
<div class="jumbotron">
<h1>{{ team.name }}{% if state %} <span class="label">{{ state }}</span>{% endif %}</h1>
{% if team.description %}<p>{{ team.description }}</p>{% endif %}
@ -96,4 +99,5 @@
</form>
{% endif %}
{% endif %}
</div>
{% endblock %}

View file

@ -1,7 +1,10 @@
{% extends "lca2017/content_page.html" %}
{% extends "pyconau2017/content_page.html" %}
{% load staticfiles %}
{% block header_background_image %}{% static 'lca2017/images/wineglass_bg_optimised.jpg' %}{% endblock %}
{% 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 %}
@ -10,8 +13,10 @@
<div class="l-content-page">
<div class="l-content-page--richtext">
{% block content %}
<div class="jumbotron">
{% block utility_body %}
{% endblock %}
</div>
{% endblock content %}
</div>
</div>

View file

@ -105,3 +105,10 @@ div.sponsor-list {
margin: 0 auto;
}
legend {
color: #a6e9f5;
}
.pad-buttons {
padding: 200px 0 20px 0;
}