diff --git a/ui-log.c b/ui-log.c
index 60c9269..9b2ffb6 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -41,32 +41,33 @@ void print_commit(struct commit *commit)
html("
");
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
sha1_to_hex(commit->object.sha1));
+ html(" | ");
+ 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(" | ");
+ html(" | ");
htmlf("%d", files);
if (ctx.repo->enable_log_linecount) {
- html(" | ");
+ html(" | ");
htmlf("-%d/+%d", rem_lines, add_lines);
}
}
- html(" | ");
- html_txt(info->author);
html(" | \n");
cgit_free_commitinfo(info);
}
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
+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;
+ int i, columns = 3;
if (!tip)
argv[1] = ctx.qry.head;
@@ -92,16 +93,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
}
prepare_revision_walk(&rev);
- html("");
- html("Age | "
- "Message | ");
+ if (pager)
+ html("");
+ html("Age | "
+ "Commit message | "
+ "Author | ");
if (ctx.repo->enable_log_filecount) {
- html("Files | ");
- if (ctx.repo->enable_log_linecount)
- html("Lines | ");
+ html("Files | ");
+ columns++;
+ if (ctx.repo->enable_log_linecount) {
+ html("Lines | ");
+ columns++;
+ }
}
- html("Author |
\n");
+ html("\n");
if (ofs<0)
ofs = 0;
@@ -120,10 +126,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
free_commit_list(commit->parents);
commit->parents = NULL;
}
- html("
\n");
-
if (pager) {
- html("
---|
");
+ } else if ((commit = get_revision(&rev)) != NULL) {
+ html("");
+ cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
+ NULL, NULL);
+ html(" |
\n");
}
}
diff --git a/ui-refs.c b/ui-refs.c
index 12533cd..44c8f9a 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -62,11 +62,11 @@ static int print_branch(struct refinfo *ref)
html("");
if (ref->object->type == OBJ_COMMIT) {
- cgit_print_age(info->commit->date, -1, NULL);
+ cgit_commit_link(info->subject, NULL, NULL, name, NULL);
html(" | ");
html_txt(info->author);
- html(" | ");
- cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+ html(" | ");
+ cgit_print_age(info->commit->date, -1, NULL);
} else {
html(" | | ");
cgit_object_link(ref->object);
@@ -78,9 +78,9 @@ static int print_branch(struct refinfo *ref)
static void print_tag_header()
{
html(" | Tag | "
- "Age | "
+ "Reference | "
"Author | "
- "Reference |
\n");
+ "Age | \n");
header = 1;
}
@@ -102,20 +102,20 @@ static int print_tag(struct refinfo *ref)
html_txt(name);
html_link_close();
html("");
- if (info->tagger_date > 0)
- cgit_print_age(info->tagger_date, -1, NULL);
+ cgit_object_link(tag->tagged);
html(" | ");
if (info->tagger)
html(info->tagger);
- html(" | ");
- cgit_object_link(tag->tagged);
+ html(" | ");
+ if (info->tagger_date > 0)
+ cgit_print_age(info->tagger_date, -1, NULL);
html(" | \n");
} else {
if (!header)
print_tag_header();
html("");
html_txt(name);
- html(" | | ");
+ html(" | ");
cgit_object_link(ref->object);
html(" |
\n");
}
@@ -135,9 +135,9 @@ void cgit_print_branches(int maxcount)
int i;
html("Branch | "
- "Idle | "
+ "Commit message | "
"Author | "
- "Head commit |
\n");
+ "Age | \n");
list.refs = NULL;
list.alloc = list.count = 0;
@@ -196,6 +196,5 @@ void cgit_print_refs()
html(" |
");
cgit_print_tags(0);
}
-
html("");
}
diff --git a/ui-summary.c b/ui-summary.c
index 0b66b52..318148a 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -18,14 +18,14 @@ void cgit_print_summary()
html_include(ctx.repo->readme);
html("");
}
- if (ctx.cfg.summary_log > 0)
- cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
- NULL, NULL, 0);
html("");
- if (ctx.cfg.summary_log > 0)
- html(" |
");
cgit_print_branches(ctx.cfg.summary_branches);
html(" |
");
cgit_print_tags(ctx.cfg.summary_tags);
+ if (ctx.cfg.summary_log > 0) {
+ html(" |
");
+ cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+ NULL, NULL, 0);
+ }
html("
");
}