Merge branch 'lh/layout'

* lh/layout:
  Make repository search case insensitive
  Remove 'patch' link from tab, add to commit view
  Implement minimal freetext search in the repolist
  More layout fixes
  Minor fixup in tree-view css
  Reintroduce the branch switcher
  Add fixed link to index page from repo header
  Include diff in commit view
  Replace sidebar/logo

1 files changed, 11 insertions, 3 deletions

diff --git a/ui-commit.c b/ui-commit.c
index 8019e36..dd36cc0 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -4,16 +4,17 @@
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-diff.h"
 
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
 static char *curr_rev;
 
 static struct fileinfo {
         char status;
@@ -169,16 +170,22 @@ void cgit_print_commit(char *hex)
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
         html(" ");
         html_txt(info->committer_email);
         html("</td><td class='right'>");
         cgit_print_date(info->committer_date, FMT_LONGDATE);
         html("</td></tr>\n");
+        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
+        tmp = sha1_to_hex(commit->object.sha1);
+        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+        html(" (");
+        cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+        html(")</td></tr>\n");
         html("<tr><th>tree</th><td colspan='2' class='sha1'>");
         tmp = xstrdup(hex);
         cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                        ctx.qry.head, tmp, NULL);
         html("</td></tr>\n");
               for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
                 if (!parent) {
@@ -213,16 +220,17 @@ void cgit_print_commit(char *hex)
                 html("<div class='diffstat-header'>Diffstat</div>");
                 html("<table summary='diffstat' class='diffstat'>");
                 max_changes = 0;
                 cgit_diff_commit(commit, inspect_filepair);
                 for(i = 0; i<files; i++)
                         print_fileinfo(&items[i]);
                 html("</table>");
                 html("<div class='diffstat-summary'>");
-                htmlf("%d files changed, %d insertions, %d deletions (",
+                htmlf("%d files changed, %d insertions, %d deletions",
                       files, total_adds, total_rems);
-                cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex,
-                               NULL, NULL);
+                cgit_print_diff(ctx.qry.sha1,
+                                sha1_to_hex(commit->parents->item->object.sha1),
+                                NULL);
                 html(")</div>");
         }
         cgit_free_commitinfo(info);
 }