summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-11-29 18:11:26 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-11-30 12:01:44 (UTC)
commitab67164d6217fcda5ef3e07aefa3dd6eee6b65a3 (patch) (side-by-side diff)
tree1c5430d46e9edf9306178967266c6e6373f06b31
parent951f550b60befeacd7334aebd64c891e72be5ac4 (diff)
downloadcgit-ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3.zip
cgit-ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3.tar.gz
cgit-ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3.tar.bz2
ui-log: use css to make full-log prettier
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.css15
-rw-r--r--ui-log.c14
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
@@ -107,55 +107,70 @@ div.content {
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;
}
diff --git a/ui-log.c b/ui-log.c
index adc9a66..00ecd4e 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -25,70 +25,68 @@ void count_lines(char *line, int size)
}
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;