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

Merge branch 'KyivPy-master'

Browse source
This commit is contained in:
Patrick Altman 2014-12-15 15:29:43 -06:00
commit 5c57512b04
49 changed files with 273 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
symposion/boxes/urls.py
View file

@ -1,6 +1,7 @@
from django.conf.urls import url, patterns from django.conf.urls import url, patterns
urlpatterns = patterns("symposion.boxes.views", urlpatterns = patterns(
"symposion.boxes.views",
url(r"^([-\w]+)/edit/$", "box_edit", name="box_edit"), url(r"^([-\w]+)/edit/$", "box_edit", name="box_edit"),
) )

3
symposion/cms/urls.py
View file

@ -3,7 +3,8 @@ from django.conf.urls import url, patterns
PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/" PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/"
urlpatterns = patterns("symposion.cms.views", urlpatterns = patterns(
"symposion.cms.views",
url(r"^files/$", "file_index", name="file_index"), url(r"^files/$", "file_index", name="file_index"),
url(r"^files/create/$", "file_create", name="file_create"), url(r"^files/create/$", "file_create", name="file_create"),
url(r"^files/(\d+)/([^/]+)$", "file_download", name="file_download"), url(r"^files/(\d+)/([^/]+)$", "file_download", name="file_download"),

3
symposion/conference/urls.py
View file

@ -1,6 +1,7 @@
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
urlpatterns = patterns("symposion.conference.views", urlpatterns = patterns(
"symposion.conference.views",
url(r"^users/$", "user_list", name="user_list"), url(r"^users/$", "user_list", name="user_list"),
) )

24
symposion/proposals/urls.py
View file

@ -1,18 +1,26 @@
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
urlpatterns = patterns("symposion.proposals.views", urlpatterns = patterns(
"symposion.proposals.views",
url(r"^submit/$", "proposal_submit", name="proposal_submit"), url(r"^submit/$", "proposal_submit", name="proposal_submit"),
url(r"^submit/([\w\-]+)/$", "proposal_submit_kind", name="proposal_submit_kind"), url(r"^submit/([\w\-]+)/$", "proposal_submit_kind",
name="proposal_submit_kind"),
url(r"^(\d+)/$", "proposal_detail", name="proposal_detail"), url(r"^(\d+)/$", "proposal_detail", name="proposal_detail"),
url(r"^(\d+)/edit/$", "proposal_edit", name="proposal_edit"), url(r"^(\d+)/edit/$", "proposal_edit", name="proposal_edit"),
url(r"^(\d+)/speakers/$", "proposal_speaker_manage", name="proposal_speaker_manage"), url(r"^(\d+)/speakers/$", "proposal_speaker_manage",
name="proposal_speaker_manage"),
url(r"^(\d+)/cancel/$", "proposal_cancel", name="proposal_cancel"), url(r"^(\d+)/cancel/$", "proposal_cancel", name="proposal_cancel"),
url(r"^(\d+)/leave/$", "proposal_leave", name="proposal_leave"), url(r"^(\d+)/leave/$", "proposal_leave", name="proposal_leave"),
url(r"^(\d+)/join/$", "proposal_pending_join", name="proposal_pending_join"), url(r"^(\d+)/join/$", "proposal_pending_join",
url(r"^(\d+)/decline/$", "proposal_pending_decline", name="proposal_pending_decline"), name="proposal_pending_join"),
url(r"^(\d+)/decline/$", "proposal_pending_decline",
name="proposal_pending_decline"),
url(r"^(\d+)/document/create/$", "document_create", name="proposal_document_create"), url(r"^(\d+)/document/create/$", "document_create",
url(r"^document/(\d+)/delete/$", "document_delete", name="proposal_document_delete"), name="proposal_document_create"),
url(r"^document/(\d+)/([^/]+)$", "document_download", name="proposal_document_download"), url(r"^document/(\d+)/delete/$", "document_delete",
name="proposal_document_delete"),
url(r"^document/(\d+)/([^/]+)$", "document_download",
name="proposal_document_download"),
) )

20
symposion/proposals/views.py
View file

@ -7,25 +7,25 @@ from django.core.urlresolvers import reverse
from django.db.models import Q from django.db.models import Q
from django.http import Http404, HttpResponse, HttpResponseForbidden from django.http import Http404, HttpResponse, HttpResponseForbidden
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import render, redirect, get_object_or_404
try:
from hashlib import sha1 as sha_constructor
except ImportError:
from django.utils.hashcompat import sha_constructor
from django.views import static from django.views import static
from hashlib import sha1
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from account.models import EmailAddress from account.models import EmailAddress
from symposion.proposals.models import ProposalBase, ProposalSection, ProposalKind from symposion.proposals.models import (
ProposalBase, ProposalSection, ProposalKind
)
from symposion.proposals.models import SupportingDocument, AdditionalSpeaker from symposion.proposals.models import SupportingDocument, AdditionalSpeaker
from symposion.speakers.models import Speaker from symposion.speakers.models import Speaker
from symposion.utils.mail import send_email from symposion.utils.mail import send_email
from symposion.proposals.forms import AddSpeakerForm, SupportingDocumentCreateForm from symposion.proposals.forms import (
AddSpeakerForm, SupportingDocumentCreateForm
)
def get_form(name): def get_form(name):
@ -123,8 +123,8 @@ def proposal_speaker_manage(request, pk):
Q(user=None, invite_email=email_address) Q(user=None, invite_email=email_address)
) )
except Speaker.DoesNotExist: except Speaker.DoesNotExist:
salt = sha_constructor(str(random.random())).hexdigest()[:5] salt = sha1(str(random.random())).hexdigest()[:5]
token = sha_constructor(salt + email_address).hexdigest() token = sha1(salt + email_address).hexdigest()
pending = Speaker.objects.create( pending = Speaker.objects.create(
invite_email=email_address, invite_email=email_address,
invite_token=token, invite_token=token,

42
symposion/reviews/urls.py
View file

@ -1,23 +1,37 @@
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
urlpatterns = patterns("symposion.reviews.views", urlpatterns = patterns(
url(r"^section/(?P<section_slug>[\w\-]+)/all/$", "review_section", {"reviewed": "all"}, name="review_section"), "symposion.reviews.views",
url(r"^section/(?P<section_slug>[\w\-]+)/reviewed/$", "review_section", {"reviewed": "reviewed"}, name="user_reviewed"), url(r"^section/(?P<section_slug>[\w\-]+)/all/$", "review_section",
url(r"^section/(?P<section_slug>[\w\-]+)/not_reviewed/$", "review_section", {"reviewed": "not_reviewed"}, name="user_not_reviewed"), {"reviewed": "all"}, name="review_section"),
url(r"^section/(?P<section_slug>[\w\-]+)/assignments/$", "review_section", {"assigned": True}, name="review_section_assignments"), url(r"^section/(?P<section_slug>[\w\-]+)/reviewed/$", "review_section",
url(r"^section/(?P<section_slug>[\w\-]+)/status/$", "review_status", name="review_status"), {"reviewed": "reviewed"}, name="user_reviewed"),
url(r"^section/(?P<section_slug>[\w\-]+)/status/(?P<key>\w+)/$", "review_status", name="review_status"), url(r"^section/(?P<section_slug>[\w\-]+)/not_reviewed/$", "review_section",
url(r"^section/(?P<section_slug>[\w\-]+)/list/(?P<user_pk>\d+)/$", "review_list", name="review_list_user"), {"reviewed": "not_reviewed"}, name="user_not_reviewed"),
url(r"^section/(?P<section_slug>[\w\-]+)/admin/$", "review_admin", name="review_admin"), url(r"^section/(?P<section_slug>[\w\-]+)/assignments/$", "review_section",
url(r"^section/(?P<section_slug>[\w\-]+)/admin/accept/$", "review_bulk_accept", name="review_bulk_accept"), {"assigned": True}, name="review_section_assignments"),
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/$", "result_notification", name="result_notification"), url(r"^section/(?P<section_slug>[\w\-]+)/status/$", "review_status",
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/prepare/$", "result_notification_prepare", name="result_notification_prepare"), name="review_status"),
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/send/$", "result_notification_send", name="result_notification_send"), url(r"^section/(?P<section_slug>[\w\-]+)/status/(?P<key>\w+)/$",
"review_status", name="review_status"),
url(r"^section/(?P<section_slug>[\w\-]+)/list/(?P<user_pk>\d+)/$",
"review_list", name="review_list_user"),
url(r"^section/(?P<section_slug>[\w\-]+)/admin/$", "review_admin",
name="review_admin"),
url(r"^section/(?P<section_slug>[\w\-]+)/admin/accept/$",
"review_bulk_accept", name="review_bulk_accept"),
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/$",
"result_notification", name="result_notification"),
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/prepare/$",
"result_notification_prepare", name="result_notification_prepare"),
url(r"^section/(?P<section_slug>[\w\-]+)/notification/(?P<status>\w+)/send/$",
"result_notification_send", name="result_notification_send"),
url(r"^review/(?P<pk>\d+)/$", "review_detail", name="review_detail"), url(r"^review/(?P<pk>\d+)/$", "review_detail", name="review_detail"),
url(r"^(?P<pk>\d+)/delete/$", "review_delete", name="review_delete"), url(r"^(?P<pk>\d+)/delete/$", "review_delete", name="review_delete"),
url(r"^assignments/$", "review_assignments", name="review_assignments"), url(r"^assignments/$", "review_assignments", name="review_assignments"),
url(r"^assignment/(?P<pk>\d+)/opt-out/$", "review_assignment_opt_out", name="review_assignment_opt_out"), url(r"^assignment/(?P<pk>\d+)/opt-out/$", "review_assignment_opt_out",
name="review_assignment_opt_out"),
) )

