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

Updated urls to 1.6

Browse source
This commit is contained in:
Volodymyr Hotsyk 2014-07-05 16:46:01 +03:00
parent 3ad6d4cfef
commit fc4b1c4542
38 changed files with 191 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -60,7 +60,7 @@
<th>{% trans "Name" %}</th> <th>{% trans "Name" %}</th>
<th>{% trans "Speaker Profile?" %}</th> <th>{% trans "Speaker Profile?" %}</th>
</thead> </thead>
<tbody> <tbody>
{% for user in users %} {% for user in users %}
<tr> <tr>
@ -68,9 +68,9 @@
<td>{{ user.get_full_name }}</td> <td>{{ user.get_full_name }}</td>
<td> <td>
{% if user.speaker_profile %} {% if user.speaker_profile %}
<a href="{% url speaker_profile user.speaker_profile.pk %}">{{ user.speaker_profile }}</a> <a href="{% url "speaker_profile" user.speaker_profile.pk %}">{{ user.speaker_profile }}</a>
{% else %} {% else %}
<a href="{% url speaker_create_staff user.pk %}" class="btn btn-mini">create</a> <a href="{% url "speaker_create_staff" user.pk %}" class="btn btn-mini">create</a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

48
symposion/templates/dashboard.html
View file

@ -16,23 +16,23 @@
<h3>{% trans "Speaking" %}</h3> <h3>{% trans "Speaking" %}</h3>
<div class="pull-right header-actions"> <div class="pull-right header-actions">
{% if not user.speaker_profile %} {% if not user.speaker_profile %}
<a href="{% url speaker_create %}" class="btn"> <a href="{% url "speaker_create" %}" class="btn">
<i class="icon-plus-sign"></i> Create a speaker profile <i class="icon-plus-sign"></i> Create a speaker profile
</a> </a>
{% else %} {% else %}
<a href="{% url speaker_edit %}" class="btn"> <a href="{% url "speaker_edit" %}" class="btn">
<i class="icon-pencil"></i> Edit your speaker profile <i class="icon-pencil"></i> Edit your speaker profile
</a> </a>
<a href="{% url proposal_submit %}" class="btn"> <a href="{% url "proposal_submit" %}" class="btn">
<i class="icon-plus-sign"></i> Submit a new proposal <i class="icon-plus-sign"></i> Submit a new proposal
</a> </a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="dashboard-panel-content"> <div class="dashboard-panel-content">
{% if not user.speaker_profile %} {% if not user.speaker_profile %}
<p>To submit a proposal, you must first <a href="{% url speaker_create %}">create a speaker profile</a>.</p> <p>To submit a proposal, you must first <a href="{% url "speaker_create" %}">create a speaker profile</a>.</p>
{% else %} {% else %}
<h4>Your Proposals</h4> <h4>Your Proposals</h4>
{% if user.speaker_profile.proposals.exists %} {% if user.speaker_profile.proposals.exists %}
@ -50,7 +50,7 @@
{% else %} {% else %}
<p>No proposals submitted yet.</p> <p>No proposals submitted yet.</p>
{% endif %} {% endif %}
{% associated_proposals as associated_proposals %} {% associated_proposals as associated_proposals %}
{% if associated_proposals %} {% if associated_proposals %}
<h4>Proposals you have joined as an additional speaker</h4> <h4>Proposals you have joined as an additional speaker</h4>
@ -66,7 +66,7 @@
{% endfor %} {% endfor %}
</table> </table>
{% endif %} {% endif %}
{% pending_proposals as pending_proposals %} {% pending_proposals as pending_proposals %}
{% if pending_proposals %} {% if pending_proposals %}
<h4>Proposals you have been invited to join</h4> <h4>Proposals you have been invited to join</h4>
@ -85,29 +85,29 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="dashboard-panel"> <div class="dashboard-panel">
<div class="dashboard-panel-header"> <div class="dashboard-panel-header">
<i class="icon-briefcase"></i> <i class="icon-briefcase"></i>
<h3>{% trans "Sponsorship" %}</h3> <h3>{% trans "Sponsorship" %}</h3>
<div class="pull-right header-actions"> <div class="pull-right header-actions">
{% if not user.sponsorships.exists %} {% if not user.sponsorships.exists %}
<a href="{% url sponsor_apply %}" class="btn"> <a href="{% url "sponsor_apply" %}" class="btn">
<i class="icon-plus-sign"></i> Apply to be a sponsor <i class="icon-plus-sign"></i> Apply to be a sponsor
</a> </a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="dashboard-panel-content"> <div class="dashboard-panel-content">
{% if not user.sponsorships.exists %} {% if not user.sponsorships.exists %}
<p>If you or your organization would be interested in sponsorship opportunities, <a href="{% url sponsor_apply %}">use our online form to apply to be a sponsor</a>. <p>If you or your organization would be interested in sponsorship opportunities, <a href="{% url "sponsor_apply" %}">use our online form to apply to be a sponsor</a>.
{% else %} {% else %}
<h4>Your Sponsorship</h4> <h4>Your Sponsorship</h4>
<ul> <ul>
{% for sponsorship in user.sponsorships.all %} {% for sponsorship in user.sponsorships.all %}
<li> <li>
<a href="{% url sponsor_detail sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a> <a href="{% url "sponsor_detail" sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a>
({{ sponsorship.level }}) ({{ sponsorship.level }})
{% if not sponsorship.active %} {% if not sponsorship.active %}
<span class="label label-warning">awaiting approval</span> <span class="label label-warning">awaiting approval</span>
@ -118,32 +118,32 @@
{% endif %} {% endif %}
{% if user.is_staff %} {% if user.is_staff %}
<p> <p>
As staff, you can directly <a href="{% url sponsor_add %}">add a sponsor</a> if the organization isn't As staff, you can directly <a href="{% url "sponsor_add" %}">add a sponsor</a> if the organization isn't
applying themselves. applying themselves.
</p> </p>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% if review_sections %} {% if review_sections %}
<div class="dashboard-panel"> <div class="dashboard-panel">
<div class="dashboard-panel-header"> <div class="dashboard-panel-header">
<i class="icon-briefcase"></i> <i class="icon-briefcase"></i>
<h3>{% trans "Reviews" %}</h3> <h3>{% trans "Reviews" %}</h3>
</div> </div>
<div class="dashboard-panel-content"> <div class="dashboard-panel-content">
<h4>Reviews by Section</h4> <h4>Reviews by Section</h4>
<ul> <ul>
{% for section in review_sections %} {% for section in review_sections %}
<h5>{{ section }}</h5> <h5>{{ section }}</h5>
<li><a href="{% url review_section section.section.slug %}">All</a></li> <li><a href="{% url "review_section" section.section.slug %}">All</a></li>
<li><a href="{% url user_reviewed section.section.slug %}">Reviewed by you</a></li> <li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
<li><a href="{% url user_not_reviewed section.section.slug %}">Not Reviewed by you</a></li> <li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% comment %} {% comment %}
<h4>My Assignments</h4> <h4>My Assignments</h4>
<table class="table"> <table class="table">
@ -163,11 +163,11 @@
</tbody> </tbody>
</table> </table>
{% endcomment %} {% endcomment %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% available_teams as available_teams %} {% available_teams as available_teams %}
{% if user.memberships.exists or available_teams %} {% if user.memberships.exists or available_teams %}
<div class="dashboard-panel"> <div class="dashboard-panel">
@ -175,7 +175,7 @@
<i class="icon-group"></i> <i class="icon-group"></i>
<h3>{% trans "Teams" %}</h3> <h3>{% trans "Teams" %}</h3>
</div> </div>
<div class="dashboard-panel-content"> <div class="dashboard-panel-content">
{% if user.memberships.exists %} {% if user.memberships.exists %}
<h4>Your Teams</h4> <h4>Your Teams</h4>
@ -183,7 +183,7 @@
{% for membership in user.memberships.all %} {% for membership in user.memberships.all %}
<tr> <tr>
<td> <td>
<a href="{% url team_detail membership.team.slug %}">{{ membership.team.name }}</a> <a href="{% url "team_detail" membership.team.slug %}">{{ membership.team.name }}</a>
{% if membership.team.description %}<br>{{ membership.team.description }}{% endif %} {% if membership.team.description %}<br>{{ membership.team.description }}{% endif %}
</td> </td>
<td> <td>

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

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

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

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

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

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

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

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

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

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

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

