ui-log: use css to make full-log prettier

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 21 insertions, 8 deletions

diff --git a/cgit.css b/cgit.css
index a37d218..7928c2f 100644
--- a/cgit.css
+++ b/cgit.css
@@ -75,119 +75,134 @@ table.tabs td {
 	padding: 0px 1em;
 	vertical-align: bottom;
 }
 
 table.tabs td a {
 	padding: 2px 0.75em;
 	color: #777;
 	font-size: 110%;
 }
 
 table.tabs td a.active {
 	color: #000;
 	background-color: #ccc;
 }
 
 table.tabs td.form {
 	text-align: right;
 }
 
 table.tabs td.form form {
 	padding-bottom: 2px;
 	font-size: 90%;
 	white-space: nowrap;
 }
 
 table.tabs td.form input,
 table.tabs td.form select {
 	font-size: 90%;
 }
 
 div.content {
 	margin: 0px;
 	padding: 2em;
 	border-top: solid 3px #ccc;
 	border-bottom: solid 3px #ccc;
 }
 
 
 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 0em 2em 0em;
+}
+
 table.list td a {
 	color: black;
 }
 
 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;
 	margin-bottom: 0.5em;
 }
 
 table#downloads th {
 	background-color: #ccc;
 }
 
diff --git a/ui-log.c b/ui-log.c
index adc9a66..00ecd4e 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,126 +1,124 @@
 /* ui-log.c: functions for log output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 int files, add_lines, rem_lines;
 
 void count_lines(char *line, int size)
 {
 	if (size <= 0)
 		return;
 
 	if (line[0] == '+')
 		add_lines++;
 
 	else if (line[0] == '-')
 		rem_lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
 	files++;
 	if (ctx.repo->enable_log_linecount)
 		cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
 {
 	struct commitinfo *info;
 	char *tmp;
 	int cols = 2;
 
 	info = cgit_parse_commit(commit);
-	html("<tr><td>");
+	htmlf("<tr%s><td>",
+		ctx.qry.showmsg ? " class='logheader'" : "");
 	tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
 	tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
 	html_link_open(tmp, NULL, NULL);
 	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	html_link_close();
-	html("</td><td>");
-	if (ctx.qry.showmsg)
-		html("<u>");
+	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));
-	if (ctx.qry.showmsg)
-		html("</u>");
 	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);
 		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) {
 		if (ctx.repo->enable_log_filecount) {
 			cols++;
 			if (ctx.repo->enable_log_linecount)
 				cols++;
 		}
-		htmlf("<tr class='nohover'><td></td><td colspan='%d'><div class='commit-msg'>",
+		htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
 			cols);
 		html_txt(info->msg);
-		html("</div><br/></td></tr>\n");
+		html("</td></tr>\n");
 	}
 	cgit_free_commitinfo(info);
 }
 
 
 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;
 	const char *argv[] = {NULL, tip, NULL, NULL, NULL};
 	int argc = 2;
 	int i, columns = 3;
 
 	if (!tip)
 		argv[1] = ctx.qry.head;
 
 	if (grep && pattern && (!strcmp(grep, "grep") ||
 				!strcmp(grep, "author") ||
 				!strcmp(grep, "committer")))
 		argv[argc++] = fmt("--%s=%s", grep, pattern);
 
 	if (path) {
 		argv[argc++] = "--";
 		argv[argc++] = path;
 	}
 	init_revisions(&rev, NULL);
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(argc, argv, &rev, NULL);
 	rev.grep_filter.regflags |= REG_ICASE;
 	compile_grep_patterns(&rev.grep_filter);
 	prepare_revision_walk(&rev);
 
 	if (pager)
 		html("<table class='list nowrap'>");
 
 	html("<tr class='nohover'><th class='left'>Age</th>"
 	      "<th class='left'>Commit message");
 	if (pager) {
 		html(" (");
 		cgit_log_link("toggle", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
 			      ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
 			      ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
 		html(")");
 	}