12
symposion/schedule/urls.py
View file

@ -1,16 +1,20 @@
from django.conf.urls import url, patterns from django.conf.urls import url, patterns
urlpatterns = patterns("symposion.schedule.views", urlpatterns = patterns(
"symposion.schedule.views",
url(r"^$", "schedule_conference", name="schedule_conference"), url(r"^$", "schedule_conference", name="schedule_conference"),
url(r"^edit/$", "schedule_edit", name="schedule_edit"), url(r"^edit/$", "schedule_edit", name="schedule_edit"),
url(r"^list/$", "schedule_list", name="schedule_list"), url(r"^list/$", "schedule_list", name="schedule_list"),
url(r"^presentations.csv$", "schedule_list_csv", name="schedule_list_csv"), url(r"^presentations.csv$", "schedule_list_csv", name="schedule_list_csv"),
url(r"^presentation/(\d+)/$", "schedule_presentation_detail", name="schedule_presentation_detail"), url(r"^presentation/(\d+)/$", "schedule_presentation_detail",
name="schedule_presentation_detail"),
url(r"^([\w\-]+)/$", "schedule_detail", name="schedule_detail"), url(r"^([\w\-]+)/$", "schedule_detail", name="schedule_detail"),
url(r"^([\w\-]+)/edit/$", "schedule_edit", name="schedule_edit"), url(r"^([\w\-]+)/edit/$", "schedule_edit", name="schedule_edit"),
url(r"^([\w\-]+)/list/$", "schedule_list", name="schedule_list"), url(r"^([\w\-]+)/list/$", "schedule_list", name="schedule_list"),
url(r"^([\w\-]+)/presentations.csv$", "schedule_list_csv", name="schedule_list_csv"), url(r"^([\w\-]+)/presentations.csv$", "schedule_list_csv",
url(r"^([\w\-]+)/edit/slot/(\d+)/", "schedule_slot_edit", name="schedule_slot_edit"), name="schedule_list_csv"),
url(r"^([\w\-]+)/edit/slot/(\d+)/", "schedule_slot_edit",
name="schedule_slot_edit"),
url(r"^conference.json", "schedule_json", name="schedule_json"), url(r"^conference.json", "schedule_json", name="schedule_json"),
) )

9
symposion/speakers/urls.py
View file

@ -1,10 +1,13 @@
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
urlpatterns = patterns("symposion.speakers.views", urlpatterns = patterns(
"symposion.speakers.views",
url(r"^create/$", "speaker_create", name="speaker_create"), url(r"^create/$", "speaker_create", name="speaker_create"),
url(r"^create/(\w+)/$", "speaker_create_token", name="speaker_create_token"), url(r"^create/(\w+)/$", "speaker_create_token",
name="speaker_create_token"),
url(r"^edit/(?:(?P<pk>\d+)/)?$", "speaker_edit", name="speaker_edit"), url(r"^edit/(?:(?P<pk>\d+)/)?$", "speaker_edit", name="speaker_edit"),
url(r"^profile/(?P<pk>\d+)/$", "speaker_profile", name="speaker_profile"), url(r"^profile/(?P<pk>\d+)/$", "speaker_profile", name="speaker_profile"),
url(r"^staff/create/(\d+)/$", "speaker_create_staff", name="speaker_create_staff"), url(r"^staff/create/(\d+)/$", "speaker_create_staff",
name="speaker_create_staff"),
) )

