From 5a8b7ecc30f48cba1f66f2ac99ecfe0a66f3f66d Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 2 Aug 2016 10:51:43 +1000
Subject: [PATCH 1/2] Fixes markdown cheat sheet links in speaker and proposals
forms.
Fixes #33.
---
symposion/proposals/models.py | 12 +++++++-----
symposion/speakers/models.py | 6 +++---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py
index 0a45b9d8..4fe07c2d 100644
--- a/symposion/proposals/models.py
+++ b/symposion/proposals/models.py
@@ -90,7 +90,8 @@ class ProposalBase(models.Model):
_("Abstract"),
help_text=_("This will appear in the conference programme. Up to about "
"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)
@@ -98,8 +99,9 @@ class ProposalBase(models.Model):
_("Private Abstract"),
help_text=_("This will only be shown to organisers and reviewers. 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' "
- "target='_blank'>Markdown</a>.")
+ "don't want to be public here. Edit using <a "
+ "href='http://warpedvisions.org/projects/"
+ "markdown-cheat-sheet/' target='_blank'>Markdown</a>.")
)
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 "
"security-related techniques on the conference network. "
"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>.")
)
technical_requirements_html = models.TextField(blank=True)
diff --git a/symposion/speakers/models.py b/symposion/speakers/models.py
index 8e832901..d1ba409e 100644
--- a/symposion/speakers/models.py
+++ b/symposion/speakers/models.py
@@ -30,7 +30,7 @@ class Speaker(models.Model):
"programme. Please write in the third person, eg 'Alice "
"is a Moblin hacker...', 150-200 words. Edit using "
"<a href='http://warpedvisions.org/projects/"
- "markdown-cheat-sheet/target='_blank'>"
+ "markdown-cheat-sheet/' target='_blank'>"
"Markdown</a>."),
verbose_name=_("Biography"),
)
@@ -42,7 +42,7 @@ class Speaker(models.Model):
"seen by the organisers and reviewers; use it to convince "
"them why they should accept your proposal. Edit using "
"<a href='http://warpedvisions.org/projects/"
- "markdown-cheat-sheet/target='_blank'>"
+ "markdown-cheat-sheet/' target='_blank'>"
"Markdown</a>."),
verbose_name=_("Speaking experience"),
)
@@ -68,7 +68,7 @@ class Speaker(models.Model):
help_text=_("Please describe any special accessibility requirements "
"that you may have. Edit using "
"<a href='http://warpedvisions.org/projects/"
- "markdown-cheat-sheet/target='_blank'>Markdown</a>."),
+ "markdown-cheat-sheet/' target='_blank'>Markdown</a>."),
verbose_name=_("Accessibility requirements"))
accessibility_html = models.TextField(blank=True)
travel_assistance = models.BooleanField(
From 03a231093fde33cc1e100ecff05421f65f864d72 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 2 Aug 2016 10:53:53 +1000
Subject: [PATCH 2/2] For some reason, our vote label in reviews.py used a
unicode en dash. Oops.
Fixes #34.
---
symposion/reviews/models.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/symposion/reviews/models.py b/symposion/reviews/models.py
index 6727f6a9..3baa4a6d 100644
--- a/symposion/reviews/models.py
+++ b/symposion/reviews/models.py
@@ -37,8 +37,8 @@ class Votes(object):
ABSTAIN = "0"
PLUS_TWO = "+2"
PLUS_ONE = "+1"
- MINUS_ONE = "−1"
- MINUS_TWO = "−2"
+ MINUS_ONE = "-1"
+ MINUS_TWO = "-2"
CHOICES = [
(PLUS_TWO, _("+2 — Good proposal and I will argue for it to be accepted.")),