1 files changed, 26 insertions, 16 deletions

diff --git a/ui-log.c b/ui-log.c
index 60c9269..9b2ffb6 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,142 +1,152 @@
 /* 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;
 
         info = cgit_parse_commit(commit);
         html("<tr><td>");
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html("</td><td>");
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                          sha1_to_hex(commit->object.sha1));
+        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 class='right'>");
+                html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
-                        html("</td><td class='right'>");
+                        html("</td><td>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
-        html("</td><td>");
-        html_txt(info->author);
         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)
+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;
 
         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);
         if (rev.grep_filter) {
                 rev.grep_filter->regflags |= REG_ICASE;
                 compile_grep_patterns(rev.grep_filter);
         }
         prepare_revision_walk(&rev);
 
-        html("<table summary='log' class='list nowrap'>");
-        html("<tr class='nohover'><th class='left'>Age</th>"
-             "<th class='left'>Message</th>");
+        if (pager)
+                html("<table class='list nowrap'>");
 
+        html("<tr class='nohover'><th class='left'>Age</th>"
+             "<th class='left'>Commit message</th>"
+             "<th class='left'>Author</th>");
         if (ctx.repo->enable_log_filecount) {
-                html("<th class='right'>Files</th>");
-                if (ctx.repo->enable_log_linecount)
-                        html("<th class='right'>Lines</th>");
+                html("<th class='left'>Files</th>");
+                columns++;
+                if (ctx.repo->enable_log_linecount) {
+                        html("<th class='left'>Lines</th>");
+                        columns++;
+                }
         }
-        html("<th class='left'>Author</th></tr>\n");
+        html("</tr>\n");
 
         if (ofs<0)
                 ofs = 0;
 
         for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
 
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                 print_commit(commit);
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
-        html("</table>\n");
-
         if (pager) {
-                html("<div class='pager'>");
+                htmlf("</table><div class='pager'>",
+                     columns);
                 if (ofs > 0) {
                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                       ctx.qry.sha1, ctx.qry.path,
                                       ofs - cnt, ctx.qry.grep,
                                       ctx.qry.search);
                         html("&nbsp;");
                 }
                 if ((commit = get_revision(&rev)) != NULL) {
                         cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                                       ctx.qry.sha1, ctx.qry.path,
                                       ofs + cnt, ctx.qry.grep,
                                       ctx.qry.search);
                 }
                 html("</div>");
+        } else if ((commit = get_revision(&rev)) != NULL) {
+                html("<tr class='nohover'><td colspan='3'>");
+                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
+                              NULL, NULL);
+                html("</td></tr>\n");
         }
 }