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

Fix issue in proposals display code (#49)

Browse source 
* Fixes a biography display-related oops

* Fixes translation issue on cancelled proposals
This commit is contained in:
Christopher Neugebauer 2016-07-17 01:51:50 -06:00 committed by Scott Bragg
parent 6598d9f737
commit 51640e9893
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pinaxcon/templates/symposion/proposals/_proposal_fields.html
View file

@ -48,10 +48,10 @@
<h4>{% trans "Speaker:" %} {{ speaker.name }}</h4> <h4>{% trans "Speaker:" %} {{ speaker.name }}</h4>
<h5>{% trans "Biography" %}</h5> <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> <h5>{% trans "Experience" %}</h5>
<div class="biography">{{ proposal.speaker.experience_html|safe }}&nbsp;</div> <div class="biography">{{ speaker.experience_html|safe }}&nbsp;</div>
{% endfor %} {% endfor %}
{% can_manage proposal as can_manage_proposal %} {% can_manage proposal as can_manage_proposal %}

2
pinaxcon/templates/symposion/proposals/proposal_detail.html
View file

@ -34,7 +34,7 @@
</a> </a>
{% endif %} {% endif %}
{% else %} {% else %}
{% trans 'Cancelled' } {% trans 'Cancelled' %}
{% endif %} {% endif %}
</div> </div>
</div> </div>