3
symposion/sponsorship/urls.py
View file

@ -2,7 +2,8 @@ from django.conf.urls import patterns, url
from django.views.generic import TemplateView from django.views.generic import TemplateView
urlpatterns = patterns("symposion.sponsorship.views", urlpatterns = patterns(
"symposion.sponsorship.views",
url(r"^$", TemplateView.as_view(template_name="sponsorship/list.html"), name="sponsor_list"), url(r"^$", TemplateView.as_view(template_name="sponsorship/list.html"), name="sponsor_list"),
url(r"^apply/$", "sponsor_apply", name="sponsor_apply"), url(r"^apply/$", "sponsor_apply", name="sponsor_apply"),
url(r"^add/$", "sponsor_add", name="sponsor_add"), url(r"^add/$", "sponsor_add", name="sponsor_add"),

3
symposion/teams/urls.py
View file

@ -1,7 +1,8 @@
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
urlpatterns = patterns("symposion.teams.views", urlpatterns = patterns(
"symposion.teams.views",
# team specific # team specific
url(r"^(?P<slug>[\w\-]+)/$", "team_detail", name="team_detail"), url(r"^(?P<slug>[\w\-]+)/$", "team_detail", name="team_detail"),
url(r"^(?P<slug>[\w\-]+)/join/$", "team_join", name="team_join"), url(r"^(?P<slug>[\w\-]+)/join/$", "team_join", name="team_join"),

2
symposion/templates/cms/file_create.html
View file

@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
<h1>Upload File</h1> <h1>Upload File</h1>
<form method="POST" action="{% url file_create %}" enctype="multipart/form-data"> <form method="POST" action="{% url "file_create" %}" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{{ form|as_bootstrap }} {{ form|as_bootstrap }}
<div class="form-actions"> <div class="form-actions">

4
symposion/templates/cms/file_index.html
View file

@ -9,7 +9,7 @@
{% for file in files %} {% for file in files %}
<div style="margin-top: 1em;"> <div style="margin-top: 1em;">
<form class="pull-right" action="{% url file_delete file.pk %}" method="post"> <form class="pull-right" action="{% url "file_delete" file.pk %}" method="post">
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-error"><i class="icon-trash"></i> delete</button> <button type="submit" class="btn btn-error"><i class="icon-trash"></i> delete</button>
</form> </form>
@ -20,7 +20,7 @@
<p>No uploaded files.</p> <p>No uploaded files.</p>
{% endfor %} {% endfor %}
<div style="margin-top: 2em"> <div style="margin-top: 2em">
<a class="btn btn-success" href="{% url file_create %}"> <a class="btn btn-success" href="{% url "file_create" %}">
<i class="icon-plus icon-white"></i> <i class="icon-plus icon-white"></i>
Add File Add File
</a> </a>

4
symposion/templates/conference/user_list.html
View file

@ -68,9 +68,9 @@
<td>{{ user.get_full_name }}</td> <td>{{ user.get_full_name }}</td>
<td> <td>
{% if user.speaker_profile %} {% if user.speaker_profile %}
<a href="{% url speaker_profile user.speaker_profile.pk %}">{{ user.speaker_profile }}</a> <a href="{% url "speaker_profile" user.speaker_profile.pk %}">{{ user.speaker_profile }}</a>
{% else %} {% else %}
<a href="{% url speaker_create_staff user.pk %}" class="btn btn-mini">create</a> <a href="{% url "speaker_create_staff" user.pk %}" class="btn btn-mini">create</a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

24
symposion/templates/dashboard.html
View file

@ -16,14 +16,14 @@
<h3>{% trans "Speaking" %}</h3> <h3>{% trans "Speaking" %}</h3>
<div class="pull-right header-actions"> <div class="pull-right header-actions">
{% if not user.speaker_profile %} {% if not user.speaker_profile %}
<a href="{% url speaker_create %}" class="btn"> <a href="{% url "speaker_create" %}" class="btn">
<i class="icon-plus-sign"></i> Create a speaker profile <i class="icon-plus-sign"></i> Create a speaker profile
</a> </a>
{% else %} {% else %}
<a href="{% url speaker_edit %}" class="btn"> <a href="{% url "speaker_edit" %}" class="btn">
<i class="icon-pencil"></i> Edit your speaker profile <i class="icon-pencil"></i> Edit your speaker profile
</a> </a>
<a href="{% url proposal_submit %}" class="btn"> <a href="{% url "proposal_submit" %}" class="btn">
<i class="icon-plus-sign"></i> Submit a new proposal <i class="icon-plus-sign"></i> Submit a new proposal
</a> </a>
{% endif %} {% endif %}
@ -32,7 +32,7 @@
<div class="dashboard-panel-content"> <div class="dashboard-panel-content">
{% if not user.speaker_profile %} {% if not user.speaker_profile %}
<p>To submit a proposal, you must first <a href="{% url speaker_create %}">create a speaker profile</a>.</p> <p>To submit a proposal, you must first <a href="{% url "speaker_create" %}">create a speaker profile</a>.</p>
{% else %} {% else %}
<h4>Your Proposals</h4> <h4>Your Proposals</h4>
{% if user.speaker_profile.proposals.exists %} {% if user.speaker_profile.proposals.exists %}
@ -92,7 +92,7 @@
<h3>{% trans "Sponsorship" %}</h3> <h3>{% trans "Sponsorship" %}</h3>
<div class="pull-right header-actions"> <div class="pull-right header-actions">
{% if not user.sponsorships.exists %} {% if not user.sponsorships.exists %}
<a href="{% url sponsor_apply %}" class="btn"> <a href="{% url "sponsor_apply" %}" class="btn">
<i class="icon-plus-sign"></i> Apply to be a sponsor <i class="icon-plus-sign"></i> Apply to be a sponsor
</a> </a>
{% endif %} {% endif %}
@ -101,13 +101,13 @@
<div class="dashboard-panel-content"> <div class="dashboard-panel-content">
{% if not user.sponsorships.exists %} {% if not user.sponsorships.exists %}
<p>If you or your organization would be interested in sponsorship opportunities, <a href="{% url sponsor_apply %}">use our online form to apply to be a sponsor</a>. <p>If you or your organization would be interested in sponsorship opportunities, <a href="{% url "sponsor_apply" %}">use our online form to apply to be a sponsor</a>.
{% else %} {% else %}
<h4>Your Sponsorship</h4> <h4>Your Sponsorship</h4>
<ul> <ul>
{% for sponsorship in user.sponsorships.all %} {% for sponsorship in user.sponsorships.all %}
<li> <li>
<a href="{% url sponsor_detail sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a> <a href="{% url "sponsor_detail" sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a>
({{ sponsorship.level }}) ({{ sponsorship.level }})
{% if not sponsorship.active %} {% if not sponsorship.active %}
<span class="label label-warning">awaiting approval</span> <span class="label label-warning">awaiting approval</span>
@ -118,7 +118,7 @@
{% endif %} {% endif %}
{% if user.is_staff %} {% if user.is_staff %}
<p> <p>
As staff, you can directly <a href="{% url sponsor_add %}">add a sponsor</a> if the organization isn't As staff, you can directly <a href="{% url "sponsor_add" %}">add a sponsor</a> if the organization isn't
applying themselves. applying themselves.
</p> </p>
{% endif %} {% endif %}
@ -138,9 +138,9 @@
<ul> <ul>
{% for section in review_sections %} {% for section in review_sections %}
<h5>{{ section }}</h5> <h5>{{ section }}</h5>
<li><a href="{% url review_section section.section.slug %}">All</a></li> <li><a href="{% url "review_section" section.section.slug %}">All</a></li>
<li><a href="{% url user_reviewed section.section.slug %}">Reviewed by you</a></li> <li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
<li><a href="{% url user_not_reviewed section.section.slug %}">Not Reviewed by you</a></li> <li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
@ -183,7 +183,7 @@
{% for membership in user.memberships.all %} {% for membership in user.memberships.all %}
<tr> <tr>
<td> <td>
<a href="{% url team_detail membership.team.slug %}">{{ membership.team.name }}</a> <a href="{% url "team_detail" membership.team.slug %}">{{ membership.team.name }}</a>
{% if membership.team.description %}<br>{{ membership.team.description }}{% endif %} {% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
</td> </td>
<td> <td>

2
symposion/templates/emails/proposal_new_message/message.html
View file

@ -6,6 +6,6 @@
{{ message.message|safe }} {{ message.message|safe }}
</blockquote> </blockquote>
<p> <p>
{% if reviewer %}{% url review_detail proposal.pk as detail_url %}{% else %}{% url proposal_detail proposal.pk as detail_url %}{% endif %} {% if reviewer %}{% url "review_detail" proposal.pk as detail_url %}{% else %}{% url "proposal_detail" proposal.pk as detail_url %}{% endif %}
Respond online at <a href="http://{{ current_site }}{{ detail_url }}#proposal-feedback">http://{{ current_site }}{{ detail_url }}#proposal-feedback</a> Respond online at <a href="http://{{ current_site }}{{ detail_url }}#proposal-feedback">http://{{ current_site }}{{ detail_url }}#proposal-feedback</a>
</p> </p>

2
symposion/templates/emails/proposal_updated/message.html
View file

@ -3,6 +3,6 @@
<b>{% user_display user %}</b> has made changes to <b>{{ proposal.title }}</b> which you have previously reviewed or commented on. <b>{% user_display user %}</b> has made changes to <b>{{ proposal.title }}</b> which you have previously reviewed or commented on.
</p> </p>
<p> <p>
{% url review_detail proposal.pk as detail_url %} {% url "review_detail" proposal.pk as detail_url %}
View the latest version of the proposal online at <a href="http://{{ current_site }}{{ detail_url }}">http://{{ current_site }}{{ detail_url }}</a> View the latest version of the proposal online at <a href="http://{{ current_site }}{{ detail_url }}">http://{{ current_site }}{{ detail_url }}</a>
</p> </p>

2
symposion/templates/emails/speaker_addition/message.html
View file

@ -2,5 +2,5 @@
talk proposal for {{ current_site.name }} entitled "{{ proposal.title }}".</p> talk proposal for {{ current_site.name }} entitled "{{ proposal.title }}".</p>
<p>For more details, visit the {{ current_site.name }} speaker dashboard: <p>For more details, visit the {{ current_site.name }} speaker dashboard:
<a href="http://{{ current_site }}{% url dashboard %}">http://{{ current_site }}{% url dashboard %}</a> <a href="http://{{ current_site }}{% url "dashboard" %}">http://{{ current_site }}{% url "dashboard" %}</a>
</p> </p>

2
symposion/templates/emails/speaker_invite/message.html
View file

@ -3,7 +3,7 @@
<p>Go to</p> <p>Go to</p>
<p><a href="http://{{ current_site }}{% url speaker_create_token token %}">http://{{ current_site }}{% url speaker_create_token token %}</a></p> <p><a href="http://{{ current_site }}{% url "speaker_create_token" token %}">http://{{ current_site }}{% url "speaker_create_token" token %}</a></p>
<p>to confirm.</p> <p>to confirm.</p>

6
symposion/templates/proposals/_pending_proposal_row.html
View file

@ -2,7 +2,7 @@
<tr> <tr>
<td> <td>
<a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a> <a href="{% url "proposal_detail" proposal.pk %}">{{ proposal.title }}</a>
</td> </td>
<td>{{ proposal.kind.name }}</td> <td>{{ proposal.kind.name }}</td>
@ -31,9 +31,9 @@
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{% url proposal_pending_join proposal.id %}"> <li><a href="{% url "proposal_pending_join" proposal.id %}">
{% trans 'Accept invitation' %}</a></li> {% trans 'Accept invitation' %}</a></li>
<li><a href="{% url proposal_pending_decline proposal.id <li><a href="{% url "proposal_pending_decline" proposal.id
%}">{% trans 'Decline invitation' %}</a></li> %}">{% trans 'Decline invitation' %}</a></li>
</ul> </ul>
</div> </div>

2
symposion/templates/proposals/_proposal_fields.html
View file

@ -45,7 +45,7 @@
<tr> <tr>
<td><a href="{{ document.download_url }}">{{ document.description }}</a></td> <td><a href="{{ document.download_url }}">{{ document.description }}</a></td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url proposal_document_delete document.pk %}"> <form style="margin: 0;" method="post" action="{% url "proposal_document_delete" document.pk %}">
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-mini">delete</button> <button type="submit" class="btn btn-mini">delete</button>
</form> </form>

6
symposion/templates/proposals/_proposal_row.html
View file

@ -1,6 +1,6 @@
<tr> <tr>
<td> <td>
<a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a> <a href="{% url "proposal_detail" proposal.pk %}">{{ proposal.title }}</a>
</td> </td>
<td>{{ proposal.kind.name }}</td> <td>{{ proposal.kind.name }}</td>
@ -24,8 +24,8 @@
<td> <td>
{% if not proposal.cancelled %} {% if not proposal.cancelled %}
{% if request.user == proposal.speaker.user and proposal.can_edit %} {% if request.user == proposal.speaker.user and proposal.can_edit %}
<a href="{% url proposal_edit proposal.pk %}" class="btn btn-mini"><i class="icon-pencil"></i> Edit</a> <a href="{% url "proposal_edit" proposal.pk %}" class="btn btn-mini"><i class="icon-pencil"></i> Edit</a>
<a href="{% url proposal_speaker_manage proposal.id %}" class="btn btn-mini"><i class="icon-user"></i> Manage Additional Speakers</a> <a href="{% url "proposal_speaker_manage" proposal.id %}" class="btn btn-mini"><i class="icon-user"></i> Manage Additional Speakers</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</td> </td>

2
symposion/templates/proposals/proposal_cancel.html
View file

@ -13,6 +13,6 @@
{% csrf_token %} {% csrf_token %}
<p>Are you sure you want to cancel <b>{{ proposal.title }}</b>?</p> <p>Are you sure you want to cancel <b>{{ proposal.title }}</b>?</p>
<input class="btn btn-danger" type="submit" value="I am sure" /> <input class="btn btn-danger" type="submit" value="I am sure" />
<a class="btn" href="{% url proposal_detail proposal.pk %}">{% trans 'No, keep it for now' %}</a> <a class="btn" href="{% url "proposal_detail" proposal.pk %}">{% trans 'No, keep it for now' %}</a>
</form> </form>
{% endblock %} {% endblock %}

8
symposion/templates/proposals/proposal_detail.html
View file

@ -10,14 +10,14 @@
<div class="pull-right"> <div class="pull-right">
{% if not proposal.cancelled %} {% if not proposal.cancelled %}
{% if request.user == proposal.speaker.user %} {% if request.user == proposal.speaker.user %}
<a href="{% url proposal_edit proposal.pk %}" class="btn"> <a href="{% url "proposal_edit" proposal.pk %}" class="btn">
{% trans "Edit this proposal" %} {% trans "Edit this proposal" %}
</a> </a>
<a href="{% url proposal_cancel proposal.pk %}" class="btn"> <a href="{% url "proposal_cancel" proposal.pk %}" class="btn">
{% trans "Cancel this proposal" %} {% trans "Cancel this proposal" %}
</a> </a>
{% else %} {% else %}
<a href="{% url proposal_leave proposal.pk %}" class="btn"> <a href="{% url "proposal_leave" proposal.pk %}" class="btn">
{% trans "Remove me from this proposal" %} {% trans "Remove me from this proposal" %}
</a> </a>
{% endif %} {% endif %}
@ -52,7 +52,7 @@
<tr> <tr>
<td><a href="{{ document.download_url }}">{{ document.description }}</a></td> <td><a href="{{ document.download_url }}">{{ document.description }}</a></td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url proposal_document_delete document.pk %}"> <form style="margin: 0;" method="post" action="{% url "proposal_document_delete" document.pk %}">
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-mini">{% trans 'delete' %}</button> <button type="submit" class="btn btn-mini">{% trans 'delete' %}</button>
</form> </form>

4
symposion/templates/proposals/proposal_edit.html
View file

@ -8,7 +8,7 @@
{% block body %} {% block body %}
<h1>Edit: {{ proposal.title }}</h1> <h1>Edit: {{ proposal.title }}</h1>
<p><a href="{% url proposal_speaker_manage proposal.pk %}">Manage speakers</a></p> <p><a href="{% url "proposal_speaker_manage" proposal.pk %}">Manage speakers</a></p>
<form method="POST" action="" enctype="multipart/form-data"> <form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
@ -17,7 +17,7 @@
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Save" /> <input class="btn btn-primary" type="submit" value="Save" />
<a class="btn" href="{% url proposal_detail proposal.pk %}">Cancel</a> <a class="btn" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

2
symposion/templates/proposals/proposal_speaker_manage.html
View file

@ -7,7 +7,7 @@
<h1>{% trans 'Proposal:' %} {{ proposal.title }}</h1> <h1>{% trans 'Proposal:' %} {{ proposal.title }}</h1>
<p> <p>
<a href="{% url proposal_edit proposal.pk %}">{% trans 'Edit proposal' %} <a href="{% url "proposal_edit" proposal.pk %}">{% trans 'Edit proposal' %}
</a> </a>
</p> </p>

2
symposion/templates/proposals/proposal_submit.html
View file

@ -13,7 +13,7 @@
<ul> <ul>
{% for kind in kinds %} {% for kind in kinds %}
<li><a href="{% url proposal_submit_kind kind.slug %}">{{ kind }}</a></li> <li><a href="{% url "proposal_submit_kind" kind.slug %}">{{ kind }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}

2
symposion/templates/reviews/_review_table.html
View file

@ -18,7 +18,7 @@
<tr class="{{ proposal.user_vote_css }}"> <tr class="{{ proposal.user_vote_css }}">
<td>{{ proposal.number }}</td> <td>{{ proposal.number }}</td>
<td> <td>
<a href="{% url review_detail proposal.pk %}"> <a href="{% url "review_detail" proposal.pk %}">
<small><strong>{{ proposal.speaker }}</strong></small> <small><strong>{{ proposal.speaker }}</strong></small>
<br /> <br />
{{ proposal.title }} {{ proposal.title }}

8
symposion/templates/reviews/base.html
View file

@ -60,25 +60,25 @@
{{ section }} {{ section }}
</li> </li>
<li> <li>
<a href="{% url review_section section.section.slug %}"> <a href="{% url "review_section" section.section.slug %}">
{% trans "All Reviews" %} {% trans "All Reviews" %}
</a> </a>
</li> </li>
{% comment %} {% comment %}
<li> <li>
<a href="{% url review_section_assignments section.section.slug %}"> <a href="{% url "review_section_assignments" section.section.slug %}">
{% trans "Your Assignments" %} {% trans "Your Assignments" %}
</a> </a>
</li> </li>
{% endcomment %} {% endcomment %}
<li> <li>
<a href="{% url review_status section.section.slug %}"> <a href="{% url "review_status" section.section.slug %}">
{% trans "Voting Status" %} {% trans "Voting Status" %}
</a> </a>
</li> </li>
{% if request.user.is_staff %} {% if request.user.is_staff %}
<li> <li>
<a href="{% url result_notification section.section.slug 'accepted' %}">Result Notification</a> <a href="{% url "result_notification" section.section.slug 'accepted' %}">Result Notification</a>
</li> </li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

10
symposion/templates/reviews/result_notification.html
View file

@ -13,14 +13,14 @@
{% block body %} {% block body %}
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li{% if status == 'accepted' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'accepted' %}">accepted</a> <li{% if status == 'accepted' %} class="active"{% endif %}><a href="{% url "result_notification" section_slug 'accepted' %}">accepted</a>
<li{% if status == 'rejected' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'rejected' %}">rejected</a> <li{% if status == 'rejected' %} class="active"{% endif %}><a href="{% url "result_notification" section_slug 'rejected' %}">rejected</a>
<li{% if status == 'standby' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'standby' %}">standby</a> <li{% if status == 'standby' %} class="active"{% endif %}><a href="{% url "result_notification" section_slug 'standby' %}">standby</a>
</ul> </ul>
<h1>Result Notification</h1> <h1>Result Notification</h1>
<form method="post" action="{% url result_notification_prepare section_slug status %}"> <form method="post" action="{% url "result_notification_prepare" section_slug status %}">
{% csrf_token %} {% csrf_token %}
@ -54,7 +54,7 @@
<td><input class="action-select" type="checkbox" name="_selected_action" value="{{ proposal.pk }}"></td> <td><input class="action-select" type="checkbox" name="_selected_action" value="{{ proposal.pk }}"></td>
<td>{{ proposal.number }}</td> <td>{{ proposal.number }}</td>
<td> <td>
<a href="{% url review_detail proposal.pk %}"> <a href="{% url "review_detail" proposal.pk %}">
<small><strong>{{ proposal.speaker }}</strong></small> <small><strong>{{ proposal.speaker }}</strong></small>
<br /> <br />
{{ proposal.title }} {{ proposal.title }}

4
symposion/templates/reviews/result_notification_prepare.html
View file

@ -23,7 +23,7 @@
<div class="span6"> <div class="span6">
<h2>Email</h2> <h2>Email</h2>
<form method="post" action="{% url result_notification_send section_slug status %}"> <form method="post" action="{% url "result_notification_send" section_slug status %}">
{% csrf_token %} {% csrf_token %}
@ -42,7 +42,7 @@
{% include "reviews/_result_notification_prepare_help.html" %} {% include "reviews/_result_notification_prepare_help.html" %}
<button type="submit" class="btn btn-primary">Send {{ proposals|length }} Email{{ proposals|length|pluralize }}</button> <button type="submit" class="btn btn-primary">Send {{ proposals|length }} Email{{ proposals|length|pluralize }}</button>
<a class="btn" href="{% url result_notification section_slug status %}">Cancel</a> <a class="btn" href="{% url "result_notification" section_slug status %}">Cancel</a>
</form> </form>
</div> </div>
</form> </form>

2
symposion/templates/reviews/review_admin.html
View file

@ -30,7 +30,7 @@
{% for reviewer in reviewers %} {% for reviewer in reviewers %}
<tr> <tr>
<td> <td>
<a href="{% url review_list_user section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a> <a href="{% url "review_list_user" section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a>
</td> </td>
<td> <td>
{{ reviewer.total_votes }} {{ reviewer.total_votes }}

2
symposion/templates/reviews/review_assignment.html
View file

@ -18,7 +18,7 @@
</a> </a>
</td> </td>
<td> <td>
<form method="post" action="{% url review_assignment_opt_out assignment.pk %}"> <form method="post" action="{% url "review_assignment_opt_out" assignment.pk %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Opt-out" /> <input type="submit" value="Opt-out" />
</form> </form>

2
symposion/templates/reviews/review_detail.html
View file

@ -126,7 +126,7 @@
</div> </div>
{% if is_manager %} {% if is_manager %}
<div class="pull-right"> <div class="pull-right">
<form class="form-inline" action="{% url review_delete review.id %}" method="POST"> <form class="form-inline" action="{% url "review_delete" review.id %}" method="POST">
{% csrf_token %} {% csrf_token %}
<button class="btn btn-mini btn-danger" type="submit">Delete</button> <button class="btn btn-mini btn-danger" type="submit">Delete</button>
</form> </form>

4
symposion/templates/reviews/review_review.html
View file

@ -55,7 +55,7 @@
<h2>Review</h2> <h2>Review</h2>
<form method="POST" action="{% url review_review proposal.pk %}" class="uniForm"> <form method="POST" action="{% url "review_review" proposal.pk %}" class="uniForm">
{% csrf_token %} {% csrf_token %}
<fieldset class="inlineLabels"> <fieldset class="inlineLabels">
{{ review_form|as_uni_form }} {{ review_form|as_uni_form }}
@ -67,7 +67,7 @@
<h2>Comment</h2> <h2>Comment</h2>
<form method="POST" action="{% url review_comment proposal.pk %}" class="uniForm"> <form method="POST" action="{% url "review_comment" proposal.pk %}" class="uniForm">
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset>
{{ comment_form|as_uni_form }} {{ comment_form|as_uni_form }}

20
symposion/templates/reviews/review_stats.html
View file

@ -5,11 +5,11 @@
{% if key %} {% if key %}
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{% url review_status section_slug "positive" %}">Positive</a> | <a href="{% url "review_status" section_slug "positive" %}">Positive</a> |
<a href="{% url review_status section_slug "negative" %}">Negative</a> | <a href="{% url "review_status" section_slug "negative" %}">Negative</a> |
<a href="{% url review_status section_slug "indifferent" %}">Indifferent</a> | <a href="{% url "review_status" section_slug "indifferent" %}">Indifferent</a> |
<a href="{% url review_status section_slug "controversial" %}">Controversial</a> | <a href="{% url "review_status" section_slug "controversial" %}">Controversial</a> |
<a href="{% url review_status section_slug "too_few" %}">Too Few</a> <a href="{% url "review_status" section_slug "too_few" %}">Too Few</a>
</div> </div>
<div> <div>
@ -42,35 +42,35 @@
<dl> <dl>
<dt> <dt>
<a href="{% url review_status section_slug "positive" %}">Positive</a> <a href="{% url "review_status" section_slug "positive" %}">Positive</a>
<span class="badge">{{ proposals.positive|length }}</span> <span class="badge">{{ proposals.positive|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no &minus;1s proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no &minus;1s
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "negative" %}">Negative</a> <a href="{% url "review_status" section_slug "negative" %}">Negative</a>
<span class="badge">{{ proposals.negative|length }}</span> <span class="badge">{{ proposals.negative|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one &minus;1 and no +1s proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one &minus;1 and no +1s
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "indifferent" %}">Indifferent</a> <a href="{% url "review_status" section_slug "indifferent" %}">Indifferent</a>
<span class="badge">{{ proposals.indifferent|length }}</span> <span class="badge">{{ proposals.indifferent|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a &minus;1 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a &minus;1
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "controversial" %}">Controversial</a> <a href="{% url "review_status" section_slug "controversial" %}">Controversial</a>
<span class="badge">{{ proposals.controversial|length }}</span> <span class="badge">{{ proposals.controversial|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and &minus;1 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and &minus;1
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "too_few" %}">Too Few Reviews</a> <a href="{% url "review_status" section_slug "too_few" %}">Too Few Reviews</a>
<span class="badge">{{ proposals.too_few|length }}</span> <span class="badge">{{ proposals.too_few|length }}</span>
</dt> </dt>
<dd> <dd>

6
symposion/templates/schedule/_edit_grid.html
View file

@ -15,9 +15,9 @@
<td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}"> <td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}">
{% if slot.kind.label == "talk" or slot.kind.label == "tutorial" %} {% if slot.kind.label == "talk" or slot.kind.label == "tutorial" %}
{% if not slot.content %} {% if not slot.content %}
<a class="btn btn-mini edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">+</a> <a class="btn btn-mini edit-slot" data-action="{% url "schedule_slot_edit" schedule.section.slug slot.pk %}" href="#">+</a>
{% else %} {% else %}
<span class="title"><a class="edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">{{ slot.content.title }}</a></span> <span class="title"><a class="edit-slot" data-action="{% url "schedule_slot_edit" schedule.section.slug slot.pk %}" href="#">{{ slot.content.title }}</a></span>
<span class="speaker">{{ slot.content.speaker }}</span> <span class="speaker">{{ slot.content.speaker }}</span>
{% endif %} {% endif %}
{% else %} {% else %}
@ -26,7 +26,7 @@
{% else %} {% else %}
{{ slot.kind.label }} {{ slot.kind.label }}
{% endif %} {% endif %}
&mdash; <a class="edit-slot" data-action="{% url schedule_slot_edit schedule.section.slug slot.pk %}" href="#">edit</a> &mdash; <a class="edit-slot" data-action="{% url "schedule_slot_edit" schedule.section.slug slot.pk %}" href="#">edit</a>
{% endif %} {% endif %}
</td> </td>
{% endfor %} {% endfor %}

2
symposion/templates/schedule/_grid.html
View file

@ -17,7 +17,7 @@
{% if not slot.content %} {% if not slot.content %}
{% else %} {% else %}
<span class="title"> <span class="title">
<a href="{% url schedule_presentation_detail slot.content.pk %}">{{ slot.content.title }}</a> <a href="{% url "schedule_presentation_detail" slot.content.pk %}">{{ slot.content.title }}</a>
</span> </span>
<span class="speaker"> <span class="speaker">
{{ slot.content.speakers|join:", " }} {{ slot.content.speakers|join:", " }}

2
symposion/templates/schedule/_slot_edit.html
View file

@ -1,5 +1,5 @@
{% load i18n bootstrap_tags %} {% load i18n bootstrap_tags %}
<form id="slotEditForm" class="modal-form" method="POST" action="{% url schedule_slot_edit slug slot.pk %}"> <form id="slotEditForm" class="modal-form" method="POST" action="{% url "schedule_slot_edit" slug slot.pk %}">
<div class="modal-header"> <div class="modal-header">
<a class="close" data-dismiss="modal">&times;</a> <a class="close" data-dismiss="modal">&times;</a>
<h3>{% trans "Edit Slot" %}</h3> <h3>{% trans "Edit Slot" %}</h3>

2
symposion/templates/schedule/presentation_detail.html
View file

@ -17,7 +17,7 @@
<h4> <h4>
{% for speaker in presentation.speakers %} {% for speaker in presentation.speakers %}
<a href="{% url speaker_profile speaker.pk %}">{{ speaker }}</a>{% if not forloop.last %}, {% endif %}{% endfor %} <a href="{% url "speaker_profile" speaker.pk %}">{{ speaker }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
</h4> </h4>
<dl class="dl-horizontal"> <dl class="dl-horizontal">

2
symposion/templates/schedule/schedule_list.html
View file

@ -33,7 +33,7 @@
{% for presentation in presentations %} {% for presentation in presentations %}
<div class="row"> <div class="row">
<div class="span8 presentation well"> <div class="span8 presentation well">
<h3><a href="{% url schedule_presentation_detail presentation.pk %}">{{ presentation.title }}</a></h3> <h3><a href="{% url "schedule_presentation_detail" presentation.pk %}">{{ presentation.title }}</a></h3>
<h4>{{ presentation.speakers|join:", " }}</h4> <h4>{{ presentation.speakers|join:", " }}</h4>
{{ presentation.description }} {{ presentation.description }}
{% if presentation.slot %} {% if presentation.slot %}

2
symposion/templates/speakers/speaker_create.html
View file

@ -17,7 +17,7 @@
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Save" /> <input class="btn btn-primary" type="submit" value="Save" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url "dashboard" %}">Cancel</a>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

2
symposion/templates/speakers/speaker_edit.html
View file

@ -17,7 +17,7 @@
</fieldset> </fieldset>
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Save" /> <input class="btn btn-primary" type="submit" value="Save" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url "dashboard" %}">Cancel</a>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

4
symposion/templates/speakers/speaker_profile.html
View file

@ -17,14 +17,14 @@
</div> </div>
<div class="span6"> <div class="span6">
{% if speaker.user == request.user or request.user.is_staff %} {% if speaker.user == request.user or request.user.is_staff %}
<a class="btn pull-right" href="{% url speaker_edit speaker.pk %}">Edit</a> <a class="btn pull-right" href="{% url "speaker_edit" speaker.pk %}">Edit</a>
{% endif %} {% endif %}
<h1>{{ speaker.name }}</h1> <h1>{{ speaker.name }}</h1>
<div class="bio">{{ speaker.biography|safe }}</div> <div class="bio">{{ speaker.biography|safe }}</div>
<h2>Presentations</h2> <h2>Presentations</h2>
{% for presentation in presentations %} {% for presentation in presentations %}
<h3><a href="{% url schedule_presentation_detail presentation.pk %}">{{ presentation.title }}</a></h3> <h3><a href="{% url "schedule_presentation_detail" presentation.pk %}">{{ presentation.title }}</a></h3>
{% if presentation.slot %} {% if presentation.slot %}
<p> <p>
{{ presentation.slot.day.date|date:"l" }} {{ presentation.slot.day.date|date:"l" }}

4
symposion/templates/sponsorship/add.html
View file

@ -9,13 +9,13 @@
{% block body_class %}sponsorships{% endblock %} {% block body_class %}sponsorships{% endblock %}
{% block body %} {% block body %}
<form method="POST" action="{% url sponsor_add %}" class="form-horizontal"> <form method="POST" action="{% url "sponsor_add" %}" class="form-horizontal">
{% csrf_token %} {% csrf_token %}
<legend>{% trans "Add a Sponsor" %}</legend> <legend>{% trans "Add a Sponsor" %}</legend>
{{ form|as_bootstrap }} {{ form|as_bootstrap }}
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Add" /> <input class="btn btn-primary" type="submit" value="Add" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url "dashboard" %}">Cancel</a>
</div> </div>
</form> </form>

4
symposion/templates/sponsorship/apply.html
View file

@ -18,9 +18,9 @@
{{ form|as_bootstrap }} {{ form|as_bootstrap }}
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Apply" /> <input class="btn btn-primary" type="submit" value="Apply" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url "dashboard" %}">Cancel</a>
<p class="help-block"> <p class="help-block">
<small>By submitting this sponsor application you are agreeing to the <a href="{% url cms_page "sponsor/terms/" %}" target="_blank">terms and conditions</a>.</small> <small>By submitting this sponsor application you are agreeing to the <a href="{% url "cms_page" "sponsor/terms/" %}" target="_blank">terms and conditions</a>.</small>
</p> </p>
</div> </div>
</form> </form>

2
symposion/templates/sponsorship/detail.html
View file

@ -33,7 +33,7 @@
<div class="form-actions"> <div class="form-actions">
<input class="btn btn-primary" type="submit" value="Save" /> <input class="btn btn-primary" type="submit" value="Save" />
<a class="btn" href="{% url dashboard %}">Cancel</a> <a class="btn" href="{% url "dashboard" %}">Cancel</a>
</div> </div>
</form> </form>

2
symposion/templates/sponsorship/list.html
View file

@ -12,7 +12,7 @@
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
<h1>{% trans "About Our Sponsors" %}</h1> <h1>{% trans "About Our Sponsors" %}</h1>
<a href="{% url cms_page "sponsors/prospectus/" %}" class="btn">Learn how to become a sponsor <span class="arrow"></span></a> <a href="{% url "cms_page" "sponsors/prospectus/" %}" class="btn">Learn how to become a sponsor <span class="arrow"></span></a>
{% sponsor_levels as levels %} {% sponsor_levels as levels %}
{% for level in levels %} {% for level in levels %}

14
symposion/templates/teams/team_detail.html
View file

@ -9,21 +9,21 @@
<div class="span12"> <div class="span12">
<div class="pull-right"> <div class="pull-right">
{% if can_join %} {% if can_join %}
<form method="post" action="{% url team_join team.slug %}"> <form method="post" action="{% url "team_join" team.slug %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" class="btn btn-primary" value="join"> <input type="submit" class="btn btn-primary" value="join">
</form> </form>
{% endif %} {% endif %}
{% if can_leave %} {% if can_leave %}
<form method="post" action="{% url team_leave team.slug %}"> <form method="post" action="{% url "team_leave" team.slug %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" class="btn" value="leave"> <input type="submit" class="btn" value="leave">
</form> </form>
{% endif %} {% endif %}
{% if can_apply %} {% if can_apply %}
<form method="post" action="{% url team_apply team.slug %}"> <form method="post" action="{% url "team_apply" team.slug %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" class="btn btn-primary" value="apply"> <input type="submit" class="btn btn-primary" value="apply">
</form> </form>
@ -44,7 +44,7 @@
<tr> <tr>
<td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td> <td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url team_demote membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">demote</button></form> <form style="margin: 0;" method="post" action="{% url "team_demote" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">demote</button></form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -57,7 +57,7 @@
<tr> <tr>
<td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td> <td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url team_promote membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">promote</button></form> <form style="margin: 0;" method="post" action="{% url "team_promote" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">promote</button></form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -70,8 +70,8 @@
<tr> <tr>
<td>{{ membership.user.email }}</td> <td>{{ membership.user.email }}</td>
<td> <td>
<form style="margin: 0; float: left;" method="post" action="{% url team_accept membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">accept</button></form> <form style="margin: 0; float: left;" method="post" action="{% url "team_accept" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">accept</button></form>
<form style="margin: 0; float: left;" method="post" action="{% url team_reject membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">reject</button></form> <form style="margin: 0; float: left;" method="post" action="{% url "team_reject" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">reject</button></form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

6
symposion/views.py
View file

@ -23,7 +23,8 @@ class SignupView(account.views.SignupView):
"first_name": form.cleaned_data["first_name"], "first_name": form.cleaned_data["first_name"],
"last_name": form.cleaned_data["last_name"] "last_name": form.cleaned_data["last_name"]
} }
return super(SignupView, self).create_user(form, commit=commit, **user_kwargs) return super(SignupView, self).create_user(form, commit=commit,
**user_kwargs)
def generate_username(self, form): def generate_username(self, form):
def random_username(): def random_username():
@ -51,5 +52,6 @@ class LoginView(account.views.LoginView):
@login_required @login_required
def dashboard(request): def dashboard(request):
if request.session.get("pending-token"): if request.session.get("pending-token"):
return redirect("speaker_create_token", request.session["pending-token"]) return redirect("speaker_create_token",
request.session["pending-token"])
return render(request, "dashboard.html") return render(request, "dashboard.html")