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
 

	
 

	
 
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
 

	
 

	
 
PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/"
 

	
 

	
 
urlpatterns = patterns("symposion.cms.views",
 
    url(r"^files/$", "file_index", name="file_index"),
 
    url(r"^files/create/$", "file_create", name="file_create"),
symposion/conference/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
 

	
 
urlpatterns = patterns("symposion.conference.views",
symposion/proposals/actions.py
Show inline comments
...
 
@@ -23,7 +23,7 @@ def export_as_csv_action(
 
        elif exclude:
 
            excludeset = set(exclude)
 
            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(".", "_")
 
        writer = csv.writer(response)
 
        if header:
symposion/proposals/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
 

	
 
urlpatterns = patterns("symposion.proposals.views",
symposion/proposals/views.py
Show inline comments
 
import hashlib
 
import random
 
import sys
 

	
...
 
@@ -6,7 +7,6 @@ from django.core.exceptions import ObjectDoesNotExist
 
from django.db.models import Q
 
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
 

	
 
from django.contrib import messages
...
 
@@ -37,21 +37,21 @@ def proposal_submit(request):
 
            request.user.speaker_profile
 
        except ObjectDoesNotExist:
 
            return redirect("dashboard")
 
    
 

 
    kinds = []
 
    for proposal_section in ProposalSection.available():
 
        for kind in proposal_section.section.proposal_kinds.all():
 
            kinds.append(kind)
 
    
 

 
    return render(request, "proposals/proposal_submit.html", {
 
        "kinds": kinds,
 
    })
 

	
 

	
 
def proposal_submit_kind(request, kind_slug):
 
    
 

 
    kind = get_object_or_404(ProposalKind, slug=kind_slug)
 
    
 

 
    if not request.user.is_authenticated():
 
        return redirect("home")  # @@@ unauth'd speaker info page?
 
    else:
...
 
@@ -59,12 +59,12 @@ def proposal_submit_kind(request, kind_slug):
 
            speaker_profile = request.user.speaker_profile
 
        except ObjectDoesNotExist:
 
            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":
 
        form = form_class(request.POST)
 
        if form.is_valid():
...
 
@@ -79,7 +79,7 @@ def proposal_submit_kind(request, kind_slug):
 
            return redirect("dashboard")
 
    else:
 
        form = form_class()
 
    
 

 
    return render(request, "proposals/proposal_submit_kind.html", {
 
        "kind": kind,
 
        "form": form,
...
 
@@ -91,17 +91,17 @@ def proposal_speaker_manage(request, pk):
 
    queryset = ProposalBase.objects.select_related("speaker")
 
    proposal = get_object_or_404(queryset, pk=pk)
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

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

 
    if request.method == "POST":
 
        add_speaker_form = AddSpeakerForm(request.POST, proposal=proposal)
 
        if add_speaker_form.is_valid():
 
            message_ctx = {
 
                "proposal": proposal,
 
            }
 
            
 

 
            def create_speaker_token(email_address):
 
                # create token and look for an existing speaker to prevent
 
                # duplicate tokens and confusing the pending speaker
...
 
@@ -110,8 +110,8 @@ def proposal_speaker_manage(request, pk):
 
                        Q(user=None, invite_email=email_address)
 
                    )
 
                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(
 
                        invite_email=email_address,
 
                        invite_token=token,
...
 
@@ -173,14 +173,14 @@ def proposal_edit(request, pk):
 

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

 
    if not proposal.can_edit():
 
        ctx = {
 
            "title": "Proposal editing closed",
 
            "body": "Proposal editing is closed for this session type."
 
        }
 
        return render(request, "proposals/proposal_error.html", ctx)
 
    
 

 
    form_class = get_form(settings.PROPOSAL_FORMS[proposal.kind.slug])
 

	
 
    if request.method == "POST":
...
 
@@ -206,7 +206,7 @@ def proposal_edit(request, pk):
 
            return redirect("proposal_detail", proposal.pk)
 
    else:
 
        form = form_class(instance=proposal)
 
    
 

 
    return render(request, "proposals/proposal_edit.html", {
 
        "proposal": proposal,
 
        "form": form,
...
 
@@ -218,22 +218,22 @@ def proposal_detail(request, pk):
 
    queryset = ProposalBase.objects.select_related("speaker", "speaker__user")
 
    proposal = get_object_or_404(queryset, pk=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:
 
        from symposion.reviews.forms import SpeakerCommentForm
 
        message_form = SpeakerCommentForm()
 
        if request.method == "POST":
 
            message_form = SpeakerCommentForm(request.POST)
 
            if message_form.is_valid():
 
                
 

 
                message = message_form.save(commit=False)
 
                message.user = request.user
 
                message.proposal = proposal
 
                message.save()
 
                
 

 
                ProposalMessage = SpeakerCommentForm.Meta.model
 
                reviewers = User.objects.filter(
 
                    id__in=ProposalMessage.objects.filter(
...
 
@@ -242,7 +242,7 @@ def proposal_detail(request, pk):
 
                        user=request.user
 
                    ).distinct().values_list("user", flat=True)
 
                )
 
                
 

 
                for reviewer in reviewers:
 
                    ctx = {
 
                        "proposal": proposal,
...
 
@@ -253,13 +253,13 @@ def proposal_detail(request, pk):
 
                        [reviewer.email], "proposal_new_message",
 
                        context=ctx
 
                    )
 
                
 

 
                return redirect(request.path)
 
        else:
 
            message_form = SpeakerCommentForm()
 
    else:
 
        message_form = None
 
    
 

 
    return render(request, "proposals/proposal_detail.html", {
 
        "proposal": proposal,
 
        "message_form": message_form
...
 
@@ -271,7 +271,7 @@ def proposal_cancel(request, pk):
 
    queryset = ProposalBase.objects.select_related("speaker")
 
    proposal = get_object_or_404(queryset, pk=pk)
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

 
    if proposal.speaker.user != request.user:
 
        return HttpResponseForbidden()
 

	
...
 
@@ -281,7 +281,7 @@ def proposal_cancel(request, pk):
 
        # @@@ fire off email to submitter and other speakers
 
        messages.success(request, "%s has been cancelled" % proposal.title)
 
        return redirect("dashboard")
 
    
 

 
    return render(request, "proposals/proposal_cancel.html", {
 
        "proposal": proposal,
 
    })
...
 
@@ -339,10 +339,10 @@ def document_create(request, proposal_pk):
 
    queryset = ProposalBase.objects.select_related("speaker")
 
    proposal = get_object_or_404(queryset, pk=proposal_pk)
 
    proposal = ProposalBase.objects.get_subclass(pk=proposal.pk)
 
    
 

 
    if proposal.cancelled:
 
        return HttpResponseForbidden()
 
    
 

 
    if request.method == "POST":
 
        form = SupportingDocumentCreateForm(request.POST, request.FILES)
 
        if form.is_valid():
...
 
@@ -353,7 +353,7 @@ def document_create(request, proposal_pk):
 
            return redirect("proposal_detail", proposal.pk)
 
    else:
 
        form = SupportingDocumentCreateForm()
 
        
 

 
    return render(request, "proposals/document_create.html", {
 
        "proposal": proposal,
 
        "form": form,
...
 
@@ -378,8 +378,8 @@ def document_download(request, pk, *args):
 
def document_delete(request, pk):
 
    document = get_object_or_404(SupportingDocument, pk=pk, uploaded_by=request.user)
 
    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
 

	
 

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

	
 

	
 
urlpatterns = patterns("symposion.schedule.views",
symposion/schedule/views.py
Show inline comments
...
 
@@ -78,7 +78,7 @@ def schedule_list_csv(request, slug=None):
 
    presentations = Presentation.objects.filter(section=schedule.section)
 
    presentations = presentations.exclude(cancelled=True).order_by("id")
 

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

	
 

	
 
urlpatterns = patterns("symposion.speakers.views",
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
 

	
 

	
 
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"),
 
    url(r"^add/$", "sponsor_add", name="sponsor_add"),
 
    url(r"^(?P<pk>\d+)/$", "sponsor_detail", name="sponsor_detail"),
symposion/teams/urls.py
Show inline comments
 
from django.conf.urls.defaults import patterns, url
 
from django.conf.urls import patterns, url
 

	
 

	
 
urlpatterns = patterns("symposion.teams.views",
symposion/templates/cms/file_create.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 

	
 
{% block head_title %}Upload File{% endblock %}
...
 
@@ -8,7 +11,7 @@
 
    <div class="row">
 
        <div class="span12">
 
            <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 %}
 
                {{ form|as_bootstrap }}
 
                <div class="form-actions">
symposion/templates/cms/file_index.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% block head_title %}Uploaded Files{% endblock %}
 

	
 
{% block body_outer %}
...
 
@@ -9,7 +12,7 @@
 
                    
 
            {% for file in files %}
 
                <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 %}
 
                        <button type="submit" class="btn btn-error"><i class="icon-trash"></i> delete</button>
 
                    </form>
...
 
@@ -20,7 +23,7 @@
 
                <p>No uploaded files.</p>
 
            {% endfor %}
 
            <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>
 
                    Add File
 
                </a>
symposion/templates/cms/page_detail.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sitetree %}
 
{% load i18n %}
 

	
...
 
@@ -12,7 +15,7 @@
 
{% block body %}
 
    {% if editable %}
 
        <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>
 
    {% endif %}
 
    <h2>{{ page.title }}</h2>
symposion/templates/conference/user_list.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load sitetree %}
 

	
...
 
@@ -68,9 +71,9 @@
 
                            <td>{{ user.get_full_name }}</td>
 
                            <td>
 
                                {% 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 %}
 
                            </td>
 
                        </tr>
symposion/templates/dashboard.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load proposal_tags %}
 
{% load review_tags %}
...
 
@@ -16,14 +19,14 @@
 
            <h3>{% trans "Speaking" %}</h3>
 
            <div class="pull-right header-actions">
 
                {% 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
 
                    </a>
 
                {% 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
 
                    </a>
 
                {% endif %}
...
 
@@ -32,7 +35,7 @@
 
        
 
        <div class="dashboard-panel-content">
 
            {% 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 %}
 
                <h4>Your Proposals</h4>
 
                {% if user.speaker_profile.proposals.exists %}
...
 
@@ -92,7 +95,7 @@
 
            <h3>{% trans "Sponsorship" %}</h3>
 
            <div class="pull-right header-actions">
 
                {% 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
 
                    </a>
 
                {% endif %}
...
 
@@ -101,13 +104,13 @@
 
        
 
        <div class="dashboard-panel-content">
 
            {% 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 %}
 
                <h4>Your Sponsorship</h4>
 
                <ul>
 
                    {% for sponsorship in user.sponsorships.all %}
 
                        <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 }})
 
                            {% if not sponsorship.active %}
 
                                <span class="label label-warning">awaiting approval</span>
...
 
@@ -118,7 +121,7 @@
 
            {% endif %}
 
            {% if user.is_staff %}
 
                <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.
 
                </p>
 
            {% endif %}
...
 
@@ -138,9 +141,9 @@
 
                <ul>
 
                    {% for section in review_sections %}
 
                        <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 %}
 
                </ul>
 
                
...
 
@@ -183,7 +186,7 @@
 
                        {% for membership in user.memberships.all %}
 
                            <tr>
 
                                <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 %}
 
                                </td>
 
                                <td>
...
 
@@ -204,7 +207,7 @@
 
                        {% for team in available_teams %}
 
                            <tr>
 
                                <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 %}
 
                                </td>
 
                                <td>
symposion/templates/emails/proposal_new_message/message.html
Show inline comments
 
{% load url from future %}
 
{% load account_tags %}
 
<p>
 
    <b>{% user_display message.user %}</b> has added a message on <b>{{ proposal.title }}</b>.
...
 
@@ -6,6 +7,6 @@
 
    {{ message.message|safe }}
 
</blockquote>
 
<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>
 
</p>
...
 
\ No newline at end of file
symposion/templates/emails/proposal_updated/message.html
Show inline comments
 
{% load url from future %}
 
{% load account_tags %}
 
<p>
 
    <b>{% user_display user %}</b> has made changes to <b>{{ proposal.title }}</b> which you have previously reviewed or commented on.
 
</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>
 
</p>
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
 
    talk proposal for {{ current_site.name }} entitled "{{ proposal.title }}".</p>
 

	
 
<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
 
    talk proposal for {{ current_site.name }} entitled "{{ proposal.title }}".</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>
 

	
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
 
    talk proposal for {{ current_site.name }} entitled "{{ proposal.title }}".</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 and fill out your speaker profile.</p>
symposion/templates/proposals/_pending_proposal_row.html
Show inline comments
 
{% load url from future %}
 
{% load i18n %}
 

	
 
<tr>
 
    <td>
 
        <a href="{% url proposal_detail proposal.pk %}">{{ proposal.title }}</a>
 
        <a href="{% url 'proposal_detail' proposal.pk %}">{{ proposal.title }}</a>
 
    </td>
 
    
 
    <td>{{ proposal.kind.name }}</td>
...
 
@@ -31,9 +32,9 @@
 
                <span class="caret"></span>
 
                </a>
 
                <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>
 
                </ul>
 
            </div>
symposion/templates/proposals/_proposal_fields.html
Show inline comments
 
{% load url from future %}
 
{% load i18n %}
 

	
 
<dl class="dl-horizontal">
...
 
@@ -45,7 +46,7 @@
 
                    <tr>
 
                        <td><a href="{{ document.download_url }}">{{ document.description }}</a></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 %}
 
                            <button type="submit" class="btn btn-mini">delete</button>
 
                        </form>
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>
 
    
 
    <td>{{ proposal.kind.name }}</td>
...
 
@@ -24,8 +25,8 @@
 
    <td>
 
        {% if not proposal.cancelled %}
 
            {% 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 %}
 
        {% endif %}
 
    </td>
symposion/templates/proposals/proposal_cancel.html
Show inline comments
 
{% extends "proposals/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 

	
 
{% load bootstrap_tags %}
...
 
@@ -13,6 +16,6 @@
 
        {% csrf_token %}
 
        <p>Are you sure you want to cancel <b>{{ proposal.title }}</b>?</p>
 
        <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>
 
{% endblock %}
symposion/templates/proposals/proposal_detail.html
Show inline comments
 
{% extends "proposals/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load account_tags %}
 
{% load bootstrap_tags %}
...
 
@@ -10,14 +13,14 @@
 
    <div class="pull-right">
 
        {% if not proposal.cancelled %}
 
            {% 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" %}
 
                </a>
 
            {% 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" %}
 
                </a>
 
            {% endif %}
...
 
@@ -52,7 +55,7 @@
 
                                <tr>
 
                                    <td><a href="{{ document.download_url }}">{{ document.description }}</a></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 %}
 
                                        <button type="submit" class="btn btn-mini">{% trans 'delete' %}</button>
 
                                    </form>
...
 
@@ -63,7 +66,7 @@
 
                    {% else %}
 
                        <p>{% trans 'No supporting documents attached to this proposal.' %}</p>
 
                    {% 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>
 
            {% endif %}
 
    
symposion/templates/proposals/proposal_edit.html
Show inline comments
 
{% extends "proposals/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 
{% load markitup_tags %}
 

	
...
 
@@ -8,7 +11,7 @@
 
{% block body %}
 
    <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">
 
        {% csrf_token %}
...
 
@@ -17,7 +20,7 @@
 
        </fieldset>
 
        <div class="form-actions">
 
            <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>
 
    </form>
 
{% endblock %}
symposion/templates/proposals/proposal_speaker_manage.html
Show inline comments
 
{% extends "proposals/base.html" %}
 

	
 
{% load url from future %}
 

	
 
{% load i18n %}
 

	
 
{% load bootstrap_tags %}
...
 
@@ -7,7 +10,7 @@
 
    <h1>{% trans 'Proposal:' %} {{ proposal.title }}</h1>
 
    
 
    <p>
 
      <a href="{% url proposal_edit proposal.pk %}">{% trans 'Edit proposal' %}
 
      <a href="{% url 'proposal_edit' proposal.pk %}">{% trans 'Edit proposal' %}
 
      </a>
 
    </p>
 
    
symposion/templates/proposals/proposal_submit.html
Show inline comments
 
{% extends "proposals/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load boxes_tags %}
 
{% load i18n %}
 

	
...
 
@@ -13,7 +16,7 @@
 
    
 
        <ul>
 
            {% 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 %}
 
        </ul>
 
    {% else %}
symposion/templates/reviews/_review_table.html
Show inline comments
 
{% load url from future %}
 
{% load i18n %}
 

	
 
<table class="table table-striped table-bordered table-reviews">
...
 
@@ -18,7 +19,7 @@
 
            <tr class="{{ proposal.user_vote_css }}">
 
                <td>{{ proposal.number }}</td>
 
                <td>
 
                    <a href="{% url review_detail proposal.pk %}">
 
                    <a href="{% url 'review_detail' proposal.pk %}">
 
                        <small><strong>{{ proposal.speaker }}</strong></small>
 
                        <br />
 
                        {{ proposal.title }}
symposion/templates/reviews/base.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load sitetree %}
 

	
...
 
@@ -60,25 +63,25 @@
 
                            {{ section }}
 
                        </li>
 
                        <li>
 
                            <a href="{% url review_section section.section.slug %}">
 
                            <a href="{% url 'review_section' section.section.slug %}">
 
                                {% trans "All Reviews" %}
 
                            </a>
 
                        </li>
 
                        {% comment %}
 
                        <li>
 
                            <a href="{% url review_section_assignments section.section.slug %}">
 
                            <a href="{% url 'review_section_assignments' section.section.slug %}">
 
                                {% trans "Your Assignments" %}
 
                            </a>
 
                        </li>
 
                        {% endcomment %}
 
                        <li>
 
                            <a href="{% url review_status section.section.slug %}">
 
                            <a href="{% url 'review_status' section.section.slug %}">
 
                                {% trans "Voting Status" %}
 
                            </a>
 
                        </li>
 
                        {% if request.user.is_staff %}
 
                            <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>
 
                        {% endif %}
 
                    {% endfor %}
symposion/templates/reviews/result_notification.html
Show inline comments
 
{% extends "reviews/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 

	
 
{% block extra_style %}
...
 
@@ -13,14 +16,14 @@
 
{% block body %}
 
    
 
    <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>
 
    
 
    <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 %}
 
        
...
 
@@ -54,7 +57,7 @@
 
                        <td><input class="action-select" type="checkbox" name="_selected_action" value="{{ proposal.pk }}"></td>
 
                        <td>{{ proposal.number }}</td>
 
                        <td>
 
                            <a href="{% url review_detail proposal.pk %}">
 
                            <a href="{% url 'review_detail' proposal.pk %}">
 
                                <small><strong>{{ proposal.speaker }}</strong></small>
 
                                <br />
 
                                {{ proposal.title }}
symposion/templates/reviews/result_notification_prepare.html
Show inline comments
 
{% extends "reviews/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 

	
 
{% block body %}
...
 
@@ -23,7 +26,7 @@
 
        <div class="span6">
 
            <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 %}
 
                
...
 
@@ -42,7 +45,7 @@
 
                {% include "reviews/_result_notification_prepare_help.html" %}
 
                
 
                <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>
 
        </div>
 
    </form>
symposion/templates/reviews/review_admin.html
Show inline comments
 
{% extends "reviews/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% block body %}
 
    <h1>Reviewers</h1>
 
    
...
 
@@ -30,7 +33,7 @@
 
        {% for reviewer in reviewers %}
 
        <tr>
 
            <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>
 
                {{ reviewer.total_votes }}
symposion/templates/reviews/review_assignment.html
Show inline comments
 
{% extends "reviews/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% block body %}
 
    <h1>Review Assignments</h1>
 
    
...
 
@@ -13,12 +16,12 @@
 
            {% for assignment in assignments %}
 
                <tr>
 
                    <td>
 
                        <a href="{% url review_detail assignment.proposal.pk %}">
 
                        <a href="{% url 'review_detail' assignment.proposal.pk %}">
 
                            {{ assignment.proposal.title }}
 
                        </a>
 
                    </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 %}
 
                            <input type="submit" value="Opt-out" />
 
                        </form>
symposion/templates/reviews/review_detail.html
Show inline comments
 
{% extends "reviews/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load markitup_tags %}
 
{% load bootstrap_tags %}
...
 
@@ -126,7 +129,7 @@
 
                            </div>
 
                            {% if is_manager %}
 
                                <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 %}
 
                                        <button class="btn btn-mini btn-danger" type="submit">Delete</button>
 
                                    </form>
symposion/templates/reviews/review_review.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load markitup_tags %}
 
{% load uni_form_tags %}
 

	
...
 
@@ -55,7 +58,7 @@
 

	
 
    <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 %}
 
        <fieldset class="inlineLabels">
 
            {{ review_form|as_uni_form }}
...
 
@@ -67,7 +70,7 @@
 
    
 
    <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 %}
 
        <fieldset>
 
            {{ comment_form|as_uni_form }}
symposion/templates/reviews/review_stats.html
Show inline comments
 
{% extends "reviews/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% block body %}
 
    <h1>Voting Status ({{ section_slug }})</h1>
 
    
 
    {% if key %}
 
        <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>
 

	
 
        <div>
...
 
@@ -42,35 +45,35 @@
 
        
 
        <dl>
 
            <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>
 
            </dt>
 
            <dd>
 
                proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no &minus;1s
 
            </dd>
 
            <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>
 
            </dt>
 
            <dd>
 
                proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one &minus;1 and no +1s
 
            </dd>
 
            <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>
 
            </dt>
 
            <dd>
 
                proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a &minus;1
 
            </dd>
 
            <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>
 
            </dt>
 
            <dd>
 
                proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and &minus;1
 
            </dd>
 
            <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>
 
            </dt>
 
            <dd>
symposion/templates/schedule/_edit_grid.html
Show inline comments
 
{% load url from future %}
 
<table class="calendar table table-bordered">
 
    <thead>
 
        <tr>
...
 
@@ -15,9 +16,9 @@
 
                    <td class="slot slot-{{ slot.kind.label }}" colspan="{{ slot.colspan }}" rowspan="{{ slot.rowspan }}">
 
                        {% if slot.kind.label == "talk" or slot.kind.label == "tutorial" %}
 
                            {% 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>
 
                            {% endif %}
 
                        {% else %}
...
 
@@ -26,7 +27,7 @@
 
                            {% else %}
 
                                {{ slot.kind.label }}
 
                            {% 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 %}
 
                    </td>
 
                {% endfor %}
symposion/templates/schedule/_grid.html
Show inline comments
 
{% load url from future %}
 
<table class="calendar table table-bordered">
 
    <thead>
 
        <tr>
...
 
@@ -17,7 +18,7 @@
 
                            {% if not slot.content %}
 
                            {% else %}
 
                                <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 class="speaker">
 
                                    {{ slot.content.speakers|join:", " }}
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">
 
        <a class="close" data-dismiss="modal">&times;</a>
 
        <h3>{% trans "Edit Slot" %}</h3>
symposion/templates/schedule/presentation_detail.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sitetree %}
 

	
 
{% block head_title %}Presentation: {{ presentation.title }}{% endblock %}
...
 
@@ -17,7 +20,7 @@
 

	
 
    <h4>
 
        {% 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>
 

	
 
    <dl class="dl-horizontal">
symposion/templates/schedule/schedule_list.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load cache %}
 
{% load sitetree %}
...
 
@@ -33,7 +36,7 @@
 
        {% for presentation in presentations %}
 
            <div class="row">
 
                <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>
 
                    {{ presentation.description }}
 
                    {% if presentation.slot %}
symposion/templates/speakers/speaker_create.html
Show inline comments
 
{% extends "speakers/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 
{% load i18n %}
 
{% load boxes_tags %}
...
 
@@ -17,7 +20,7 @@
 
        </fieldset>
 
        <div class="form-actions">
 
            <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>
 
    </form>
 
{% endblock %}
symposion/templates/speakers/speaker_edit.html
Show inline comments
 
{% extends "speakers/base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 
{% load i18n %}
 
{% load boxes_tags %}
...
 
@@ -17,7 +20,7 @@
 
        </fieldset>
 
        <div class="form-actions">
 
            <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>
 
    </form>
 
{% endblock %}
symposion/templates/speakers/speaker_profile.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load i18n %}
 
{% load thumbnail %}
 

	
...
 
@@ -17,14 +20,14 @@
 
        </div>
 
        <div class="span6">
 
            {% 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 %}
 
            <h1>{{ speaker.name }}</h1>
 
            <div class="bio">{{ speaker.biography|safe }}</div>
 
            
 
            <h2>Presentations</h2>
 
            {% 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 %}
 
                    <p>
 
                        {{ presentation.slot.day.date|date:"l" }}
symposion/templates/sponsorship/add.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 
{% load i18n %}
 
{% load boxes_tags %}
...
 
@@ -9,13 +12,13 @@
 
{% block body_class %}sponsorships{% endblock %}
 

	
 
{% block body %}
 
    <form method="POST" action="{% url sponsor_add %}" class="form-horizontal">
 
    <form method="POST" action="{% url 'sponsor_add' %}" class="form-horizontal">
 
        {% csrf_token %}
 
        <legend>{% trans "Add a Sponsor" %}</legend>
 
        {{ form|as_bootstrap }}
 
        <div class="form-actions">
 
            <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>
 
    </form>
 

	
symposion/templates/sponsorship/apply.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 
{% load i18n %}
 
{% load boxes_tags %}
...
 
@@ -18,9 +21,9 @@
 
        {{ form|as_bootstrap }}
 
        <div class="form-actions">
 
            <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>
 
        </div>
 
    </form>
symposion/templates/sponsorship/detail.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 
{% load i18n %}
 

	
...
 
@@ -33,7 +36,7 @@
 

	
 
        <div class="form-actions">
 
            <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>
 

	
 
    </form>
symposion/templates/sponsorship/list.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load sponsorship_tags %}
 
{% load thumbnail %}
 
{% load i18n %}
...
 
@@ -12,7 +15,7 @@
 
    <div class="row">
 
        <div class="span12">
 
            <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 %}
 
            {% for level in levels %}
symposion/templates/teams/team_detail.html
Show inline comments
 
{% extends "site_base.html" %}
 

	
 
{% load url from future %}
 

	
 

	
 
{% load bootstrap_tags %}
 

	
 
{% block head_title %}{{ team.name }}{% endblock %}
...
 
@@ -9,21 +12,21 @@
 
        <div class="span12">
 
            <div class="pull-right">
 
            {% if can_join %}
 
                <form method="post" action="{% url team_join team.slug %}">
 
                <form method="post" action="{% url 'team_join' team.slug %}">
 
                    {% csrf_token %}
 
                    <input type="submit" class="btn btn-primary" value="join">
 
                </form>
 
            {% endif %}
 
            
 
            {% if can_leave %}
 
                <form method="post" action="{% url team_leave team.slug %}">
 
                <form method="post" action="{% url 'team_leave' team.slug %}">
 
                    {% csrf_token %}
 
                    <input type="submit" class="btn" value="leave">
 
                </form>
 
            {% endif %}
 
            
 
            {% if can_apply %}
 
                <form method="post" action="{% url team_apply team.slug %}"> 
 
                <form method="post" action="{% url 'team_apply' team.slug %}"> 
 
                    {% csrf_token %}
 
                    <input type="submit" class="btn btn-primary" value="apply">
 
                </form>
...
 
@@ -44,7 +47,7 @@
 
                            <tr>
 
                                <td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</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>
 
                            </tr>
 
                        {% endfor %}
...
 
@@ -57,7 +60,7 @@
 
                            <tr>
 
                                <td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</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>
 
                            </tr>
 
                        {% endfor %}
...
 
@@ -70,8 +73,8 @@
 
                            <tr>
 
                                <td>{{ membership.user.email }}</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_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>
 
                            </tr>
 
                        {% endfor %}
0 comments (0 inline, 0 general)