web: Always wrap any custom text into a content div

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index c825c168fc5077fcf0e6241fd8187dd1fea80fbe..c014540ba07be8205afe2ae9ba08c4f3ab0cf8b8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -261,7 +261,8 @@ dist_templates_modules_DATA = \
        src/templates/modules/commit-message.html \
        src/templates/modules/link-to-user.html \
        src/templates/modules/packages-files-table.html \
-       src/templates/modules/source-table.html
+       src/templates/modules/source-table.html \
+       src/templates/modules/text.html
 
 templates_modulesdir = $(templatesdir)/modules
 

diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html
index 3cd393e50c552d79a191e66b240ace08e8071cb0..299268774d32d430373dfde85083ca75153484c3 100644 (file)
--- a/src/templates/builders/detail.html
+++ b/src/templates/builders/detail.html
@@ -80,9 +80,7 @@
                                        {% end %}
 
                                        {% if builder.description %}
-                                               <div class="content">
-                                                       {% module Text(builder.description) %}
-                                               </div>
+                                               {% module Text(builder.description) %}
                                        {% end %}
                                </div>
 

diff --git a/src/templates/builds/show.html b/src/templates/builds/show.html
index c5d31c1ac5af368e4b72f644fbba3b59ab654f99..82003892400e7dc4248114b54496d739fb70903f 100644 (file)
--- a/src/templates/builds/show.html
+++ b/src/templates/builds/show.html
@@ -46,9 +46,7 @@
                                                        </small>
                                                </p>
 
-                                               <div class="content">
-                                                       {% module Text(build.message) %}
-                                               </div>
+                                               {% module Text(build.message) %}
                                        </div>
                                {% end %}
                        </div>

diff --git a/src/templates/distros/show.html b/src/templates/distros/show.html
index 752a2e176f32983b669b452a65c9518fd7686bb4..a3415935106c52050c2459377e8542d7cf82ef85 100644 (file)
--- a/src/templates/distros/show.html
+++ b/src/templates/distros/show.html
@@ -22,9 +22,7 @@
        {% if distro.description %}
                <div class="block">
                        <div class="box">
-                               <div class="content">
-                                       {% module Text(distro.description) %}
-                               </div>
+                               {% module Text(distro.description) %}
 
                                <nav class="level">
                                        <div class="level-left">

diff --git a/src/templates/modules/text.html b/src/templates/modules/text.html
new file mode 100644 (file)
index 0000000..774ccf3
--- /dev/null
+++ b/src/templates/modules/text.html
@@ -0,0 +1,3 @@
+<div class="content">
+       {% raw text %}
+</div>

diff --git a/src/templates/packages/modules/info.html b/src/templates/packages/modules/info.html
index 14bead0958fae5a9f8311d28d4f8a1267acaede6..323aad7cc0a6cea11d7e8761f53b1fde36f06f7b 100644 (file)
--- a/src/templates/packages/modules/info.html
+++ b/src/templates/packages/modules/info.html
@@ -67,9 +67,7 @@
                                {% end %}
                        </nav>
 
-                       <div class="content">
-                               {% module Text(package.description) %}
-                       </div>
+                       {% module Text(package.description) %}
                </div>
        </div>
 </div>

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index f189be3fa6ca3659beaa3be26501f559ff7c829c..8ef3ccee9e5bee25840f48a5b0f60685ea1625a8 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -21,13 +21,17 @@ class TextModule(UIModule):
                Renders the text through the Markdown processor
        """
        def render(self, text):
-               return markdown.markdown(text,
-                       extensions=[
-                               PrettyLinksExtension(),
-                               "codehilite",
-                               "fenced_code",
-                               "sane_lists",
-                       ])
+               # Pass the text through a markdown processor
+               if text:
+                       text = markdown.markdown(text,
+                               extensions=[
+                                       PrettyLinksExtension(),
+                                       "codehilite",
+                                       "fenced_code",
+                                       "sane_lists",
+                               ])
+
+               return self.render_string("modules/text.html", text=text)
 
 
 class PrettyLinksExtension(markdown.extensions.Extension):