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

Merge pull request #35 from lca2017/chrisjrn/20160802

Browse source 
Bugfixes
This commit is contained in:
Scott Bragg 2016-08-02 11:23:56 +10:00 committed by GitHub
commit cc93f124e9
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
symposion/proposals/models.py
View file

@ -90,7 +90,8 @@ class ProposalBase(models.Model):
_("Abstract"), _("Abstract"),
help_text=_("This will appear in the conference programme. Up to about " help_text=_("This will appear in the conference programme. Up to about "
"500 words. Edit using <a " "500 words. Edit using <a "
"href='http://daringfireball.net/projects/markdown/basics' " "target='_blank'>Markdown</a>.") "href='http://warpedvisions.org/projects/"
"markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
) )
abstract_html = models.TextField(blank=True) abstract_html = models.TextField(blank=True)
@ -98,8 +99,9 @@ class ProposalBase(models.Model):
_("Private Abstract"), _("Private Abstract"),
help_text=_("This will only be shown to organisers and reviewers. You " help_text=_("This will only be shown to organisers and reviewers. You "
"should provide any details about your proposal that you " "should provide any details about your proposal that you "
"don't want to be public here. Edit using <a " "href='http://daringfireball.net/projects/markdown/basics' " "don't want to be public here. Edit using <a "
"target='_blank'>Markdown</a>.") "href='http://warpedvisions.org/projects/"
"markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
) )
private_abstract_html = models.TextField(blank=True) private_abstract_html = models.TextField(blank=True)
@ -112,8 +114,8 @@ class ProposalBase(models.Model):
"static IP address, A/V equipment or will be demonstrating " "static IP address, A/V equipment or will be demonstrating "
"security-related techniques on the conference network. " "security-related techniques on the conference network. "
"Edit using <a " "Edit using <a "
"href='http://daringfireball.net/projects/markdown/basics' " "href='http://warpedvisions.org/projects/"
"target='_blank'>Markdown</a>.") "markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
) )
technical_requirements_html = models.TextField(blank=True) technical_requirements_html = models.TextField(blank=True)

4
symposion/reviews/models.py
View file

@ -37,8 +37,8 @@ class Votes(object):
ABSTAIN = "0" ABSTAIN = "0"
PLUS_TWO = "+2" PLUS_TWO = "+2"
PLUS_ONE = "+1" PLUS_ONE = "+1"
MINUS_ONE = "−1" MINUS_ONE = "-1"
MINUS_TWO = "−2" MINUS_TWO = "-2"
CHOICES = [ CHOICES = [
(PLUS_TWO, _("+2 — Good proposal and I will argue for it to be accepted.")), (PLUS_TWO, _("+2 — Good proposal and I will argue for it to be accepted.")),

6
symposion/speakers/models.py
View file

@ -30,7 +30,7 @@ class Speaker(models.Model):
"programme. Please write in the third person, eg 'Alice " "programme. Please write in the third person, eg 'Alice "
"is a Moblin hacker...', 150-200 words. Edit using " "is a Moblin hacker...', 150-200 words. Edit using "
"<a href='http://warpedvisions.org/projects/" "<a href='http://warpedvisions.org/projects/"
"markdown-cheat-sheet/target='_blank'>" "markdown-cheat-sheet/' target='_blank'>"
"Markdown</a>."), "Markdown</a>."),
verbose_name=_("Biography"), verbose_name=_("Biography"),
) )
@ -42,7 +42,7 @@ class Speaker(models.Model):
"seen by the organisers and reviewers; use it to convince " "seen by the organisers and reviewers; use it to convince "
"them why they should accept your proposal. Edit using " "them why they should accept your proposal. Edit using "
"<a href='http://warpedvisions.org/projects/" "<a href='http://warpedvisions.org/projects/"
"markdown-cheat-sheet/target='_blank'>" "markdown-cheat-sheet/' target='_blank'>"
"Markdown</a>."), "Markdown</a>."),
verbose_name=_("Speaking experience"), verbose_name=_("Speaking experience"),
) )
@ -68,7 +68,7 @@ class Speaker(models.Model):
help_text=_("Please describe any special accessibility requirements " help_text=_("Please describe any special accessibility requirements "
"that you may have. Edit using " "that you may have. Edit using "
"<a href='http://warpedvisions.org/projects/" "<a href='http://warpedvisions.org/projects/"
"markdown-cheat-sheet/target='_blank'>Markdown</a>."), "markdown-cheat-sheet/' target='_blank'>Markdown</a>."),
verbose_name=_("Accessibility requirements")) verbose_name=_("Accessibility requirements"))
accessibility_html = models.TextField(blank=True) accessibility_html = models.TextField(blank=True)
travel_assistance = models.BooleanField( travel_assistance = models.BooleanField(