Changeset - f369e1d8adc6
[Not reviewed]
Merge
! ! !
David Ray - 10 years ago 2014-01-16 13:17:42
dray@caktusgroup.com
Merge pull request #4 from pyohio/future-django

Changes for Django 1.5+
52 files changed with 238 insertions and 140 deletions:
0 comments (0 inline, 0 general)
symposion/boxes/urls.py
Show inline comments
 
from django.conf.urls.defaults import url, patterns
 
from django.conf.urls import patterns, url
 

	
...
 
@@ -5,2 +5,2 @@ urlpatterns = patterns("symposion.boxes.views",
 
    url(r"^([-\w]+)/edit/$", "box_edit", name="box_edit"),
 
)
...
 
\ No newline at end of file
 
)
symposion/cms/urls.py
Show inline comments
 
from django.conf.urls.defaults import url, patterns
 
from django.conf.urls import url, patterns
 

	
 

	
...
 
@@ -4,2 +5,3 @@ PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/"
 

	
 

	
 
urlpatterns = patterns("symposion.cms.views",
symposion/conference/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
symposion/proposals/actions.py
Show inline comments
...
 
@@ -25,3 +25,3 @@ def export_as_csv_action(
 
            field_names = field_names - excludeset
 
        response = HttpResponse(mimetype="text/csv")
 
        response = HttpResponse(content_type="text/csv")
 
        response["Content-Disposition"] = "attachment; filename=%s.csv" % unicode(opts).replace(".", "_")
symposion/proposals/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
symposion/proposals/views.py
Show inline comments
 
import hashlib
 
import random
...
 
@@ -8,3 +9,2 @@ from django.http import Http404, HttpResponse, HttpResponseForbidden
 
from django.shortcuts import render, redirect, get_object_or_404
 
from django.utils.hashcompat import sha_constructor
 
from django.views import static
...
 
@@ -39,3 +39,3 @@ def proposal_submit(request):
 
            return redirect("dashboard")
 
    
 

 
    kinds = []
...
 
@@ -44,3 +44,3 @@ def proposal_submit(request):
 
            kinds.append(kind)
 
    
 

 
    return render(request, "proposals/proposal_submit.html", {
...
 
@@ -51,5 +51,5 @@ def proposal_submit(request):
 
def proposal_submit_kind(request, kind_slug):
 
    
 

 
    kind = get_object_or_404(ProposalKind, slug=kind_slug)
 
    
 

 
    if not request.user.is_authenticated():
...
 
@@ -61,8 +61,8 @@ def proposal_submit_kind(request, kind_slug):
 
            return redirect("dashboard")
 
    
 

 
    if not kind.section.proposalsection.is_available():
 
        return redirect("proposal_submit")
 
    
 

 
    form_class = get_form(settings.PROPOSAL_FORMS[kind_slug])
 
    
 

 
    if request.method == "POST":
...
 
@@ -81,3 +81,3 @@ def proposal_submit_kind(request, kind_slug):
 
        form = form_class()
 
    
 

 
    return render(request, "proposals/proposal_submit_kind.html", {
...
 
@@ -93,6 +93,6 @@ def proposal_speaker_manage(request, pk):
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

 
    if proposal.speaker != request.user.speaker_profile:
 
        raise Http404()
 
    
 

 
    if request.method == "POST":
...
 
@@ -103,3 +103,3 @@ def proposal_speaker_manage(request, pk):
 
            }
 
            
 

 
            def create_speaker_token(email_address):
...
 
@@ -112,4 +112,4 @@ def proposal_speaker_manage(request, pk):
 
                except Speaker.DoesNotExist:
 
                    salt = sha_constructor(str(random.random())).hexdigest()[:5]
 
                    token = sha_constructor(salt + email_address).hexdigest()
 
                    salt = hashlib.sha1(str(random.random())).hexdigest()[:5]
 
                    token = hashlib.sha1(salt + email_address).hexdigest()
 
                    pending = Speaker.objects.create(
...
 
@@ -175,3 +175,3 @@ def proposal_edit(request, pk):
 
        raise Http404()
 
    
 

 
    if not proposal.can_edit():
...
 
@@ -182,3 +182,3 @@ def proposal_edit(request, pk):
 
        return render(request, "proposals/proposal_error.html", ctx)
 
    
 

 
    form_class = get_form(settings.PROPOSAL_FORMS[proposal.kind.slug])
...
 
@@ -208,3 +208,3 @@ def proposal_edit(request, pk):
 
        form = form_class(instance=proposal)
 
    
 

 
    return render(request, "proposals/proposal_edit.html", {
...
 
@@ -220,6 +220,6 @@ def proposal_detail(request, pk):
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

 
    if request.user not in [p.user for p in proposal.speakers()]:
 
        raise Http404()
 
    
 

 
    if "symposion.reviews" in settings.INSTALLED_APPS:
...
 
@@ -230,3 +230,3 @@ def proposal_detail(request, pk):
 
            if message_form.is_valid():
 
                
 

 
                message = message_form.save(commit=False)
...
 
@@ -235,3 +235,3 @@ def proposal_detail(request, pk):
 
                message.save()
 
                
 

 
                ProposalMessage = SpeakerCommentForm.Meta.model
...
 
@@ -244,3 +244,3 @@ def proposal_detail(request, pk):
 
                )
 
                
 

 
                for reviewer in reviewers:
...
 
@@ -255,3 +255,3 @@ def proposal_detail(request, pk):
 
                    )
 
                
 

 
                return redirect(request.path)
...
 
@@ -261,3 +261,3 @@ def proposal_detail(request, pk):
 
        message_form = None
 
    
 

 
    return render(request, "proposals/proposal_detail.html", {
...
 
@@ -273,3 +273,3 @@ def proposal_cancel(request, pk):
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

 
    if proposal.speaker.user != request.user:
...
 
@@ -283,3 +283,3 @@ def proposal_cancel(request, pk):
 
        return redirect("dashboard")
 
    
 

 
    return render(request, "proposals/proposal_cancel.html", {
...
 
@@ -341,6 +341,6 @@ def document_create(request, proposal_pk):
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

 
    if proposal.cancelled:
 
        return HttpResponseForbidden()
 
    
 

 
    if request.method == "POST":
...
 
@@ -355,3 +355,3 @@ def document_create(request, proposal_pk):
 
        form = SupportingDocumentCreateForm()
 
        
 

 
    return render(request, "proposals/document_create.html", {
...
 
@@ -380,6 +380,6 @@ def document_delete(request, pk):
 
    proposal_pk = document.proposal.pk
 
    
 

 
    if request.method == "POST":
 
        document.delete()
 
    
 

 
    return redirect("proposal_detail", proposal_pk)
symposion/reviews/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
...
 
@@ -16,5 +16,5 @@ urlpatterns = patterns("symposion.reviews.views",
 
    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"^(?P<pk>\d+)/delete/$", "review_delete", name="review_delete"),
symposion/schedule/urls.py
Show inline comments
 
from django.conf.urls.defaults import url, patterns
 
from django.conf.urls import url, patterns
 

	
symposion/schedule/views.py
Show inline comments
...
 
@@ -80,3 +80,3 @@ def schedule_list_csv(request, slug=None):
 

	
 
    response = HttpResponse(mimetype="text/csv")
 
    response = HttpResponse(content_type="text/csv")
 
    if slug:
symposion/speakers/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
symposion/sponsorship/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.views.generic.simple import direct_to_template
 
from django.conf.urls import patterns, url
 
from django.views.generic import TemplateView
 

	
...
 
@@ -5,3 +5,3 @@ from django.views.generic.simple import direct_to_template
 
urlpatterns = patterns("symposion.sponsorship.views",
 
    url(r"^$", direct_to_template, {"template": "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"),
symposion/teams/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
symposion/templates/cms/file_create.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -10,3 +13,3 @@
 
            <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 %}
symposion/templates/cms/file_index.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% block head_title %}Uploaded Files{% endblock %}
...
 
@@ -11,3 +14,3 @@
 
                <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 %}
...
 
@@ -22,3 +25,3 @@
 
            <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>
symposion/templates/cms/page_detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sitetree %}
...
 
@@ -14,3 +17,3 @@
 
        <div class="pull-right">
 
            <a href="{% url cms_page_edit page.path %}" class="btn"><i class="icon-pencil icon-large"></i> Edit this page</a>
 
            <a href="{% url 'cms_page_edit' page.path %}" class="btn"><i class="icon-pencil icon-large"></i> Edit this page</a>
 
        </div>
symposion/templates/conference/user_list.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -70,5 +73,5 @@
 
                                {% 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 %}
 
                                    <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 %}
symposion/templates/dashboard.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -18,3 +21,3 @@
 
                {% 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
...
 
@@ -22,6 +25,6 @@
 
                {% else %}
 
                    <a href="{% url speaker_edit %}" class="btn">
 
                    <a href="{% url 'speaker_edit' %}" class="btn">
 
                        <i class="icon-pencil"></i> Edit your speaker profile
 
                    </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
...
 
@@ -34,3 +37,3 @@
 
            {% 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 %}
...
 
@@ -94,3 +97,3 @@
 
                {% 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
...
 
@@ -103,3 +106,3 @@
 
            {% 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 %}
...
 
@@ -109,3 +112,3 @@
 
                        <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 }})
...
 
@@ -120,3 +123,3 @@
 
                <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.
...
 
@@ -140,5 +143,5 @@
 
                        <h5>{{ section }}</h5>
 
                            <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_not_reviewed section.section.slug %}">Not Reviewed by you</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_not_reviewed' section.section.slug %}">Not Reviewed by you</a></li>
 
                    {% endfor %}
...
 
@@ -185,3 +188,3 @@
 
                                <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 %}
...
 
@@ -206,3 +209,3 @@
 
                                <td>
 
                                    <a href="{% url team_detail team.slug %}">{{ team }}</a>
 
                                    <a href="{% url 'team_detail' team.slug %}">{{ team }}</a>
 
                                    {% if team.description %}<br>{{ team.description }}{% endif %}
symposion/templates/emails/proposal_new_message/message.html
Show inline comments
 
{% load url from future %}
 
{% load account_tags %}
...
 
@@ -8,3 +9,3 @@
 
<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>
symposion/templates/emails/proposal_updated/message.html
Show inline comments
 
{% load url from future %}
 
{% load account_tags %}
...
 
@@ -5,3 +6,3 @@
 
<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>
symposion/templates/emails/speaker_addition/message.html
Show inline comments
 
{% load url from future %}
 
<p>{{ proposal.speaker.name }} attached you as an additional speaker to a
...
 
@@ -4,3 +5,3 @@
 
<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>
symposion/templates/emails/speaker_invite/message.html
Show inline comments
 
{% load url from future %}
 
<p>{{ proposal.speaker.name }} attached you as an additional speaker to a
...
 
@@ -5,3 +6,3 @@
 

	
 
<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>
 

	
symposion/templates/emails/speaker_no_profile/message.html
Show inline comments
 
{% load url from future %}
 
<p>{{ proposal.speaker.name }} attached you as an additional speaker to a
...
 
@@ -5,3 +6,3 @@
 

	
 
<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>
 

	
symposion/templates/proposals/_pending_proposal_row.html
Show inline comments
 
{% load url from future %}
 
{% load i18n %}
...
 
@@ -4,3 +5,3 @@
 
    <td>
 
        <a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a>
 
        <a href="{% url 'proposal_detail' proposal.pk %}">{{ proposal.title }}</a>
 
    </td>
...
 
@@ -33,5 +34,5 @@
 
                <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>
 
                    <li><a href="{% url proposal_pending_decline proposal.id
 
                    <li><a href="{% url 'proposal_pending_decline' proposal.id
 
		    %}">{% trans 'Decline invitation' %}</a></li>
symposion/templates/proposals/_proposal_fields.html
Show inline comments
 
{% load url from future %}
 
{% load i18n %}
...
 
@@ -47,3 +48,3 @@
 
                        <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 %}
symposion/templates/proposals/_proposal_row.html
Show inline comments
 
{% load url from future %}
 
<tr>
 
    <td>
 
        <a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a>
 
        <a href="{% url 'proposal_detail' proposal.pk %}">{{ proposal.title }}</a>
 
    </td>
...
 
@@ -26,4 +27,4 @@
 
            {% 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_speaker_manage proposal.id %}" class="btn btn-mini"><i class="icon-user"></i> Manage Additional Speakers</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>
 
            {% endif %}
symposion/templates/proposals/proposal_cancel.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -15,3 +18,3 @@
 
        <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>
symposion/templates/proposals/proposal_detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -12,6 +15,6 @@
 
            {% 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" %}
 
                </a>
 
                <a href="{% url proposal_cancel proposal.pk %}" class="btn">
 
                <a href="{% url 'proposal_cancel' proposal.pk %}" class="btn">
 
                    {% trans "Cancel this proposal" %}
...
 
@@ -19,3 +22,3 @@
 
            {% 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" %}
...
 
@@ -54,3 +57,3 @@
 
                                    <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 %}
...
 
@@ -65,3 +68,3 @@
 
                    {% endif %}
 
                    <a class="btn btn-small{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url proposal_document_create proposal.pk %}"><i class="icon-upload"></i> {% trans 'Add Document' %}</a>
 
                    <a class="btn btn-small{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url 'proposal_document_create' proposal.pk %}"><i class="icon-upload"></i> {% trans 'Add Document' %}</a>
 
                </div>
symposion/templates/proposals/proposal_edit.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -10,3 +13,3 @@
 
    
 
    <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>
 
    
...
 
@@ -19,3 +22,3 @@
 
            <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>
symposion/templates/proposals/proposal_speaker_manage.html
Show inline comments
 
{% extends "proposals/base.html" %}
 

	
 
{% load url from future %}
 

	
 
{% load i18n %}
...
 
@@ -9,3 +12,3 @@
 
    <p>
 
      <a href="{% url proposal_edit proposal.pk %}">{% trans 'Edit proposal' %}
 
      <a href="{% url 'proposal_edit' proposal.pk %}">{% trans 'Edit proposal' %}
 
      </a>
symposion/templates/proposals/proposal_submit.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load boxes_tags %}
...
 
@@ -15,3 +18,3 @@
 
            {% 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 %}
symposion/templates/reviews/_review_table.html
Show inline comments
 
{% load url from future %}
 
{% load i18n %}
...
 
@@ -20,3 +21,3 @@
 
                <td>
 
                    <a href="{% url review_detail proposal.pk %}">
 
                    <a href="{% url 'review_detail' proposal.pk %}">
 
                        <small><strong>{{ proposal.speaker }}</strong></small>
symposion/templates/reviews/base.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -62,3 +65,3 @@
 
                        <li>
 
                            <a href="{% url review_section section.section.slug %}">
 
                            <a href="{% url 'review_section' section.section.slug %}">
 
                                {% trans "All Reviews" %}
...
 
@@ -68,3 +71,3 @@
 
                        <li>
 
                            <a href="{% url review_section_assignments section.section.slug %}">
 
                            <a href="{% url 'review_section_assignments' section.section.slug %}">
 
                                {% trans "Your Assignments" %}
...
 
@@ -74,3 +77,3 @@
 
                        <li>
 
                            <a href="{% url review_status section.section.slug %}">
 
                            <a href="{% url 'review_status' section.section.slug %}">
 
                                {% trans "Voting Status" %}
...
 
@@ -80,3 +83,3 @@
 
                            <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>
symposion/templates/reviews/result_notification.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -15,5 +18,5 @@
 
    <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 == '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 == '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 == 'standby' %} class="active"{% endif %}><a href="{% url 'result_notification' section_slug 'standby' %}">standby</a>
 
    </ul>
...
 
@@ -22,3 +25,3 @@
 
    
 
    <form method="post" action="{% url result_notification_prepare section_slug status %}">
 
    <form method="post" action="{% url 'result_notification_prepare' section_slug status %}">
 
        
...
 
@@ -56,3 +59,3 @@
 
                        <td>
 
                            <a href="{% url review_detail proposal.pk %}">
 
                            <a href="{% url 'review_detail' proposal.pk %}">
 
                                <small><strong>{{ proposal.speaker }}</strong></small>
symposion/templates/reviews/result_notification_prepare.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -25,3 +28,3 @@
 
            
 
            <form method="post" action="{% url result_notification_send section_slug status %}">
 
            <form method="post" action="{% url 'result_notification_send' section_slug status %}">
 
                
...
 
@@ -44,3 +47,3 @@
 
                <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>
symposion/templates/reviews/review_admin.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% block body %}
...
 
@@ -32,3 +35,3 @@
 
            <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>
symposion/templates/reviews/review_assignment.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% block body %}
...
 
@@ -15,3 +18,3 @@
 
                    <td>
 
                        <a href="{% url review_detail assignment.proposal.pk %}">
 
                        <a href="{% url 'review_detail' assignment.proposal.pk %}">
 
                            {{ assignment.proposal.title }}
...
 
@@ -20,3 +23,3 @@
 
                    <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 %}
