9 files changed, 127 insertions, 32 deletions

diff --git a/cgit.c b/cgit.c
index 7b7afba..fedf355 100644
--- a/cgit.c
+++ b/cgit.c
@@ -79,29 +79,38 @@ static void cgit_print_repo_page(struct cacheitem *item)
         show_search = 0;
         setenv("GIT_DIR", cgit_repo->path, 1);
 
         if (cgit_repo->snapshots && cgit_query_page && 
             !strcmp(cgit_query_page, "snapshot")) {
                 cgit_print_snapshot(item, cgit_query_sha1, "zip", 
                                     cgit_repo->url, cgit_query_name);
                 return;
         }
 
         if (cgit_query_page && !strcmp(cgit_query_page, "log"))
                 show_search = 1;
+
         cgit_print_docstart(title, item);
-        cgit_print_pageheader(title, show_search);
+
+
         if (!cgit_query_page) {
+                cgit_print_pageheader("summary", show_search);
                 cgit_print_summary();
-        } else if (!strcmp(cgit_query_page, "log")) {
+                cgit_print_docend();
+                return;
+        }
+
+        cgit_print_pageheader(cgit_query_page, show_search);
+
+        if (!strcmp(cgit_query_page, "log")) {
                 cgit_print_log(cgit_query_head, cgit_query_ofs, 100, 
                                cgit_query_search);
         } else if (!strcmp(cgit_query_page, "tree")) {
                 cgit_print_tree(cgit_query_sha1, cgit_query_path);
         } else if (!strcmp(cgit_query_page, "commit")) {
                 cgit_print_commit(cgit_query_sha1);
         } else if (!strcmp(cgit_query_page, "view")) {
                 cgit_print_view(cgit_query_sha1);
         } else if (!strcmp(cgit_query_page, "diff")) {
                 cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
         } else {
                 cgit_print_error("Invalid request");
diff --git a/cgit.css b/cgit.css
index 5c4b15b..640bbc9 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,179 +1,249 @@
 body {
         font-family: arial;
         font-size: 11pt;
         background: white;
         padding: 0em;
         margin: 0em;
 }
 
 
 h2 {
         font-size: 120%;
         font-weight: bold;
-        margin-bottom: 0.5em;
+        margin-bottom: 0.25em;
+}
+
+h3 {
+        margin-top: 0em;
+        font-size: 100%;
+        font-weight: normal;
 }
 
 a {
         color: blue;
         text-decoration: none;
 }
 
 a:hover {
         text-decoration: underline;
 }
 
 table.list {
         border: none;
         border-collapse: collapse;
 }
+
 table.list tr {
         background: white;
 }
+
 table.list tr:hover {
         background: #eee;
 }
+
 table.list tr.nohover:hover {
         background: white;
 }
+
 table.list th {
         font-weight: normal;
         border-bottom: solid 1px #777;
         padding: 0.1em 0.5em 0.1em 0.5em;
         vertical-align: baseline;
 }
+
 table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
+
 img {
         border: none;
 }
+
 table#layout {
         width: 100%;
-        border-collapse: collapse;
+        border-collapse: separate;
+        border-spacing: 0px;
         margin: 0px;
 }
-td#header {
+
+td#header, td#logo {
+        color: #666;
         background-color: #ddd;
-        padding: 0.25em 0.25em 0.25em 0.5em;
+        border-bottom: solid 1px #000;
+}
+
+td#header {
         font-size: 150%;
         font-weight: bold;
-        border-bottom: solid 1px #aaa;
+        padding: 0.2em 0.5em;
+        vertical-align: text-bottom;
+}
+
+td#logo {
+        text-align: right;
         vertical-align: middle;
+        padding-right: 0.5em;
+}
+
+td#crumb, td#search {
+        color: #ccc;
+        border-top: solid 3px #555;
+        background-color: #666;
+        border-bottom: solid 1px #333;
+        padding: 2px 1em;
+}
+
+td#crumb {
+        font-weight: bold;
+}
+
+td#crumb a {
+        color: #ccc;
 }
-td#header img#logo {
-        float: right;
+
+td#crumb a:hover {
+        color: #eee;
 }
 
-td#header input {
-        float: right;
-        margin: 0.25em 1em;
+td#search {
+        text-align: right;
+        vertical-align: center;
+        padding-right: 0.5em;
 }
-td#header a {
-        color: black;
+
+td#search form {
+        margin: 0px;
+        padding: 0px;
+}
+
+td#search input {
+        font-size: 9pt;
+        padding: 0px;
+        width: 10em;
+        border: solid 1px #333;
+        color: #333;
+        background-color: #fff;
 }
 
 td#content {
         padding: 1em 0.5em;
 }
 
 div#blob {
         border: solid 1px black;
 }
 
 div.error {
         color: red;
         font-weight: bold;
         margin: 1em 2em;
 }
+
 div.ls-blob, div.ls-dir {
         font-family: monospace;
 }
