Fix apply button and add cancel button

* cancel button for adding/editing election options
* apply button did not render text as html was wrongly formatted

management/templates/management/application.html

@@ -74,6 +74,8 @@
             </div>
           {% endif %}
           <button type="submit" class="btn btn-primary btn-block">Submit</button>
+          <a class="btn btn-secondary btn-block"
+              href="{% url 'management:election' election.pk %}">Cancel</a>
           </form>
         </div>
       </div>

vote/templates/vote/index_election_item.html

@@ -8,9 +8,7 @@
       <a class="btn btn-danger float-right ml-3" href="{% url 'vote:delete_own_application' election.pk %}"> Delete
         application </a>
       {% endif %}
-      <a class="btn btn-dark float-right" href="{% url 'vote:apply' election.pk %}"> {% if edit %} Edit application {%
-        else %}
-        Apply {% endif %}</a>
+      <a class="btn btn-dark float-right" href="{% url 'vote:apply' election.pk %}"> {% if edit %} Edit application {% else %} Apply {% endif %}</a>
       {% endif %}
     </h4>
     {% if election.end_date %}