symposion/templates/reviews/review_detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -128,3 +131,3 @@
 
                                <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 %}
symposion/templates/reviews/review_review.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load markitup_tags %}
...
 
@@ -57,3 +60,3 @@
 
    
 
    <form method="POST" action="{% url review_review proposal.pk %}" class="uniForm">
 
    <form method="POST" action="{% url 'review_review' proposal.pk %}" class="uniForm">
 
        {% csrf_token %}
...
 
@@ -69,3 +72,3 @@
 
    
 
    <form method="POST" action="{% url review_comment proposal.pk %}" class="uniForm">
 
    <form method="POST" action="{% url 'review_comment' proposal.pk %}" class="uniForm">
 
        {% csrf_token %}
symposion/templates/reviews/review_stats.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% block body %}
...
 
@@ -7,7 +10,7 @@
 
        <div class="breadcrumbs">
 
            <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 "indifferent" %}">Indifferent</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 "positive" %}">Positive</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 "controversial" %}">Controversial</a>  |
 
            <a href="{% url 'review_status' section_slug "too_few" %}">Too Few</a> 
 
        </div>
...
 
@@ -44,3 +47,3 @@
 
            <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>
...
 
@@ -51,3 +54,3 @@
 
            <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>
...
 
@@ -58,3 +61,3 @@
 
            <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>
