From 9f95604a9a8e91fcf2c3f82f72e685fb46f41f47 Mon Sep 17 00:00:00 2001
From: Helgi Hrafn Gunnarsson <helgi@binary.is>
Date: Fri, 23 Nov 2018 14:48:23 +0000
Subject: [PATCH] Markdown-support and clickable URLs added in various places.
 (Not in comments, because they're still evil HTML-generating JavaScript
 voodoo.)

---
 wasa2il/templates/election/election_view.html           | 4 ++--
 wasa2il/templates/issue/document_detail.html            | 2 +-
 wasa2il/templates/issue/issue_detail.html               | 2 +-
 wasa2il/templates/issue/stub/document_view.html         | 2 +-
 wasa2il/templates/profile/profile.html                  | 2 +-
 wasa2il/templates/termsandconditions/tc_view_terms.html | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wasa2il/templates/election/election_view.html b/wasa2il/templates/election/election_view.html
index 99441756..8259aafa 100644
--- a/wasa2il/templates/election/election_view.html
+++ b/wasa2il/templates/election/election_view.html
@@ -195,7 +195,7 @@ <h1><small>{% trans "Election:" %}</small> {{ election.name }}</h1>
             {% if not voting_interface_enabled or election.election_state != 'voting' or started_voting or step == "vote" %}
                 <div class="alert alert-success">
                     <h3>{% trans "About This Election" %}</h3>
-                    <p>{{ election.instructions|safe|linebreaks }}</p>
+                    <p>{{ election.instructions|markdown|urlize }}</p>
                 </div>
             {% endif %}
         {% endif %}
@@ -282,7 +282,7 @@ <h2>{% trans "Votes" %} <small>{% trans "your favorites first!" %}</small></h2>
         {% else %}
             {% if election.instructions %}
             <h2>{% trans "About This Election" %}</h2>
-            <p>{{ election.instructions|safe|linebreaks }}</p>
+            <p>{{ election.instructions|markdown|urlize }}</p>
             {% endif %}
         <h2>{% trans "How To Vote" %}</h2>
         <ul>
diff --git a/wasa2il/templates/issue/document_detail.html b/wasa2il/templates/issue/document_detail.html
index 89831364..0340f102 100644
--- a/wasa2il/templates/issue/document_detail.html
+++ b/wasa2il/templates/issue/document_detail.html
@@ -262,7 +262,7 @@ <h3>{% trans "Versions" %}</h3>
                     <td style="white-space: nowrap;"><strong>{{ content.get_status_display }}</strong></td>
                 {% endif %}
                 <td><a href="/accounts/profile/{{ content.user }}"> {{ content.user.get_full_name|default:content.user.username }}</a></td>
-                <td>{{ content.comments|linebreaks }}</td>
+                <td>{{ content.comments|markdown|urlize }}</td>
             </tr>
             {% endfor %}
             {% if action == 'new' %}
diff --git a/wasa2il/templates/issue/issue_detail.html b/wasa2il/templates/issue/issue_detail.html
index fab97b3e..b3b45dfd 100644
--- a/wasa2il/templates/issue/issue_detail.html
+++ b/wasa2il/templates/issue/issue_detail.html
@@ -47,7 +47,7 @@ <h1>{{ issue.name }}</h1>
         {% endif %}
 
         <div class="issue-description">
-          {{ issue.description|linebreaks }}
+          {{ issue.description|markdown|urlize }}
         </div>
 
         <table class="table">
diff --git a/wasa2il/templates/issue/stub/document_view.html b/wasa2il/templates/issue/stub/document_view.html
index 5c9f00f6..37ab53de 100644
--- a/wasa2il/templates/issue/stub/document_view.html
+++ b/wasa2il/templates/issue/stub/document_view.html
@@ -101,6 +101,6 @@
         </div>
     {% endif %}
     <div id="legal-text" {% if tab == 'diff' %}style="display: none;"{% endif %}>
-    {{ documentcontent.text|markdown }}
+    {{ documentcontent.text|markdown|urlize }}
     </div>
 </div>
diff --git a/wasa2il/templates/profile/profile.html b/wasa2il/templates/profile/profile.html
index a8efd92d..1274bd17 100644
--- a/wasa2il/templates/profile/profile.html
+++ b/wasa2il/templates/profile/profile.html
@@ -31,7 +31,7 @@ <h1>{% trans "Biography" %}</h1>
           <img class="img-thumbnail" src="{{ profile.picture.url }}" />
         </div>
         {% if profile.bio %}
-            {{profile.bio|markdown}}
+            {{ profile.bio|markdown|urlize }}
         {% else %}
             {% trans "This user hasn't provided a biography." %}
         {% endif %}
diff --git a/wasa2il/templates/termsandconditions/tc_view_terms.html b/wasa2il/templates/termsandconditions/tc_view_terms.html
index 79b21bf3..b61a86ac 100644
--- a/wasa2il/templates/termsandconditions/tc_view_terms.html
+++ b/wasa2il/templates/termsandconditions/tc_view_terms.html
@@ -25,12 +25,12 @@ <h1>
         {% if terms.info %}
             <h4>{% trans 'Information' %}:</h4>
             <div class="toc-container">
-                <p>{{ terms.info|markdown }}</p>
+                <p>{{ terms.info|markdown|urlize }}</p>
             </div>
         {% endif %}
 
         <hr />
-        {{ terms.text|safe|markdown }}
+        {{ terms.text|markdown|urlize }}
 
     {% endfor %}