+
 div.ls-dir a {
         font-weight: bold;
 }
+
 th.filesize, td.filesize {
         text-align: right;
 }
+
 td.filesize {
         font-family: monospace;
 }
+
 td.filemode {
         font-family: monospace;
 }
 
 td.blob {
         white-space: pre;
         font-family: monospace;
         background-color: white;
 }
 
 table.nowrap td {
         white-space: nowrap;
 }
 
 table.commit-info {
         border-collapse: collapse;
         margin-top: 1.5em;
 }
+
 table.commit-info th {
         text-align: left;
         font-weight: normal;
         padding: 0.1em 1em 0.1em 0.1em;
 }
+
 table.commit-info td {
         font-weight: normal;
         padding: 0.1em 1em 0.1em 0.1em;
 }
+
 div.commit-subject {
         font-weight: bold;
         font-size: 125%;
         margin: 1.5em 0em 0.5em 0em;
         padding: 0em;
 }
+
 div.commit-msg {
         white-space: pre;
         font-family: monospace;
 }
+
 table.diffstat {
         border-collapse: collapse;
         margin-top: 1.5em;
 }
+
 table.diffstat th {
         font-weight: normal;
         text-align: left;
         text-decoration: underline;
         padding: 0.1em 1em 0.1em 0.1em;
         font-size: 100%;
 }
+
 table.diffstat td {
         padding: 0.1em 1em 0.1em 0.1em;
         font-size: 100%;
 }
+
 table.diffstat td span.modechange {
         padding-left: 1em;
         color: red;
 }
+
 table.diffstat td.add a {
         color: green;
 }
+
 table.diffstat td.del a {
         color: red;
 }
+
 table.diffstat td.upd a {
         color: blue;
 }