...
 
@@ -65,3 +68,3 @@
 
            <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>
...
 
@@ -72,3 +75,3 @@
 
            <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>
symposion/templates/schedule/_edit_grid.html
Show inline comments
 
{% load url from future %}
 
<table class="calendar table table-bordered">
...
 
@@ -17,5 +18,5 @@
 
                            {% 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 %}
 
                                <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>
...
 
@@ -28,3 +29,3 @@
 
                            {% 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 %}
symposion/templates/schedule/_grid.html
Show inline comments
 
{% load url from future %}
 
<table class="calendar table table-bordered">
...
 
@@ -19,3 +20,3 @@
 
                                <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>
symposion/templates/schedule/_slot_edit.html
Show inline comments
 
{% load url from future %}
 
{% 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">
symposion/templates/schedule/presentation_detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sitetree %}
...
 
@@ -19,3 +22,3 @@
 
        {% 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>
symposion/templates/schedule/schedule_list.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -35,3 +38,3 @@
 
                <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>
symposion/templates/speakers/speaker_create.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -19,3 +22,3 @@
 
            <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>
symposion/templates/speakers/speaker_edit.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -19,3 +22,3 @@
 
            <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>
symposion/templates/speakers/speaker_profile.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
...
 
@@ -19,3 +22,3 @@
 
            {% 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 %}
...
 
@@ -26,3 +29,3 @@
 
            {% 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 %}
symposion/templates/sponsorship/add.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -11,3 +14,3 @@
 
{% block body %}
 
    <form method="POST" action="{% url sponsor_add %}" class="form-horizontal">
 
    <form method="POST" action="{% url 'sponsor_add' %}" class="form-horizontal">
 
        {% csrf_token %}
...
 
@@ -17,3 +20,3 @@
 
            <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>
symposion/templates/sponsorship/apply.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -20,5 +23,5 @@
 
            <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">
 
                <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>
symposion/templates/sponsorship/detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -35,3 +38,3 @@
 
            <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>
symposion/templates/sponsorship/list.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sponsorship_tags %}
...
 
@@ -14,3 +17,3 @@
 
            <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>
 

	
symposion/templates/teams/team_detail.html
Show inline comments
...
 
@@ -2,2 +2,5 @@
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
...
 
@@ -11,3 +14,3 @@
 
            {% if can_join %}
 
                <form method="post" action="{% url team_join team.slug %}">
 
                <form method="post" action="{% url 'team_join' team.slug %}">
 
                    {% csrf_token %}
...
 
@@ -18,3 +21,3 @@
 
            {% if can_leave %}
 
                <form method="post" action="{% url team_leave team.slug %}">
 
                <form method="post" action="{% url 'team_leave' team.slug %}">
 
                    {% csrf_token %}
...
 
@@ -25,3 +28,3 @@
 
            {% if can_apply %}
 
                <form method="post" action="{% url team_apply team.slug %}"> 
 
                <form method="post" action="{% url 'team_apply' team.slug %}"> 
 
                    {% csrf_token %}
...
 
@@ -46,3 +49,3 @@
 
                                <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>
...
 
@@ -59,3 +62,3 @@
 
                                <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>
...
 
@@ -72,4 +75,4 @@
 
                                <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_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_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>
 
                                </td>
0 comments (0 inline, 0 general)