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

resolve merge conflict

Browse source
This commit is contained in:
David Ray 2014-02-28 12:17:48 -05:00
parent d9ba22d6b6
commit 64a39b8706
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
symposion/templates/schedule/schedule_edit.html
View file

@ -24,7 +24,11 @@
{% include "schedule/_edit_grid.html" %} {% include "schedule/_edit_grid.html" %}
{% endfor %} {% endfor %}
</div> </div>
<form id="schedule-builder" action="." method="post" enctype="multipart/form-data">{% csrf_token %}
{{ form.as_p }}
<input type="submit" name="submit" value="Submit" />
<input type="submit" id="delete" name="delete" value="Delete Schedule" />
</form>
<div class="modal fade hide in" id="slotEditModal"></div> <div class="modal fade hide in" id="slotEditModal"></div>
</div> </div>
{% endblock %} {% endblock %}