diff --git a/symposion/templates/cms/file_create.html b/symposion/templates/cms/file_create.html index 547fc5d3..07f449c9 100644 --- a/symposion/templates/cms/file_create.html +++ b/symposion/templates/cms/file_create.html @@ -8,7 +8,7 @@

Upload File

-
+ {% csrf_token %} {{ form|as_bootstrap }}
@@ -17,4 +17,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/symposion/templates/cms/file_index.html b/symposion/templates/cms/file_index.html index bfe1337c..e9f367f0 100644 --- a/symposion/templates/cms/file_index.html +++ b/symposion/templates/cms/file_index.html @@ -6,10 +6,10 @@

Files

- + {% for file in files %}
-
+ {% csrf_token %}
@@ -20,7 +20,7 @@

No uploaded files.

{% endfor %}
- + Add File diff --git a/symposion/templates/conference/user_list.html b/symposion/templates/conference/user_list.html index 22caaede..9886fde1 100644 --- a/symposion/templates/conference/user_list.html +++ b/symposion/templates/conference/user_list.html @@ -60,7 +60,7 @@ {% trans "Name" %} {% trans "Speaker Profile?" %} - + {% for user in users %} @@ -68,9 +68,9 @@ {{ user.get_full_name }} {% if user.speaker_profile %} - {{ user.speaker_profile }} + {{ user.speaker_profile }} {% else %} - create + create {% endif %} diff --git a/symposion/templates/dashboard.html b/symposion/templates/dashboard.html index a88b4a3f..f4ef8775 100644 --- a/symposion/templates/dashboard.html +++ b/symposion/templates/dashboard.html @@ -16,23 +16,23 @@

{% trans "Speaking" %}

{% if not user.speaker_profile %} - + Create a speaker profile {% else %} - + Edit your speaker profile - + Submit a new proposal {% endif %}
- +
{% if not user.speaker_profile %} -

To submit a proposal, you must first create a speaker profile.

+

To submit a proposal, you must first create a speaker profile.

{% else %}

Your Proposals

{% if user.speaker_profile.proposals.exists %} @@ -50,7 +50,7 @@ {% else %}

No proposals submitted yet.

{% endif %} - + {% associated_proposals as associated_proposals %} {% if associated_proposals %}

Proposals you have joined as an additional speaker

@@ -66,7 +66,7 @@ {% endfor %} {% endif %} - + {% pending_proposals as pending_proposals %} {% if pending_proposals %}

Proposals you have been invited to join

@@ -85,29 +85,29 @@ {% endif %}
- +

{% trans "Sponsorship" %}

{% if not user.sponsorships.exists %} - + Apply to be a sponsor {% endif %}
- +
{% if not user.sponsorships.exists %} -

If you or your organization would be interested in sponsorship opportunities, use our online form to apply to be a sponsor. +

If you or your organization would be interested in sponsorship opportunities, use our online form to apply to be a sponsor. {% else %}

Your Sponsorship

    {% for sponsorship in user.sponsorships.all %}
  • - {{ sponsorship.name }} + {{ sponsorship.name }} ({{ sponsorship.level }}) {% if not sponsorship.active %} awaiting approval @@ -118,32 +118,32 @@ {% endif %} {% if user.is_staff %}

    - As staff, you can directly add a sponsor if the organization isn't + As staff, you can directly add a sponsor if the organization isn't applying themselves.

    {% endif %}
- + {% if review_sections %}

{% trans "Reviews" %}

- +

Reviews by Section

- + - + {% comment %}

My Assignments

@@ -163,11 +163,11 @@
{% endcomment %} - +
{% endif %} - + {% available_teams as available_teams %} {% if user.memberships.exists or available_teams %}
@@ -175,7 +175,7 @@

{% trans "Teams" %}

- +
{% if user.memberships.exists %}

Your Teams

@@ -183,7 +183,7 @@ {% for membership in user.memberships.all %} - {{ membership.team.name }} + {{ membership.team.name }} {% if membership.team.description %}
{{ membership.team.description }}{% endif %} diff --git a/symposion/templates/emails/proposal_new_message/message.html b/symposion/templates/emails/proposal_new_message/message.html index 90bbd8c8..42c55ac2 100644 --- a/symposion/templates/emails/proposal_new_message/message.html +++ b/symposion/templates/emails/proposal_new_message/message.html @@ -6,6 +6,6 @@ {{ message.message|safe }}

