symposion_app Changeset - 51640e9893a2

Changeset - 51640e9893a2

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Neugebauer - 8 years ago 2016-07-17 07:51:50
_@chrisjrn.com

Fix issue in proposals display code (#49)

* Fixes a biography display-related oops

* Fixes translation issue on cancelled proposals

2 files changed with 3 insertions and 3 deletions:

pinaxcon/templates/symposion/proposals/_proposal_fields.html

pinaxcon/templates/symposion/proposals/proposal_detail.html

0 comments (0 inline, 0 general)

pinaxcon/templates/symposion/proposals/_proposal_fields.html

➞

Show inline comments

@@ ... / @@ -39,28 +39,28 @@ @@
     <p><a href="{{ proposal.project_url|safe }}">{{ proposal.project_url|safe }}</a>&nbsp;</p>
     <h4>{% trans "Video URL" %}</h4>
     <p><a href="{{ proposal.video_url|safe }}">{{ proposal.video_url|safe }}</a>&nbsp;</p>
     <h4>{% trans "Special Requirements" %}</h4>
     <div class="special_requirements">{{ proposal.technical_requirements_html|safe }}</div>
     {% for speaker in proposal.speakers %}
       <h4>{% trans "Speaker:" %} {{ speaker.name }}</h4>
       <h5>{% trans "Biography" %}</h5>
-      <div class="biography">{{ proposal.speaker.biography_html|safe }}&nbsp;</div>
       <div class="biography">{{ speaker.biography_html|safe }}&nbsp;</div>
       <h5>{% trans "Experience" %}</h5>
-      <div class="biography">{{ proposal.speaker.experience_html|safe }}&nbsp;</div>
       <div class="biography">{{ speaker.experience_html|safe }}&nbsp;</div>
     {% endfor %}
     {% can_manage proposal as can_manage_proposal %}
     {% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %}
       <h4>{% trans "Assistance required?" %}</h4>
       <br />
       <table>
         <tr>
           <th></th>
           <th>{% trans "Travel" %}</th>
           <th>{% trans "Accommodation" %}</th>

pinaxcon/templates/symposion/proposals/proposal_detail.html

➞

Show inline comments

@@ ... / @@ -25,25 +25,25 @@ @@
                       <a href="{% url "proposal_edit" proposal.pk %}" class="btn btn-default">
                           {% trans "Edit this proposal" %}
                       </a>
                       <a href="{% url "proposal_cancel" proposal.pk %}" class="btn btn-default">
                           {% trans "Cancel this proposal" %}
                       </a>
                   {% else %}
                       <a href="{% url "proposal_leave" proposal.pk %}" class="btn btn-default">
                           {% trans "Remove me from this proposal" %}
                       </a>
                   {% endif %}
               {% else %}
                   {% trans 'Cancelled' }
+                  {% trans 'Cancelled' %}
               {% endif %}
           </div>
         </div>
         <div data-tab-content="Documents" class="panel--tab-content">
           {% if proposal.supporting_documents.exists %}
               <table class="table table-striped">
                   {% for document in proposal.supporting_documents.all %}
                       <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 %}">

0 comments (0 inline, 0 general)