Changeset - 5a8b7ecc30f4
[Not reviewed]
0 2 0
Christopher Neugebauer - 8 years ago 2016-08-02 00:51:43
chrisjrn@gmail.com
Fixes markdown cheat sheet links in speaker and proposals forms.

Fixes #33.
2 files changed with 10 insertions and 8 deletions:
0 comments (0 inline, 0 general)
symposion/proposals/models.py
Show inline comments
...
 
@@ -61,88 +61,90 @@ class ProposalSection(models.Model):
 

	
 

	
 
@python_2_unicode_compatible
 
class ProposalKind(models.Model):
 
    """
 
    e.g. talk vs panel vs tutorial vs poster
 

	
 
    Note that if you have different deadlines, reviewers, etc. you'll want
 
    to distinguish the section as well as the kind.
 
    """
 

	
 
    section = models.ForeignKey(Section, related_name="proposal_kinds", verbose_name=_("Section"))
 

	
 
    name = models.CharField(_("Name"), max_length=100)
 
    slug = models.SlugField(verbose_name=_("Slug"))
 

	
 
    def __str__(self):
 
        return self.name
 

	
 

	
 
@python_2_unicode_compatible
 
class ProposalBase(models.Model):
 

	
 
    objects = InheritanceManager()
 

	
 
    kind = models.ForeignKey(ProposalKind, verbose_name=_("Kind"))
 

	
 
    title = models.CharField(max_length=100, verbose_name=_("Title"))
 
    abstract = models.TextField(
 
        _("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)
 

	
 
    private_abstract = models.TextField(
 
        _("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)
 

	
 
    technical_requirements = models.TextField(
 
        _("Special Requirements"),
 
        blank=True,
 
        help_text=_("Speakers will be provided with: Internet access, power, "
 
                    "projector, audio.  If you require anything in addition, "
 
                    "please list your technical requirements here.  Such as: a "
 
                    "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)
 

	
 
    project = models.CharField(
 
        max_length=100,
 
        blank=True,
 
        help_text=_("The name of the project you will be talking about."),
 
    )
 
    project_url = models.URLField(
 
        _("Project URL"),
 
        blank=True,
 
        help_text=_("If your project has a webpage, specify the URL here so "
 
                    "the committee can find out more about your proposal.")
 
    )
 
    video_url = models.URLField(
 
        _("Video"),
 
        blank=True,
 
        help_text=_("You may optionally provide us with a link to a video of "
 
                    "you speaking at another event, or of a short 'elevator "
 
                    "pitch' of your proposed talk.")
 
    )
 

	
 
    submitted = models.DateTimeField(
 
        default=now,
 
        editable=False,
 
        verbose_name=_("Submitted")
 
    )
 
    speaker = models.ForeignKey(Speaker, related_name="proposals", verbose_name=_("Speaker"))
 

	
 
    # @@@ this validation used to exist as a validators keyword on additional_speakers
 
    #     M2M field but that is no longer supported by Django. Should be moved to
 
    #     the form level
symposion/speakers/models.py
Show inline comments
 
from __future__ import unicode_literals
 

	
 
import datetime
 

	
 
from django.core.urlresolvers import reverse
 
from django.db import models
 
from django.utils.encoding import python_2_unicode_compatible
 
from django.utils.translation import ugettext_lazy as _
 

	
 
from django.contrib.auth.models import User
 

	
 
from symposion.markdown_parser import parse
 

	
 

	
 
@python_2_unicode_compatible
 
class Speaker(models.Model):
 

	
 
    SESSION_COUNT_CHOICES = [
 
        (1, "One"),
 
        (2, "Two")
 
    ]
 

	
 
    user = models.OneToOneField(User, null=True, related_name="speaker_profile", verbose_name=_("User"))
 
    name = models.CharField(verbose_name=_("Name"), max_length=100,
 
                            help_text=_("As you would like it to appear in the"
 
                                        " conference programme."))
 
    biography = 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. Edit using "
 
                    "<a href='http://warpedvisions.org/projects/"
 
                    "markdown-cheat-sheet/target='_blank'>"
 
                    "markdown-cheat-sheet/' target='_blank'>"
 
                    "Markdown</a>."),
 
        verbose_name=_("Biography"),
 
    )
 
    biography_html = models.TextField(blank=True)
 
    experience = 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. Edit using "
 
                    "<a href='http://warpedvisions.org/projects/"
 
                    "markdown-cheat-sheet/target='_blank'>"
 
                    "markdown-cheat-sheet/' target='_blank'>"
 
                    "Markdown</a>."),
 
        verbose_name=_("Speaking experience"),
 
    )
 
    experience_html = models.TextField(blank=True)
 
    photo = models.ImageField(upload_to="speaker_photos", blank=True, verbose_name=_("Photo"))
 
    telephone = models.CharField(
 
        max_length=15,
 
        help_text=_(u"The conference team will need this to contact you "
 
                    "during the conference week. If you don't have one, or do "
 
                    "not wish to provide it, then enter NONE in this field.")
 
    )
 
    homepage = models.URLField(
 
        blank=True,
 
        help_text=_(u"Your home page, if you have one")
 
    )
 
    twitter_username = models.CharField(
 
        max_length=15,
 
        blank=True,
 
        help_text=_(u"Your Twitter account")
 
    )
 
    accessibility = models.TextField(
 
        blank=True,
 
        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(
 
        blank=True,
 
        default=False,
 
        help_text=_("Check this box if you require assistance to travel to Hobart to "
 
                    "present your proposed sessions."),
 
        verbose_name=_("Travel assistance required"),
 
    )
 
    accommodation_assistance = models.BooleanField(
 
        blank=True,
 
        default=False,
 
        help_text=_("Check this box if you require us to provide you with student-style "
 
                    "accommodation in order to present your proposed sessions."),
 
        verbose_name=_("Accommodation assistance required"),
 
    )
 
    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 ")
 
    )
 

	
 
    annotation = models.TextField(verbose_name=_("Annotation"))  # staff only
 
    invite_email = models.CharField(max_length=200, unique=True, null=True, db_index=True, verbose_name=_("Invite_email"))
 
    invite_token = models.CharField(max_length=40, db_index=True, verbose_name=_("Invite token"))
 
    created = models.DateTimeField(
 
        default=datetime.datetime.now,
 
        editable=False,
 
        verbose_name=_("Created")
 
    )
 

	
0 comments (0 inline, 0 general)