- {% 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 http://{{ current_site }}{{ detail_url }}#proposal-feedback -

\ No newline at end of file +

diff --git a/symposion/templates/emails/proposal_updated/message.html b/symposion/templates/emails/proposal_updated/message.html index d5ed74ec..e20ed4f0 100644 --- a/symposion/templates/emails/proposal_updated/message.html +++ b/symposion/templates/emails/proposal_updated/message.html @@ -3,6 +3,6 @@ {% user_display user %} has made changes to {{ proposal.title }} which you have previously reviewed or commented on.

- {% 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 http://{{ current_site }}{{ detail_url }}

diff --git a/symposion/templates/emails/speaker_addition/message.html b/symposion/templates/emails/speaker_addition/message.html index dff0c7ba..1d01ab7e 100644 --- a/symposion/templates/emails/speaker_addition/message.html +++ b/symposion/templates/emails/speaker_addition/message.html @@ -2,5 +2,5 @@ talk proposal for {{ current_site.name }} entitled "{{ proposal.title }}".

For more details, visit the {{ current_site.name }} speaker dashboard: - http://{{ current_site }}{% url dashboard %} + http://{{ current_site }}{% url "dashboard" %}

diff --git a/symposion/templates/emails/speaker_invite/message.html b/symposion/templates/emails/speaker_invite/message.html index 5ab2c2e8..57cea710 100644 --- a/symposion/templates/emails/speaker_invite/message.html +++ b/symposion/templates/emails/speaker_invite/message.html @@ -3,7 +3,7 @@

Go to

-

http://{{ current_site }}{% url speaker_create_token token %}

+

http://{{ current_site }}{% url "speaker_create_token" token %}

to confirm.

diff --git a/symposion/templates/proposals/_pending_proposal_row.html b/symposion/templates/proposals/_pending_proposal_row.html index fafd0ea0..2dda000b 100644 --- a/symposion/templates/proposals/_pending_proposal_row.html +++ b/symposion/templates/proposals/_pending_proposal_row.html @@ -2,11 +2,11 @@ - {{ proposal.title }} + {{ proposal.title }} - + {{ proposal.kind.name }} - + {% if proposal.cancelled %} {% trans 'Cancelled' %} @@ -22,7 +22,7 @@ {% endif %} {% endif %} - + {% if not proposal.cancelled %}
@@ -31,9 +31,9 @@
diff --git a/symposion/templates/proposals/_proposal_fields.html b/symposion/templates/proposals/_proposal_fields.html index a1040625..49f94aa9 100644 --- a/symposion/templates/proposals/_proposal_fields.html +++ b/symposion/templates/proposals/_proposal_fields.html @@ -3,13 +3,13 @@
{% trans "Submitted by" %}
{{ proposal.speaker }}
- +
{% trans "Track" %}
{{ proposal.track }} 
- +
{% trans "Audience Level" %}
{{ proposal.get_audience_level_display }} 
- + {% if proposal.additional_speakers.all %}
{% trans "Additional Speakers" %}
@@ -24,19 +24,19 @@ {% endfor %}
{% endif %} - +
{% trans "Description" %}
{{ proposal.description }} 
- +
{% trans "Abstract" %}
{{ proposal.abstract|safe }} 
- +
{% trans "Notes" %}
{{ proposal.additional_notes|safe }} 
- +
{% trans "Speaker Bio" %}
{{ proposal.speaker.biography|safe }} 
- +
{% trans "Documents" %}
{% if proposal.supporting_documents.exists %} @@ -45,7 +45,7 @@ {{ document.description }} -
+ {% csrf_token %}
diff --git a/symposion/templates/proposals/_proposal_row.html b/symposion/templates/proposals/_proposal_row.html index 6ed15607..de820cfd 100644 --- a/symposion/templates/proposals/_proposal_row.html +++ b/symposion/templates/proposals/_proposal_row.html @@ -1,10 +1,10 @@ - {{ proposal.title }} + {{ proposal.title }} - + {{ proposal.kind.name }} - + {% if proposal.cancelled %} Cancelled @@ -20,12 +20,12 @@ {% endif %} {% endif %} - + {% if not proposal.cancelled %} {% if request.user == proposal.speaker.user and proposal.can_edit %} - Edit - Manage Additional Speakers + Edit + Manage Additional Speakers {% endif %} {% endif %} diff --git a/symposion/templates/proposals/proposal_cancel.html b/symposion/templates/proposals/proposal_cancel.html index 93a1204a..5e57c80a 100644 --- a/symposion/templates/proposals/proposal_cancel.html +++ b/symposion/templates/proposals/proposal_cancel.html @@ -8,11 +8,11 @@ {% block body %}

Cancel: {{ proposal.title }}

- +
{% csrf_token %}

Are you sure you want to cancel {{ proposal.title }}?

- {% trans 'No, keep it for now' %} + {% trans 'No, keep it for now' %}
{% endblock %} diff --git a/symposion/templates/proposals/proposal_detail.html b/symposion/templates/proposals/proposal_detail.html index a9b881e7..7f02504c 100644 --- a/symposion/templates/proposals/proposal_detail.html +++ b/symposion/templates/proposals/proposal_detail.html @@ -10,14 +10,14 @@
{% if not proposal.cancelled %} {% if request.user == proposal.speaker.user %} - + {% trans "Edit this proposal" %} - + {% trans "Cancel this proposal" %} {% else %} - + {% trans "Remove me from this proposal" %} {% endif %} @@ -25,9 +25,9 @@ {% trans 'Cancelled' } {% endif %}
- +

#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}, Track: {{ proposal.track }})

- +
  • {% trans "Proposal Details" %}
    • @@ -45,14 +45,14 @@ {% if request.user == proposal.speaker.user %}

    {% trans 'Supporting Documents' %}

    - + {% if proposal.supporting_documents.exists %} {% for document in proposal.supporting_documents.all %} {% endfor %} @@ -36,4 +36,4 @@ {% endfor %} -
    {{ document.description }} -
    + {% csrf_token %}
    @@ -66,12 +66,12 @@ {% trans 'Add Document' %} {% endif %} - + {% if message_form %}
    - +

    {% trans 'Conversation with Reviewers' %}

    - + {% for message in proposal.messages.all %}
    {{ message.message|safe }}
    @@ -79,11 +79,11 @@
    {% endfor %} - +

    {% trans 'Leave a Message' %}

    - +

    {% trans 'You can leave a message for the reviewers here.' %}

    - +
    {% csrf_token %}
    @@ -105,11 +105,11 @@ - + {% endblock %} diff --git a/symposion/templates/reviews/review_review.html b/symposion/templates/reviews/review_review.html index 2168e899..4202d70e 100644 --- a/symposion/templates/reviews/review_review.html +++ b/symposion/templates/reviews/review_review.html @@ -7,31 +7,31 @@ {% block body %}

    Proposal Review

    - +

    {{ proposal.title }}

    - +

    {% if proposal.cancelled %} Cancelled {% endif %}

    - +
    {{ proposal.description }}
    - +

    Type: {{ proposal.get_session_type_display }}

    - +

    Abstract

    {{ proposal.abstract_html|safe }}
    - +

    Audience level: {{ proposal.get_audience_level_display }}

    - +

    Submitting speaker: {{ proposal.speaker }}

    {# @@@ bio? #} - + {% if proposal.additional_speakers.all %}

    Additional speakers:

      @@ -44,18 +44,18 @@ {% endfor %}
    {% endif %} - +

    Additional Notes (private from submitter)

    {{ proposal.additional_notes }}
    - + {% markitup_media %}

    Review

    - - + + {% csrf_token %}
    {{ review_form|as_uni_form }} @@ -64,10 +64,10 @@
    - +

    Comment

    - -
    + + {% csrf_token %}
    {{ comment_form|as_uni_form }} @@ -76,5 +76,5 @@
    - + {% endblock %} diff --git a/symposion/templates/reviews/review_stats.html b/symposion/templates/reviews/review_stats.html index 8f4a09cb..fb613d09 100644 --- a/symposion/templates/reviews/review_stats.html +++ b/symposion/templates/reviews/review_stats.html @@ -2,14 +2,14 @@ {% block body %}

    Voting Status ({{ section_slug }})

    - + {% if key %}
    - Positive | - Negative | - Indifferent | - Controversial | - Too Few + Positive | + Negative | + Indifferent | + Controversial | + Too Few
    @@ -39,38 +39,38 @@
    {% else %}

    Reviews are placed into one of five buckets depending on the state of their votes:

    - +
    - Positive + Positive {{ proposals.positive|length }}
    proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one +1 and no −1s
    - Negative + Negative {{ proposals.negative|length }}
    proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and at least one −1 and no +1s
    - Indifferent + Indifferent {{ proposals.indifferent|length }}
    proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and neither a +1 or a −1
    - Controversial + Controversial {{ proposals.controversial|length }}
    proposals with at least {{ vote_threshold }} vote{{ vote_threshold|pluralize }} and both a +1 and −1
    - Too Few Reviews + Too Few Reviews {{ proposals.too_few|length }}
    @@ -79,4 +79,4 @@
    {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/symposion/templates/schedule/_edit_grid.html b/symposion/templates/schedule/_edit_grid.html index ff9afe78..8b4d4146 100644 --- a/symposion/templates/schedule/_edit_grid.html +++ b/symposion/templates/schedule/_edit_grid.html @@ -15,9 +15,9 @@     		{% if slot.kind.label == "talk" or slot.kind.label == "tutorial" %} {% if not slot.content %} - + + + {% else %} - {{ slot.content.title }} + {{ slot.content.title }} {{ slot.content.speaker }} {% endif %} {% else %} @@ -26,7 +26,7 @@ {% else %} {{ slot.kind.label }} {% endif %} - — edit + — edit {% endif %}
    \ No newline at end of file + diff --git a/symposion/templates/schedule/_grid.html b/symposion/templates/schedule/_grid.html index be62d912..5df035b0 100644 --- a/symposion/templates/schedule/_grid.html +++ b/symposion/templates/schedule/_grid.html @@ -17,7 +17,7 @@ {% if not slot.content %} {% else %} - {{ slot.content.title }} + {{ slot.content.title }} {{ slot.content.speakers|join:", " }} diff --git a/symposion/templates/schedule/_slot_edit.html b/symposion/templates/schedule/_slot_edit.html index d8b5ae9e..81d48276 100644 --- a/symposion/templates/schedule/_slot_edit.html +++ b/symposion/templates/schedule/_slot_edit.html @@ -1,5 +1,5 @@ {% load i18n bootstrap_tags %} -