@ -3,13 +3,13 @@
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>{% trans "Submitted by" %}</dt> <dt>{% trans "Submitted by" %}</dt>
<dd>{{ proposal.speaker }}</dd> <dd>{{ proposal.speaker }}</dd>
<dt>{% trans "Track" %}</dt> <dt>{% trans "Track" %}</dt>
<dd>{{ proposal.track }}&nbsp;</dd> <dd>{{ proposal.track }}&nbsp;</dd>
<dt>{% trans "Audience Level" %}</dt> <dt>{% trans "Audience Level" %}</dt>
<dd>{{ proposal.get_audience_level_display }}&nbsp;</dd> <dd>{{ proposal.get_audience_level_display }}&nbsp;</dd>
{% if proposal.additional_speakers.all %} {% if proposal.additional_speakers.all %}
<dt>{% trans "Additional Speakers" %}</dt> <dt>{% trans "Additional Speakers" %}</dt>
<dd> <dd>
@ -24,19 +24,19 @@
{% endfor %} {% endfor %}
</dd> </dd>
{% endif %} {% endif %}
<dt>{% trans "Description" %}</dt> <dt>{% trans "Description" %}</dt>
<dd>{{ proposal.description }}&nbsp;</dd> <dd>{{ proposal.description }}&nbsp;</dd>
<dt>{% trans "Abstract" %}</dt> <dt>{% trans "Abstract" %}</dt>
<dd>{{ proposal.abstract|safe }}&nbsp;</dd> <dd>{{ proposal.abstract|safe }}&nbsp;</dd>
<dt>{% trans "Notes" %}</dt> <dt>{% trans "Notes" %}</dt>
<dd>{{ proposal.additional_notes|safe }}&nbsp;</dd> <dd>{{ proposal.additional_notes|safe }}&nbsp;</dd>
<dt>{% trans "Speaker Bio" %}</dt> <dt>{% trans "Speaker Bio" %}</dt>
<dd>{{ proposal.speaker.biography|safe }}&nbsp;</dd> <dd>{{ proposal.speaker.biography|safe }}&nbsp;</dd>
<dt>{% trans "Documents" %}</dt> <dt>{% trans "Documents" %}</dt>
<dd> <dd>
{% if proposal.supporting_documents.exists %} {% if proposal.supporting_documents.exists %}
@ -45,7 +45,7 @@
<tr> <tr>
<td><a href="{{ document.download_url }}">{{ document.description }}</a></td> <td><a href="{{ document.download_url }}">{{ document.description }}</a></td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url proposal_document_delete document.pk %}"> <form style="margin: 0;" method="post" action="{% url "proposal_document_delete" document.pk %}">
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-mini">delete</button> <button type="submit" class="btn btn-mini">delete</button>
</form> </form>

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

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

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

