Changeset - 51640e9893a2
[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:
0 comments (0 inline, 0 general)
pinaxcon/templates/symposion/proposals/_proposal_fields.html
Show inline comments
...
 
@@ -27,52 +27,52 @@
 
    {% endif %}
 

	
 
    <h4>{% trans "Abstract" %}</h4>
 
    <div class="abstract">{{ proposal.abstract_html|safe }}&nbsp;</div>
 

	
 
    <h4>{% trans "Private Abstract" %}</h4>
 
    <div class="private_abstract">{{ proposal.private_abstract_html|safe }}&nbsp;</div>
 

	
 
    <h4>{% trans "Project" %}</h4>
 
    <p>{{ proposal.project|safe }}&nbsp;</p>
 

	
 
    <h4>{% trans "Project URL" %}</h4>
 
    <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>
 
        </tr>
 
        {% for speaker in proposal.speakers %}
 
          <tr>
 
            <td>{{ speaker.name }}</td>
 
            <td>{{ speaker.travel_assistance }}</td>
 
            <td>{{ speaker.accommodation_assistance }}</td>
 
          </tr>
 
        {% endfor %}
 
      </table>
 
      <br />
 

	
 
      {% if proposal.speaker.accessibility_html %}
pinaxcon/templates/symposion/proposals/proposal_detail.html
Show inline comments
...
 
@@ -13,49 +13,49 @@
 
  <div class="panel--content">
 

	
 
        <div class="panel--tab-controls">
 
          <div class="panel--tabs"><a data-tab-control="Details" class="panel--tab-switch is-active">{% trans "Proposal Details" %}</a><a data-tab-control="Documents" class="panel--tab-switch">{% trans "Supporting Documents" %}</a><a data-tab-control="Feedback" class="panel--tab-switch">{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }})</a>
 
          </div>
 
        </div>
 
        <div data-tab-content="Details" class="panel--tab-content is-active">
 
          {% include "symposion/proposals/_proposal_fields.html" %}
 

	
 
          <div class="btn-group">
 
              {% if not proposal.cancelled %}
 
                  {% if request.user == proposal.speaker.user %}
 
                      <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 %}">
 
                              {% csrf_token %}
 
                              <button type="submit" class="btn btn-xs">{% trans 'delete' %}</button>
 
                          </form>
 
                      </td>
 
                      </tr>
 
                  {% endfor %}
 
              </table>
 
          {% else %}
 
              <p>{% trans 'No supporting documents attached to this proposal.' %}</p>
 
          {% endif %}
 
          <a class="btn btn-default btn-sm{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url "proposal_document_create" proposal.pk %}"><i class="fa fa-upload"></i> {% trans 'Add Document' %}</a>
 
        </div>
0 comments (0 inline, 0 general)