Merge pull request #35 from Xpirix/fix_notable_fixes_markdown

Fix markown rendering for changelog

Author: Xpirix

django_project/base/templatetags/custom_markup.py

@@ -23,8 +23,9 @@ def base_markdown(value):
         extensions=extensions,
         safe_mode=True,
         enable_attributes=False)
-    html_output = html_output.replace(
-        '<table>', '<table class="table table-striped table-bordered"')
+    # html_output = html_output.replace(
+    #     '<table>', '<p><table>').replace(
+    #         '</table>', '</table></p>')
     return mark_safe(html_output)
 
 

django_project/changes/templates/entry/includes/entry_detail.html

@@ -53,11 +53,11 @@ <h3><span>Feature:</span> {{ entry.title }}</h3>
        word-wrap: normal;
    }
 </style>
-    <div class="column is-8">
+    <div class="column">
         {{ entry.description|base_markdown }}
     </div>
+    {% if entry.image_file %}
     <div class="column is-4 has-text-centered">
-        {% if entry.image_file %}
             {% if entry.image_file|is_gif %}
                 {% if not rst_download %}
                     <img id="{{ entry.image_file.url }}" class="image"
@@ -81,8 +81,8 @@ <h3><span>Feature:</span> {{ entry.title }}</h3>
                          alt=""/>
                 </a>
             {% endif %}
-        {% endif %}
-    </div>
+        </div>
+    {% endif %}
 </div>
 
 {% if entry.video %}

django_project/changes/views/version.py

@@ -693,11 +693,10 @@ def render_to_response(self, context, **response_kwargs):
             context=context,
             **response_kwargs
         )
-
         # convert the html to markdown
         converted_doc = pypandoc.convert_text(
             document.rendered_content.encode('utf8', 'ignore'),
-            'md', format='html', extra_args=['--wrap=none'])
+            'gfm', format='html')
         converted_doc = converted_doc.replace('/media/images/', 'images/')
 
         # prepare the ZIP file
@@ -766,10 +765,13 @@ def _prepare_zip_archive(self, document, version_obj):
         document = self._convert_headers(document)
         # Remove CSS styles and classes
         document = re.sub(r'\{.*?\}', '', document)
-        # Regular expression pattern for Markdown image syntax
-        pattern = re.compile(r'!\[.*?\]\((.*?)\)')
-        # Find all matches
-        images = pattern.findall(document)
+        # Use BeautifulSoup to extract image sources from HTML <img> tags
+        images = []
+        soup = BeautifulSoup(document, 'html.parser')
+        for img_tag in soup.find_all('img'):
+            src = img_tag.get('src')
+            if src and src.startswith('images/'):
+                images.append(src)
         if not images:
             images = []