Improve formatting of commit message and introduce own module

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

diff --git a/Makefile.am b/Makefile.am
index 0dd77d78d79acfc4a34b7d784fa173c205e93aee..6a77265aec78b34ccd8b1cd04fd33f4796228122 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,6 +259,7 @@ dist_templates_modules_DATA = \
        src/templates/modules/build-table.html \
        src/templates/modules/comments-table.html \
        src/templates/modules/commits-table.html \
+       src/templates/modules/commit-message.html \
        src/templates/modules/files-table.html \
        src/templates/modules/footer.html \
        src/templates/modules/jobs-table.html \

diff --git a/src/templates/build-detail.html b/src/templates/build-detail.html
index 608aa2a44975c8ec6dafc881914a1f1120814bba..0d53c15849be33a378123d5e203ccb049453cd11 100644 (file)
--- a/src/templates/build-detail.html
+++ b/src/templates/build-detail.html
@@ -90,9 +90,7 @@
                                <div class="span9">
                                        {% if build.type == "release" %}
                                                {% if build.commit %}
-                                                       {% apply linkify %}
-                                                               {% module Text(build.commit) %}
-                                                       {% end %}
+                                                       {% module CommitMessage(build.commit) %}
 
                                                        <hr>
 

diff --git a/src/templates/modules/changelog/entry.html b/src/templates/modules/changelog/entry.html
index f9c2d62ad22710906e843ae13fcc1e4645964bbc..c4a8460f7d93a366a3026a70c57bb78532ec4ceb 100644 (file)
--- a/src/templates/modules/changelog/entry.html
+++ b/src/templates/modules/changelog/entry.html
@@ -28,9 +28,7 @@
 
                        {% if build.type == "release" %}
                                {% if build.commit %}
-                                       {% apply linkify %}
-                                               {% module Text(build.commit) %}
-                                       {% end %}
+                                       {% module CommitMessage(build.commit) %}
 
                                        <hr>
 

diff --git a/src/templates/modules/commit-message.html b/src/templates/modules/commit-message.html
new file mode 100644 (file)
index 0000000..0f1fa38
--- /dev/null
+++ b/src/templates/modules/commit-message.html
@@ -0,0 +1,5 @@
+<h4>{{ commit.subject }}</h4>
+
+{% apply linkify %}
+       {% module Text(commit.message) %}
+{% end %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index a6c28ff682c0f1c0ea88a59cb2c1c420e7b6b0ee..754b0b5281e0cdb2044245ed83a03bebbb85317e 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -73,6 +73,7 @@ class Application(tornado.web.Application):
                                # Packages
                                "PackagesDependencyTable" : ui_modules.PackagesDependencyTableModule,
 
+                               "CommitMessage"      : ui_modules.CommitMessageModule,
                                "CommitsTable"       : ui_modules.CommitsTableModule,
                                "JobsBoxes"          : ui_modules.JobsBoxesModule,
                                "JobState"           : ui_modules.JobStateModule,

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index e8b809c8abd78864ccdff5c567ff9d29f7c3ab84..64cee89fbba81cdfb649891139b367cb662f601e 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -10,7 +10,6 @@ import re
 import string
 import tornado.web
 
-from .. import sources
 from .. import users
 from ..constants import *
 
@@ -35,9 +34,6 @@ class TextModule(UIModule):
                        yield paragraph.replace("\n", " ")
 
        def render(self, text, pre=False, remove_linebreaks=True):
-               if isinstance(text, sources.Commit):
-                       text = self._get_commit_message(text)
-
                if remove_linebreaks:
                        text = text.replace("\n", " ")
 
@@ -63,10 +59,10 @@ class TextModule(UIModule):
        def _cve_repl(self, m):
                return self.LINK % ("http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s" % m.group(1), m.group(0))
 
-       def _get_commit_message(self, commit):
-               text = (commit.subject, commit.message)
 
-               return "\n\n".join(text)
+class CommitMessageModule(UIModule):
+       def render(self, commit):
+               return self.render_string("modules/commit-message.html", commit=commit)
 
 
 class ModalModule(UIModule):