Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'toc' into 'master'

Browse source 
Add the T&C and COC to the accept box

See merge request !9
This commit is contained in:
James Polley 2017-07-02 11:40:33 +00:00
commit 52737d4c05
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
vendor/symposion/speakers/migrations/0003_auto_20170702_1606.py vendored Normal file
View file

@ -0,0 +1,35 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-07-02 06:06
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('symposion_speakers', '0002_auto_20161230_1900'),
]
operations = [
migrations.AlterField(
model_name='speaker',
name='accessibility',
field=models.TextField(blank=True, help_text='Please describe any special accessibility requirements that you may have. This field is rendered with the monospace font <a href="https://sourcefoundry.org/hack/">Hack</a> with whitespace preserved', verbose_name='Accessibility requirements'),
),
migrations.AlterField(
model_name='speaker',
name='agreement',
field=models.BooleanField(default=False, help_text='I agree to the <a href="https://linux.conf.au/attend/terms-and-conditions"> terms and conditions of attendance</a>, and I have read, understood, and agree to act according to the standards set forth in our <a href="https://linux.conf.au/attend/code-of-conduct">Code of Conduct</a>.'),
),
migrations.AlterField(
model_name='speaker',
name='biography',
field=models.TextField(blank=True, help_text='This will appear on the conference website and in the programme. Please write in the third person, eg \'Alice is a Moblin hacker...\', 150-200 words. This field is rendered with the monospace font <a href="https://sourcefoundry.org/hack/">Hack</a> with whitespace preserved', verbose_name='Biography'),
),
migrations.AlterField(
model_name='speaker',
name='experience',
field=models.TextField(blank=True, help_text='Have you had any experience presenting elsewhere? If so, we\'d like to know. Anything you put here will only be seen by the organisers and reviewers; use it to convince them why they should accept your proposal. This field is rendered with the monospace font <a href="https://sourcefoundry.org/hack/">Hack</a> with whitespace preserved', verbose_name='Speaking experience'),
),
]

10
vendor/symposion/speakers/models.py vendored
View file

@ -79,9 +79,13 @@ class Speaker(models.Model):
)
agreement = models.BooleanField(
default=False,
help_text=_("I agree to the terms and conditions of attendance, and "
"I have read, understood, and agree to act according to "
"the standards set forth in our Code of Conduct ")
help_text=_("I agree to the "
"<a href=\"https://linux.conf.au/attend/terms-and-conditions\"> "
"terms and conditions of attendance</a>, and I have read, "
"understood, and agree to act according to the standards set "
"forth in our "
"<a href=\"https://linux.conf.au/attend/code-of-conduct\">"
"Code of Conduct</a>.")
)
annotation = models.TextField(verbose_name=_("Annotation")) # staff only