+
 table.diffstat td.summary {
-        /* border-top: solid 1px black; */
         color: #888;
         padding-top: 0.5em;
 }
 
 table.diff td {
         border: solid 1px black;
         font-family: monospace;
         white-space: pre;
 }
 
 table.diff td div.hunk {
         background: #ccc;
@@ -182,18 +252,20 @@ table.diff td div.hunk {
 table.diff td div.add {
         color: green;
 }
 
 table.diff td div.del {
         color: red;
 }
 
 .sha1 {
         font-family: courier;
         font-size: 90%;
 }
+
 .left {
         text-align: left;
 }
+
 .right {
         text-align: right;
 }
diff --git a/ui-diff.c b/ui-diff.c
index 0bd9ade..b6486f1 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -115,17 +115,16 @@ static void run_diff(const unsigned char *sha1, const unsigned char *sha2)
         xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
 }
 
 
 
 void cgit_print_diff(const char *old_hex, const char *new_hex)
 {
         unsigned char sha1[20], sha2[20];
 
         get_sha1(old_hex, sha1);
         get_sha1(new_hex, sha2);
 
-        html("<h2>diff</h2>\n");
         html("<table class='diff'><tr><td>");
         run_diff(sha1, sha2);
         html("</td></tr></table>");
 }
diff --git a/ui-log.c b/ui-log.c
index 24d571d..159393a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -45,25 +45,24 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
         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("<h2>Log</h2>");
         html("<table class='list nowrap'>");
         html("<tr class='nohover'><th class='left'>Date</th>"
              "<th class='left'>Message</th>"
              "<th class='left'>Author</th></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);
diff --git a/ui-repolist.c b/ui-repolist.c
index 011ec95..2ce0d6a 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,25 +7,24 @@
  */
 
 #include "cgit.h"
 
 void cgit_print_repolist(struct cacheitem *item)
 {
         struct repoinfo *repo;
         int i;
 
         cgit_print_docstart(cgit_root_title, item);
         cgit_print_pageheader(cgit_root_title, 0);
 
-        html("<h2>Repositories</h2>\n");
         html("<table class='list nowrap'>");
         html("<tr class='nohover'>"
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
              "<th class='left'>Owner</th></tr>\n");
 
         for (i=0; i<cgit_repolist.count; i++) {
                 repo = &cgit_repolist.repos[i];
                 html("<tr><td>");
                 html_link_open(cgit_repourl(repo->url), NULL, NULL);
                 html_txt(repo->name);
                 html_link_close();
diff --git a/ui-shared.c b/ui-shared.c
index 172499c..bca50aa 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -31,24 +31,32 @@ static long ttl_seconds(long ttl)
                 return 60 * 60 * 24 * 365;
         else
                 return ttl * 60;
 }
 
 void cgit_print_error(char *msg)
 {
         html("<div class='error'>");
         html_txt(msg);
         html("</div>\n");
 }
 
+char *cgit_rooturl()
+{
+        if (cgit_virtual_root)
+                return fmt("%s/", cgit_virtual_root);
+        else
+                return "./cgit.cgi";
+}
+
 char *cgit_repourl(const char *reponame)
 {
         if (cgit_virtual_root) {
                 return fmt("%s/%s/", cgit_virtual_root, reponame);
         } else {
                 return fmt("?r=%s", reponame);
         }
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename, 
                    const char *query)
 {
@@ -104,54 +112,63 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
         html("</head>\n");
         html("<body>\n");
 }
 
 void cgit_print_docend()
 {
         html("</td></tr></table>");
         html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
-        html("<table id='layout'><tr><td id='header'>");
-        htmlf("<a href='%s'>", cgit_logo_link);
-        htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
-        htmlf("</a>");
+        html("<table id='layout'>");
+        html("<tr><td id='header'>");
+        html(cgit_root_title);
+        html("</td><td id='logo'>");
+        html("<a href='");
+        html_attr(cgit_logo_link);
+        htmlf("'><img src='%s'/></a>", cgit_logo);
+        html("</td></tr>");
+        html("<tr><td id='crumb'>");
+        htmlf("<a href='%s'>root</a>", cgit_rooturl());
+        if (cgit_query_repo) {
+                htmlf(" : <a href='%s'>", cgit_repourl(cgit_repo->url));
+                html_txt(cgit_repo->name);
+                htmlf("</a> : %s", title);
+        }
+        html("</td>");
+        html("<td id='search'>");
         if (show_search) {
                 html("<form method='get' href='");
                 html_attr(cgit_currurl());
                 html("'>");
                 if (!cgit_virtual_root) {
                         if (cgit_query_repo)
                                 html_hidden("r", cgit_query_repo);
                         if (cgit_query_page)
                                 html_hidden("p", cgit_query_page);
                 }
                 if (cgit_query_head)
                         html_hidden("h", cgit_query_head);
                 if (cgit_query_sha1)
                         html_hidden("id", cgit_query_sha1);
                 if (cgit_query_sha2)
                         html_hidden("id2", cgit_query_sha2);
                 html("<input type='text' name='q' value='");
                 html_attr(cgit_query_search);
                 html("'/></form>");
         }
-        if (cgit_query_repo)
-                htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
-        html_txt(title);
-        if (cgit_query_repo)
-                html("</a>");
-        html("</td></tr><tr><td id='content'>");
+        html("</td></tr>");
+        html("<tr><td id='content' colspan='2'>");
 }
 
 void cgit_print_snapshot_start(const char *mimetype, const char *filename, 
                                struct cacheitem *item)
 {
         htmlf("Content-Type: %s\n", mimetype);
         htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
         htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
         htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                          ttl_seconds(item->ttl)));
         html("\n");
 }
diff --git a/ui-summary.c b/ui-summary.c
index ff3ed4d..42f4300 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -120,20 +120,22 @@ static void cgit_print_branches()
 static void cgit_print_tags()
 {
         html("<tr class='nohover'><th class='left'>Tag</th>"
              "<th class='left'>Created</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Reference</th></tr>\n");
         for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 void cgit_print_summary()
 {
         html("<h2>");
-        html_txt("Repo summary page");
-        html("</h2>");
+        html(cgit_repo->name);
+        html("</h2><h3>");
+        html(cgit_repo->desc);
+        html("</h3>");
         html("<table class='list nowrap'>");
         cgit_print_branches();
         html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
         cgit_print_tags();
         html("</table>");
 }
diff --git a/ui-tree.c b/ui-tree.c
index 1d07e70..b00670e 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -57,23 +57,22 @@ void cgit_print_tree(const char *hex, char *path)
         unsigned char sha1[20];
 
         if (get_sha1_hex(hex, sha1)) {
                 cgit_print_error(fmt("Invalid object id: %s", hex));
                 return;
         }
         tree = parse_tree_indirect(sha1);
         if (!tree) {
                 cgit_print_error(fmt("Not a tree object: %s", hex));
                 return;
         }
 
-        html("<h2>Tree content</h2>\n");
         html_txt(path);
         html("<table class='list'>\n");
         html("<tr class='nohover'>");
         html("<th class='left'>Mode</th>");
         html("<th class='left'>Name</th>");
         html("<th class='right'>Size</th>");
         html("</tr>\n");
         read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
         html("</table>\n");
 }
diff --git a/ui-view.c b/ui-view.c
index 07cd8be..85e223c 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -23,20 +23,19 @@ void cgit_print_view(const char *hex)
         if (sha1_object_info(sha1, type, &size)){
                 cgit_print_error("Bad object name");
                 return;
         }
 
         buf = read_sha1_file(sha1, type, &size);
         if (!buf) {
                 cgit_print_error("Error reading object");
                 return;
         }
 
         buf[size] = '\0';
-        html("<h2>Object content</h2>\n");
         html("<table class='list'>\n");
         htmlf("<tr class='nohover'><th class='left'>%s %s, %li bytes</th></tr>\n", type, hex, size);
         html("<tr><td class='blob'>\n");
         html_txt(buf);
         html("\n</td></tr>\n");
         html("</table>\n");
 }