2 files changed, 18 insertions, 25 deletions

diff --git a/cgit.css b/cgit.css
index 0c88b65..7a5f423 100644
--- a/cgit.css
+++ b/cgit.css
@@ -116,108 +116,97 @@ div.content {
 }
 
 
 table.list {
         width: 100%;
         border: none;
         border-collapse: collapse;
 }
 
 table.list tr {
         background: white;
 }
 
 table.list tr.logheader {
         background: #eee;
 }
 
 table.list tr:hover {
         background: #eee;
 }
 
 table.list tr.nohover:hover {
         background: white;
 }
 
 table.list th {
         font-weight: bold;
         /* color: #888;
         border-top: dashed 1px #888;
         border-bottom: dashed 1px #888;
         */
         padding: 0.1em 0.5em 0.05em 0.5em;
         vertical-align: baseline;
 }
 
 table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
 table.list td.logsubject {
         font-family: monospace;
         font-weight: bold;
 }
 
 table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
-        padding: 1em 0.5em 2em 0.5em;
-}
-
-table.list td.lognotes-label {
-        text-align:right;
-        vertical-align:top;
-}
-
-table.list td.lognotes {
-        font-family: monospace;
-        white-space: pre;
-        padding: 0em 0.5em 2em 0.5em;
+        padding: 0 0.5em;
 }
 
 table.list td a {
         color: black;
 }
 
 table.list td a.ls-dir {
         font-weight: bold;
         color: #00f;
 }
 
 table.list td a:hover {
         color: #00f;
 }
 
 img {
         border: none;
 }
 
 input#switch-btn {
         margin: 2px 0px 0px 0px;
 }
 
 td#sidebar input.txt {
         width: 100%;
         margin: 2px 0px 0px 0px;
 }
 
 table#grid {
         margin: 0px;
 }
 
 td#content {
         vertical-align: top;
         padding: 1em 2em 1em 1em;
         border: none;
 }
 
 div#summary {
         vertical-align: top;
         margin-bottom: 1em;
 }
 
 table#downloads {
         float: right;
         border-collapse: collapse;
         border: solid 1px #777;
         margin-left: 0.5em;
diff --git a/ui-log.c b/ui-log.c
index 27f5a1a..6d7fcae 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -66,119 +66,123 @@ void show_commit_decorations(struct commit *commit)
                                       sha1_to_hex(commit->object.sha1),
                                       ctx.qry.vpath, 0, NULL, NULL,
                                       ctx.qry.showmsg);
                 }
                 else {
                         strncpy(buf, deco->name, sizeof(buf) - 1);
                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
                                          sha1_to_hex(commit->object.sha1),
                                          ctx.qry.vpath, 0);
                 }
                 deco = deco->next;
         }
 }
 
 void print_commit(struct commit *commit)
 {
         struct commitinfo *info;
         char *tmp;
         int cols = 2;
 
         info = cgit_parse_commit(commit);
         htmlf("<tr%s><td>",
                 ctx.qry.showmsg ? " class='logheader'" : "");
         tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
         tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
         html_link_open(tmp, NULL, NULL);
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html_link_close();
         htmlf("</td><td%s>",
                 ctx.qry.showmsg ? " class='logsubject'" : "");
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                          sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
         show_commit_decorations(commit);
         html("</td><td>");
         html_txt(info->author);
         if (ctx.repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
                         html("</td><td>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
         html("</td></tr>\n");
-        if (ctx.qry.showmsg) {
-                struct strbuf notes = STRBUF_INIT;
-                format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
+
+        if (ctx.qry.showmsg) { /* Print message + notes in a second table row */
+                /* Concatenate commit message and notes in msgbuf */
+                struct strbuf msgbuf = STRBUF_INIT;
+                if (info->msg && *(info->msg)) {
+                        strbuf_addstr(&msgbuf, info->msg);
+                        strbuf_addch(&msgbuf, '\n');
+                }
+                format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING,
+                            NOTES_SHOW_HEADER | NOTES_INDENT);
+                strbuf_addch(&msgbuf, '\n');
+                strbuf_ltrim(&msgbuf);
 
                 if (ctx.repo->enable_log_filecount) {
                         cols++;
                         if (ctx.repo->enable_log_linecount)
                                 cols++;
                 }
+
+                /* Create second table row containing msgbuf */
                 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
                         cols);
-                html_txt(info->msg);
+                html_txt(msgbuf.buf);
                 html("</td></tr>\n");
-                if (notes.len != 0) {
-                        html("<tr class='nohover'>");
-                        html("<td class='lognotes-label'>Notes:</td>");
-                        htmlf("<td colspan='%d' class='lognotes'>",
-                                cols);
-                        html_txt(notes.buf);
-                        html("</td></tr>\n");
-                }
-                strbuf_release(&notes);
+                strbuf_release(&msgbuf);
         }
+
         cgit_free_commitinfo(info);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
         unsigned char sha1[20];
         const char *longref;
 
         longref = fmt("refs/heads/%s", ref);
         if (get_sha1(longref, sha1) == 0)
                 return longref;
 
         return ref;
 }
 
 static char *next_token(char **src)
 {
         char *result;
 
         if (!src || !*src)
                 return NULL;
         while (isspace(**src))
                 (*src)++;
         if (!**src)
                 return NULL;
         result = *src;
         while (**src) {
                 if (isspace(**src)) {
                         **src = '\0';
                         (*src)++;
                         break;
                 }
                 (*src)++;
         }
         return result;
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
                     char *path, int pager)
 {
         struct rev_info rev;
         struct commit *commit;
         struct vector vec = VECTOR_INIT(char *);
         int i, columns = 3;
         char *arg;
 
         /* First argv is NULL */
         vector_push(&vec, NULL, 0);