Merge pull request #20 from pydata/proposal-edit

fixes #19 so that proposals can be edited

Author: codersquid

conf_site/templates/proposals/proposal_detail.html

@@ -2,6 +2,7 @@
 
 {% load i18n %}
 {% load account_tags %}
+{% load bootstrap %}
 
 {% block head_title %}{{ proposal.title }}{% endblock %}
 
@@ -62,7 +63,11 @@ <h3>{% trans 'Supporting Documents' %}</h3>
                     {% else %}
                         <p>{% trans 'No supporting documents attached to this proposal.' %}</p>
                     {% endif %}
-                    <a class="btn 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>
+
+                    <a class="btn 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>
             {% endif %}
 

conf_site/templates/proposals/proposal_edit.html

@@ -1,7 +1,7 @@
 {% extends "proposals/base.html" %}
 
-{% load bootstrap_tags %}
-{% load markitup %}
+{% load bootstrap %}
+{% load markitup_tags %}
 
 {% block head_title %}Editing {{ proposal.title }}{% endblock %}