From 2f1fa20cd968889ae5ce06618314a070db73e8e0 Mon Sep 17 00:00:00 2001
From: davewiththenicehat
 <54369722+davewiththenicehat@users.noreply.github.com>
Date: Sat, 5 Jun 2021 10:42:09 -0400
Subject: [PATCH] DetailView entry text spacing & ascii fix

---
 evennia/web/templates/website/help_detail.html | 2 +-
 evennia/web/website/views/help.py              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/evennia/web/templates/website/help_detail.html b/evennia/web/templates/website/help_detail.html
index 4c1f51d0cf..9da5ad3a1f 100644
--- a/evennia/web/templates/website/help_detail.html
+++ b/evennia/web/templates/website/help_detail.html
@@ -25,7 +25,7 @@
         <div class="row">
           <!-- left column -->
           <div class="col-lg-9 col-sm-12">
-            <p>{{ entry_text }}</p>
+            <pre>{{ entry_text }}</pre>
 
             {% if topic_previous or topic_next %}
             <hr />
diff --git a/evennia/web/website/views/help.py b/evennia/web/website/views/help.py
index e2ceae23cb..e9dbb8be42 100644
--- a/evennia/web/website/views/help.py
+++ b/evennia/web/website/views/help.py
@@ -1,6 +1,8 @@
 """
 Views to manipulate help entries.
 
+Multi entry object type supported added by DaveWithTheNiceHat 2021
+    Pull Request #2429
 """
 from django.utils.text import slugify
 from django.conf import settings
@@ -11,6 +13,7 @@ from evennia.help.models import HelpEntry
 from evennia.help.filehelp import FILE_HELP_ENTRIES
 from .mixins import TypeclassMixin
 from evennia.utils.logger import log_info
+from evennia.utils.ansi import strip_ansi
 
 DEFAULT_HELP_CATEGORY = settings.DEFAULT_HELP_CATEGORY
 
@@ -305,10 +308,8 @@ class HelpDetailView(HelpMixin, DetailView):
             text = obj.db_entrytext
         elif inherits_from(obj, "evennia.help.filehelp.FileHelpEntry"):
             text = obj.entrytext
-        text = text.replace("\r\n\r\n", "\n\n")
-        text = text.replace("\r\n", "\n")
-        text = text.replace("\n", "<br />")
-        context["entry_text"] = text
+        text = strip_ansi(text)  # remove ansii markups
+        context["entry_text"] = text.strip()
         log_info('get_context_data success')
         return context