@ -8,11 +8,11 @@
{% block body %} {% block body %}
<h1>Cancel: {{ proposal.title }}</h1> <h1>Cancel: {{ proposal.title }}</h1>
<form method="POST" action="" enctype="multipart/form-data"> <form method="POST" action="" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<p>Are you sure you want to cancel <b>{{ proposal.title }}</b>?</p> <p>Are you sure you want to cancel <b>{{ proposal.title }}</b>?</p>
<input class="btn btn-danger" type="submit" value="I am sure" /> <input class="btn btn-danger" type="submit" value="I am sure" />
<a class="btn" href="{% url proposal_detail proposal.pk %}">{% trans 'No, keep it for now' %}</a> <a class="btn" href="{% url "proposal_detail" proposal.pk %}">{% trans 'No, keep it for now' %}</a>
</form> </form>
{% endblock %} {% endblock %}

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

@ -10,14 +10,14 @@
<div class="pull-right"> <div class="pull-right">
{% if not proposal.cancelled %} {% if not proposal.cancelled %}
{% if request.user == proposal.speaker.user %} {% if request.user == proposal.speaker.user %}
<a href="{% url proposal_edit proposal.pk %}" class="btn"> <a href="{% url "proposal_edit" proposal.pk %}" class="btn">
{% trans "Edit this proposal" %} {% trans "Edit this proposal" %}
</a> </a>
<a href="{% url proposal_cancel proposal.pk %}" class="btn"> <a href="{% url "proposal_cancel" proposal.pk %}" class="btn">
{% trans "Cancel this proposal" %} {% trans "Cancel this proposal" %}
</a> </a>
{% else %} {% else %}
<a href="{% url proposal_leave proposal.pk %}" class="btn"> <a href="{% url "proposal_leave" proposal.pk %}" class="btn">
{% trans "Remove me from this proposal" %} {% trans "Remove me from this proposal" %}
</a> </a>
{% endif %} {% endif %}
@ -25,9 +25,9 @@
{% trans 'Cancelled' } {% trans 'Cancelled' }
{% endif %} {% endif %}
</div> </div>
<h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}, Track: {{ proposal.track }})</h3> <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}, Track: {{ proposal.track }})</h3>
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li> <li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
@ -45,14 +45,14 @@
{% if request.user == proposal.speaker.user %} {% if request.user == proposal.speaker.user %}
<div class="tab-pane" id="proposal-documents"> <div class="tab-pane" id="proposal-documents">
<h3>{% trans 'Supporting Documents' %}</h3> <h3>{% trans 'Supporting Documents' %}</h3>
{% if proposal.supporting_documents.exists %} {% if proposal.supporting_documents.exists %}
<table class="table table-striped"> <table class="table table-striped">
{% for document in proposal.supporting_documents.all %} {% for document in proposal.supporting_documents.all %}
<tr> <tr>
<td><a href="{{ document.download_url }}">{{ document.description }}</a></td> <td><a href="{{ document.download_url }}">{{ document.description }}</a></td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url proposal_document_delete document.pk %}"> <form style="margin: 0;" method="post" action="{% url "proposal_document_delete" document.pk %}">
{% csrf_token %} {% csrf_token %}
<button type="submit" class="btn btn-mini">{% trans 'delete' %}</button> <button type="submit" class="btn btn-mini">{% trans 'delete' %}</button>
</form> </form>
@ -66,12 +66,12 @@
<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> </div>
{% endif %} {% endif %}
{% if message_form %} {% if message_form %}
<div class="tab-pane" id="proposal-feedback"> <div class="tab-pane" id="proposal-feedback">
<h3>{% trans 'Conversation with Reviewers' %}</h3> <h3>{% trans 'Conversation with Reviewers' %}</h3>
{% for message in proposal.messages.all %} {% for message in proposal.messages.all %}
<div class="review-box"> <div class="review-box">
<div class="comment">{{ message.message|safe }}</div> <div class="comment">{{ message.message|safe }}</div>
@ -79,11 +79,11 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{% endfor %} {% endfor %}
<h3>{% trans 'Leave a Message' %}</h3> <h3>{% trans 'Leave a Message' %}</h3>
<p>{% trans 'You can leave a message for the reviewers here.' %}</p> <p>{% trans 'You can leave a message for the reviewers here.' %}</p>
<form action="" method="POST" accept-charset="utf-8"> <form action="" method="POST" accept-charset="utf-8">
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset>
@ -105,11 +105,11 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var History = window.History; var History = window.History;
$(window).bind("anchorchange", function() { $(window).bind("anchorchange", function() {
$(".nav-tabs a[href='" + location.hash + "']").click(); $(".nav-tabs a[href='" + location.hash + "']").click();
}); });
$('#.nav-tabs a[data-toggle="tab"]').on('shown', function (e) { $('#.nav-tabs a[data-toggle="tab"]').on('shown', function (e) {
if (History.enabled) { if (History.enabled) {
History.pushState(null, null, $(e.target).attr("href")); History.pushState(null, null, $(e.target).attr("href"));

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

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

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

@ -5,14 +5,14 @@
{% block body %} {% block body %}
<h1>{% trans 'Proposal:' %} {{ proposal.title }}</h1> <h1>{% trans 'Proposal:' %} {{ proposal.title }}</h1>
<p> <p>
<a href="{% url proposal_edit proposal.pk %}">{% trans 'Edit proposal' %} <a href="{% url "proposal_edit" proposal.pk %}">{% trans 'Edit proposal' %}
</a> </a>
</p> </p>
<h2>{% trans 'Current Speakers' %}</h2> <h2>{% trans 'Current Speakers' %}</h2>
{% for speaker in speakers %} {% for speaker in speakers %}
{% if speaker.user %} {% if speaker.user %}
<p><b>{{ speaker.name }}</b> &mdash; {{ speaker.email }}</p> <p><b>{{ speaker.name }}</b> &mdash; {{ speaker.email }}</p>
@ -20,9 +20,9 @@
<p>{{ speaker.email }} &mdash; {% trans 'pending invitation' %}</p> <p>{{ speaker.email }} &mdash; {% trans 'pending invitation' %}</p>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<h2>{% trans 'Add another speaker' %}</h2> <h2>{% trans 'Add another speaker' %}</h2>
<form method="POST" action="" enctype="multipart/form-data" class="uniForm"> <form method="POST" action="" enctype="multipart/form-data" class="uniForm">
{% csrf_token %} {% csrf_token %}
{{ add_speaker_form|as_bootstrap }} {{ add_speaker_form|as_bootstrap }}

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

@ -7,13 +7,13 @@
{% block body %} {% block body %}
{% box "proposal_submit" %} {% box "proposal_submit" %}
{% if kinds %} {% if kinds %}
<p>Select what kind of proposal you'd like to submit:</p> <p>Select what kind of proposal you'd like to submit:</p>
<ul> <ul>
{% for kind in kinds %} {% for kind in kinds %}
<li><a href="{% url proposal_submit_kind kind.slug %}">{{ kind }}</a></li> <li><a href="{% url "proposal_submit_kind" kind.slug %}">{{ kind }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}

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

@ -12,13 +12,13 @@
<th>{% trans "-1" %}</th> <th>{% trans "-1" %}</th>
<th><a href="#" class="tip" title="{% trans "Your Rating" %}"><i class="icon-user"></i></a></th> <th><a href="#" class="tip" title="{% trans "Your Rating" %}"><i class="icon-user"></i></a></th>
</thead> </thead>
<tbody> <tbody>
{% for proposal in proposals %} {% for proposal in proposals %}
<tr class="{{ proposal.user_vote_css }}"> <tr class="{{ proposal.user_vote_css }}">
<td>{{ proposal.number }}</td> <td>{{ proposal.number }}</td>
<td> <td>
<a href="{% url review_detail proposal.pk %}"> <a href="{% url "review_detail" proposal.pk %}">
<small><strong>{{ proposal.speaker }}</strong></small> <small><strong>{{ proposal.speaker }}</strong></small>
<br /> <br />
{{ proposal.title }} {{ proposal.title }}

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

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

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

@ -11,19 +11,19 @@
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li{% if status == 'accepted' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'accepted' %}">accepted</a> <li{% if status == 'accepted' %} class="active"{% endif %}><a href="{% url "result_notification" section_slug 'accepted' %}">accepted</a>
<li{% if status == 'rejected' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'rejected' %}">rejected</a> <li{% if status == 'rejected' %} class="active"{% endif %}><a href="{% url "result_notification" section_slug 'rejected' %}">rejected</a>
<li{% if status == 'standby' %} class="active"{% endif %}><a href="{% url result_notification section_slug 'standby' %}">standby</a> <li{% if status == 'standby' %} class="active"{% endif %}><a href="{% url "result_notification" section_slug 'standby' %}">standby</a>
</ul> </ul>
<h1>Result Notification</h1> <h1>Result Notification</h1>
<form method="post" action="{% url result_notification_prepare section_slug status %}"> <form method="post" action="{% url "result_notification_prepare" section_slug status %}">
{% csrf_token %} {% csrf_token %}
<p> <p>
Select one or more proposals (<span class="action-counter">0</span> currently selected) Select one or more proposals (<span class="action-counter">0</span> currently selected)
<br/> <br/>
@ -37,7 +37,7 @@
<br/> <br/>
<button id="next-button" type="submit" class="btn btn-primary" disabled>Next <i class="icon icon-chevron-right"></i></button> <button id="next-button" type="submit" class="btn btn-primary" disabled>Next <i class="icon icon-chevron-right"></i></button>
</p> </p>
<table class="table table-striped table-bordered"> <table class="table table-striped table-bordered">
<thead> <thead>
<th><input type="checkbox" id="action-toggle"></th> <th><input type="checkbox" id="action-toggle"></th>
@ -47,14 +47,14 @@
<th>{% trans "Status" %}</th> <th>{% trans "Status" %}</th>
<th>{% trans "Notified?" %}</th> <th>{% trans "Notified?" %}</th>
</thead> </thead>
<tbody> <tbody>
{% for proposal in proposals %} {% for proposal in proposals %}
<tr> <tr>
<td><input class="action-select" type="checkbox" name="_selected_action" value="{{ proposal.pk }}"></td> <td><input class="action-select" type="checkbox" name="_selected_action" value="{{ proposal.pk }}"></td>
<td>{{ proposal.number }}</td> <td>{{ proposal.number }}</td>
<td> <td>
<a href="{% url review_detail proposal.pk %}"> <a href="{% url "review_detail" proposal.pk %}">
<small><strong>{{ proposal.speaker }}</strong></small> <small><strong>{{ proposal.speaker }}</strong></small>
<br /> <br />
{{ proposal.title }} {{ proposal.title }}

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

@ -4,7 +4,7 @@
{% block body %} {% block body %}
<h1>Result Notification Prepare</h1> <h1>Result Notification Prepare</h1>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<h2>Proposals</h2> <h2>Proposals</h2>
@ -22,11 +22,11 @@
</div> </div>
<div class="span6"> <div class="span6">
<h2>Email</h2> <h2>Email</h2>
<form method="post" action="{% url result_notification_send section_slug status %}"> <form method="post" action="{% url "result_notification_send" section_slug status %}">
{% csrf_token %} {% csrf_token %}
<label>From Address</label> <label>From Address</label>
<input type="text" name="from_address" class="span5" value="{{ notification_template.from_address }}" /> <input type="text" name="from_address" class="span5" value="{{ notification_template.from_address }}" />
<br/> <br/>
@ -38,11 +38,11 @@
<br/> <br/>
<input type="hidden" name="notification_template" value="{{ notification_template.pk }}" /> <input type="hidden" name="notification_template" value="{{ notification_template.pk }}" />
<input type="hidden" name="proposal_pks" value="{{ proposal_pks }}" /> <input type="hidden" name="proposal_pks" value="{{ proposal_pks }}" />
{% include "reviews/_result_notification_prepare_help.html" %} {% include "reviews/_result_notification_prepare_help.html" %}
<button type="submit" class="btn btn-primary">Send {{ proposals|length }} Email{{ proposals|length|pluralize }}</button> <button type="submit" class="btn btn-primary">Send {{ proposals|length }} Email{{ proposals|length|pluralize }}</button>
<a class="btn" href="{% url result_notification section_slug status %}">Cancel</a> <a class="btn" href="{% url "result_notification" section_slug status %}">Cancel</a>
</form> </form>
</div> </div>
</form> </form>

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

@ -2,7 +2,7 @@
{% block body %} {% block body %}
<h1>Reviewers</h1> <h1>Reviewers</h1>
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
<th> <th>
@ -30,7 +30,7 @@
{% for reviewer in reviewers %} {% for reviewer in reviewers %}
<tr> <tr>
<td> <td>
<a href="{% url review_list_user section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a> <a href="{% url "review_list_user" section_slug reviewer.pk %}">{{ reviewer.get_full_name }}</a>
</td> </td>
<td> <td>
{{ reviewer.total_votes }} {{ reviewer.total_votes }}

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

@ -2,7 +2,7 @@
{% block body %} {% block body %}
<h1>Review Assignments</h1> <h1>Review Assignments</h1>
{% if assignments %} {% if assignments %}
<table> <table>
<tr> <tr>
@ -18,7 +18,7 @@
</a> </a>
</td> </td>
<td> <td>
<form method="post" action="{% url review_assignment_opt_out assignment.pk %}"> <form method="post" action="{% url "review_assignment_opt_out" assignment.pk %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Opt-out" /> <input type="submit" value="Opt-out" />
</form> </form>

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

@ -66,9 +66,9 @@
</form> </form>
</div> </div>
{% endif %} {% endif %}
<h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h3> <h3>#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }})</h3>
<div class="tabbable"> <div class="tabbable">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li> <li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
@ -80,7 +80,7 @@
{% include "proposals/_proposal_fields.html" %} {% include "proposals/_proposal_fields.html" %}
</div> </div>
<div class="tab-pane" id="proposal-reviews"> <div class="tab-pane" id="proposal-reviews">
<h4>{% trans "Current Results" %}</h4> <h4>{% trans "Current Results" %}</h4>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@ -100,9 +100,9 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<hr /> <hr />
{% if review_form %} {% if review_form %}
<form method="POST" action="" class="review-form"> <form method="POST" action="" class="review-form">
<legend>{% trans "Submit Review" %}</legend> <legend>{% trans "Submit Review" %}</legend>
@ -126,7 +126,7 @@
</div> </div>
{% if is_manager %} {% if is_manager %}
<div class="pull-right"> <div class="pull-right">
<form class="form-inline" action="{% url review_delete review.id %}" method="POST"> <form class="form-inline" action="{% url "review_delete" review.id %}" method="POST">
{% csrf_token %} {% csrf_token %}
<button class="btn btn-mini btn-danger" type="submit">Delete</button> <button class="btn btn-mini btn-danger" type="submit">Delete</button>
</form> </form>
@ -157,7 +157,7 @@
{% endfor %} {% endfor %}
<hr /> <hr />
{% endif %} {% endif %}
<form action="" method="POST"accept-charset="utf-8"> <form action="" method="POST"accept-charset="utf-8">
<legend>{% trans "Send a message" %}</legend> <legend>{% trans "Send a message" %}</legend>
<p> <p>
@ -182,11 +182,11 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var History = window.History; var History = window.History;
$(window).bind("anchorchange", function() { $(window).bind("anchorchange", function() {
$(".nav-tabs a[href='" + location.hash + "']").click(); $(".nav-tabs a[href='" + location.hash + "']").click();
}); });
$('#.nav-tabs a[data-toggle="tab"]').on('shown', function (e) { $('#.nav-tabs a[data-toggle="tab"]').on('shown', function (e) {
if (History.enabled) { if (History.enabled) {
History.pushState(null, null, $(e.target).attr("href")); History.pushState(null, null, $(e.target).attr("href"));
@ -194,5 +194,5 @@
}); });
}); });
</script> </script>
{% endblock %} {% endblock %}

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

@ -7,31 +7,31 @@
{% block body %} {% block body %}
<h1>Proposal Review</h1> <h1>Proposal Review</h1>
<div class="proposal"> <div class="proposal">
<h2>{{ proposal.title }}</h2> <h2>{{ proposal.title }}</h2>
<p> <p>
{% if proposal.cancelled %} {% if proposal.cancelled %}
Cancelled Cancelled
{% endif %} {% endif %}
</p> </p>
<div> <div>
{{ proposal.description }} {{ proposal.description }}
</div> </div>
<p><b>Type</b>: {{ proposal.get_session_type_display }}</p> <p><b>Type</b>: {{ proposal.get_session_type_display }}</p>
<h3>Abstract</h3> <h3>Abstract</h3>
<div class="abstract"> <div class="abstract">
{{ proposal.abstract_html|safe }} {{ proposal.abstract_html|safe }}
</div> </div>
<p><b>Audience level</b>: {{ proposal.get_audience_level_display }}</p> <p><b>Audience level</b>: {{ proposal.get_audience_level_display }}</p>
<p><b>Submitting speaker</b>: {{ proposal.speaker }}</p> {# @@@ bio? #} <p><b>Submitting speaker</b>: {{ proposal.speaker }}</p> {# @@@ bio? #}
{% if proposal.additional_speakers.all %} {% if proposal.additional_speakers.all %}
<p><b>Additional speakers</b>:</p> <p><b>Additional speakers</b>:</p>
<ul> <ul>
@ -44,18 +44,18 @@
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
<h3>Additional Notes (private from submitter)</h3> <h3>Additional Notes (private from submitter)</h3>
<div class="additional_notes"> <div class="additional_notes">
{{ proposal.additional_notes }} {{ proposal.additional_notes }}
</div> </div>
</div> </div>
{% markitup_media %} {% markitup_media %}
<h2>Review</h2> <h2>Review</h2>
<form method="POST" action="{% url review_review proposal.pk %}" class="uniForm"> <form method="POST" action="{% url "review_review" proposal.pk %}" class="uniForm">
{% csrf_token %} {% csrf_token %}
<fieldset class="inlineLabels"> <fieldset class="inlineLabels">
{{ review_form|as_uni_form }} {{ review_form|as_uni_form }}
@ -64,10 +64,10 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
<h2>Comment</h2> <h2>Comment</h2>
<form method="POST" action="{% url review_comment proposal.pk %}" class="uniForm"> <form method="POST" action="{% url "review_comment" proposal.pk %}" class="uniForm">
{% csrf_token %} {% csrf_token %}
<fieldset> <fieldset>
{{ comment_form|as_uni_form }} {{ comment_form|as_uni_form }}
@ -76,5 +76,5 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

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

@ -2,14 +2,14 @@
{% block body %} {% block body %}
<h1>Voting Status ({{ section_slug }})</h1> <h1>Voting Status ({{ section_slug }})</h1>
{% if key %} {% if key %}
<div class="breadcrumbs"> <div class="breadcrumbs">
<a href="{% url review_status section_slug "positive" %}">Positive</a> | <a href="{% url "review_status" section_slug "positive" %}">Positive</a> |
<a href="{% url review_status section_slug "negative" %}">Negative</a> | <a href="{% url "review_status" section_slug "negative" %}">Negative</a> |
<a href="{% url review_status section_slug "indifferent" %}">Indifferent</a> | <a href="{% url "review_status" section_slug "indifferent" %}">Indifferent</a> |
<a href="{% url review_status section_slug "controversial" %}">Controversial</a> | <a href="{% url "review_status" section_slug "controversial" %}">Controversial</a> |
<a href="{% url review_status section_slug "too_few" %}">Too Few</a> <a href="{% url "review_status" section_slug "too_few" %}">Too Few</a>
</div> </div>
<div> <div>
@ -39,38 +39,38 @@
</div> </div>
{% else %} {% else %}
<p>Reviews are placed into one of five buckets depending on the state of their votes:</p> <p>Reviews are placed into one of five buckets depending on the state of their votes:</p>
<dl> <dl>
<dt> <dt>
<a href="{% url review_status section_slug "positive" %}">Positive</a> <a href="{% url "review_status" section_slug "positive" %}">Positive</a>
<span class="badge">{{ proposals.positive|length }}</span> <span class="badge">{{ proposals.positive|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no &minus;1s proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no &minus;1s
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "negative" %}">Negative</a> <a href="{% url "review_status" section_slug "negative" %}">Negative</a>
<span class="badge">{{ proposals.negative|length }}</span> <span class="badge">{{ proposals.negative|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one &minus;1 and no +1s proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one &minus;1 and no +1s
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "indifferent" %}">Indifferent</a> <a href="{% url "review_status" section_slug "indifferent" %}">Indifferent</a>
<span class="badge">{{ proposals.indifferent|length }}</span> <span class="badge">{{ proposals.indifferent|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a &minus;1 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a &minus;1
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "controversial" %}">Controversial</a> <a href="{% url "review_status" section_slug "controversial" %}">Controversial</a>
<span class="badge">{{ proposals.controversial|length }}</span> <span class="badge">{{ proposals.controversial|length }}</span>
</dt> </dt>
<dd> <dd>
proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and &minus;1 proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and &minus;1
</dd> </dd>
<dt> <dt>
<a href="{% url review_status section_slug "too_few" %}">Too Few Reviews</a> <a href="{% url "review_status" section_slug "too_few" %}">Too Few Reviews</a>
<span class="badge">{{ proposals.too_few|length }}</span> <span class="badge">{{ proposals.too_few|length }}</span>
</dt> </dt>
<dd> <dd>
@ -79,4 +79,4 @@
</dl> </dl>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -9,33 +9,33 @@
<div class="span12"> <div class="span12">
<div class="pull-right"> <div class="pull-right">
{% if can_join %} {% if can_join %}
<form method="post" action="{% url team_join team.slug %}"> <form method="post" action="{% url "team_join" team.slug %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" class="btn btn-primary" value="join"> <input type="submit" class="btn btn-primary" value="join">
</form> </form>
{% endif %} {% endif %}
{% if can_leave %} {% if can_leave %}
<form method="post" action="{% url team_leave team.slug %}"> <form method="post" action="{% url "team_leave" team.slug %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" class="btn" value="leave"> <input type="submit" class="btn" value="leave">
</form> </form>
{% endif %} {% endif %}
{% if can_apply %} {% if can_apply %}
<form method="post" action="{% url team_apply team.slug %}"> <form method="post" action="{% url "team_apply" team.slug %}">
{% csrf_token %} {% csrf_token %}
<input type="submit" class="btn btn-primary" value="apply"> <input type="submit" class="btn btn-primary" value="apply">
</form> </form>
{% endif %} {% endif %}
</div> </div>
<h1>{{ team.name }}{% if state %} <span class="label">{{ state }}</span>{% endif %}</h1> <h1>{{ team.name }}{% if state %} <span class="label">{{ state }}</span>{% endif %}</h1>
{% if team.description %}<p>{{ team.description }}</p>{% endif %} {% if team.description %}<p>{{ team.description }}</p>{% endif %}
{% if state == "invited" %}<p>You have been invited to join this team. Click <b>join</b> to the right to accept.</p>{% endif %} {% if state == "invited" %}<p>You have been invited to join this team. Click <b>join</b> to the right to accept.</p>{% endif %}
{% if user.is_staff or state == "manager" %} {% if user.is_staff or state == "manager" %}
{% if team.managers %} {% if team.managers %}
<h2>Managers</h2> <h2>Managers</h2>
@ -44,7 +44,7 @@
<tr> <tr>
<td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td> <td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url team_demote membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">demote</button></form> <form style="margin: 0;" method="post" action="{% url "team_demote" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">demote</button></form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -57,7 +57,7 @@
<tr> <tr>
<td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td> <td>{{ membership.user.email }}{% if user == membership.user %} <span class="label label-info">you</span>{% endif %}</td>
<td> <td>
<form style="margin: 0;" method="post" action="{% url team_promote membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">promote</button></form> <form style="margin: 0;" method="post" action="{% url "team_promote" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">promote</button></form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
@ -70,8 +70,8 @@
<tr> <tr>
<td>{{ membership.user.email }}</td> <td>{{ membership.user.email }}</td>
<td> <td>
<form style="margin: 0; float: left;" method="post" action="{% url team_accept membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">accept</button></form> <form style="margin: 0; float: left;" method="post" action="{% url "team_accept" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">accept</button></form>
<form style="margin: 0; float: left;" method="post" action="{% url team_reject membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">reject</button></form> <form style="margin: 0; float: left;" method="post" action="{% url "team_reject" membership.pk %}">{% csrf_token %}<button type="submit" class="btn btn-mini">reject</button></form>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}