Drop pre flag of Text module

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

diff --git a/src/templates/distro-source-commit-detail.html b/src/templates/distro-source-commit-detail.html
index e411b6d90a2b8489ecce6a7c43fa98ee2e61c31b..9f26c81e181ee9f7b58cb4a05cbe03c51b144fc9 100644 (file)
--- a/src/templates/distro-source-commit-detail.html
+++ b/src/templates/distro-source-commit-detail.html
@@ -59,15 +59,11 @@
                                                <td>{{ _("Committer") }}</td>
                                                <td>{% raw format_email(commit.committer) %}</td>
                                        </tr>
-                                       <tr>
-                                               <td>{{ _("Subject") }}</td>
-                                               <td>{{ commit.subject }}</td>
-                                       </tr>
 
                                        {% if commit.message %}
                                                <tr>
                                                        <td colspan="2">
-                                                               {% module Text(commit.message, pre=True) %}
+                                                               {% module CommitMessage(commit) %}
                                                        </td>
                                                </tr>
                                        {% end %}

diff --git a/src/templates/modules/log-entry-small.html b/src/templates/modules/log-entry-small.html
index 4ae75f58b36fbbb8e29d0d3ae2c893e9b50407eb..24632b150286c8e9f451caad4b8ac3905e5f70f5 100644 (file)
--- a/src/templates/modules/log-entry-small.html
+++ b/src/templates/modules/log-entry-small.html
@@ -6,6 +6,6 @@
                        {{ format_date(entry.time) }}
                </p>
 
-               {% module Text(entry.get_message(current_user), pre=False) %}
+               {% module Text(entry.get_message(current_user)) %}
        </div>
 </li>

diff --git a/src/templates/modules/log-entry.html b/src/templates/modules/log-entry.html
index 53edce8f51263addffd38d7986ecaa10a36d7bb6..7b995493b6f188fa833e80a4d59a23b60214ee9d 100644 (file)
--- a/src/templates/modules/log-entry.html
+++ b/src/templates/modules/log-entry.html
@@ -33,7 +33,7 @@
                        {% end block %}
 
                        {% block message %}
-                               {% module Text(entry.get_message(current_user), pre=False) %}
+                               {% module Text(entry.get_message(current_user)) %}
                        {% end block %}
                </div>
        {% end block %}

diff --git a/src/templates/repository-detail.html b/src/templates/repository-detail.html
index 4a4db0aeffa6a9c9998c5b8c80564216f7787961..1d8338e41a5d3155760c788fdc914758132bffbd 100644 (file)
--- a/src/templates/repository-detail.html
+++ b/src/templates/repository-detail.html
@@ -55,7 +55,7 @@
        <div class="row">
                <div class="span8">
                        <blockquote>
-                               {% module Text(repo.description, pre=False) %}
+                               {% module Text(repo.description) %}
                        </blockquote>
 
                        <br><br>

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index 8fd65adb93d6c078e532050d1ee118e7fed5bd53..fe22f97225467d393a9ca39cf09a7f68a64bbfb2 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -33,7 +33,7 @@ class TextModule(UIModule):
                        paragraph = "".join(line_iteration)
                        yield paragraph.replace("\n", " ")
 
-       def render(self, text, pre=False):
+       def render(self, text):
                # Handle empty messages
                if not text:
                        return ""
@@ -44,9 +44,6 @@ class TextModule(UIModule):
                # Search for CVE numbers and create hyperlinks.
                text = re.sub(self.CVE_PATTERN, self._cve_repl, text, re.I|re.U)
 
-               if pre:
-                       return "<pre>%s</pre>" % text
-
                return text
 
        def _bugzilla_repl(self, m):