From c3da3088fb841375eaa97d972154a85f99e3898f Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 9 Jun 2023 16:57:41 -0500
Subject: [PATCH] feat: render charters on about page uring markdown
---
ietf/group/views.py | 1 +
ietf/templates/group/group_about.html | 3 +--
ietf/templates/group/group_about_rendertest.html | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ietf/group/views.py b/ietf/group/views.py
index 95bf4c5e9..ad6e8283f 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -166,6 +166,7 @@ def fill_in_charter_info(group, include_drafts=False):
group.charter_text = get_charter_text(group)
else:
group.charter_text = "Not chartered yet."
+ group.charter_html = markdown.markdown(group.charter_text)
def extract_last_name(role):
return role.person.name_parts()[3]
diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html
index 0ad9813e2..1734b1f46 100644
--- a/ietf/templates/group/group_about.html
+++ b/ietf/templates/group/group_about.html
@@ -379,8 +379,7 @@ height: 100vh;
{% if group.state_id == "proposed" %}proposed{% endif %}
{{ group.type.desc.title }}
</h2>
- {# the linebreaks filter adds <p>, no surrounding <p> necessary: #}
- {{ group.charter_text|urlize_ietf_docs|linkify|linebreaks }}
+ {{ group.charter_html }}
{% else %}
<h2 class="mt-3">
{% if requested_close or group.state_id == "conclude" %}Final{% endif %}
diff --git a/ietf/templates/group/group_about_rendertest.html b/ietf/templates/group/group_about_rendertest.html
index 3f57bccc7..b3abf7191 100644
--- a/ietf/templates/group/group_about_rendertest.html
+++ b/ietf/templates/group/group_about_rendertest.html
@@ -40,15 +40,15 @@
{% block js %}
<script>
$(document).ready(function() {
- $('input[name=widthconstraint]').trigger("change", function() {
+ $('input[name=widthconstraint]').on("change", function() {
if ($(this).is(':checked')) {
$('.rightcontent').css('max-width','700px')
} else {
$('.rightcontent').css('max-width','')
}
});
- $('input[name=widthconstraint').prop('checked', true);
- $('.rightcontent').css('max-width','700px')
+ $('input[name=widthconstraint').prop('checked', false);
+ $('.rightcontent').css('max-width','')
});
</script>
{% endblock %}
\ No newline at end of file