Small layout adjustments to summary and blob view

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

3 files changed, 13 insertions, 5 deletions

diff --git a/cgit.css b/cgit.css
index c16f3f2..97b4e27 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,72 +1,78 @@
 body {
         font-family: arial;
         font-size: normal;
         background: white;
         padding: 0em;
         margin: 0.5em;
 }
 
 
 h2 {
         font-size: normal;
         font-weight: bold;
         margin-bottom: 0.1em;
 }
 
 
 table.list {
         border: solid 1px black;
         border-collapse: collapse;
         border: solid 1px #aaa;
 }
 
 table.list th {
         text-align: left;
         font-weight: bold;
         background: #ddd;
         border-bottom: solid 1px #aaa;
         padding: 0.1em 0.5em 0.1em;
         vertical-align: baseline;
 }
 table.list td {
         border: none;
         padding: 0.1em 1em 0.1em 0.5em;
         background: white;
 }
 
 img {
         border: none;
 }
 
 
 div#header {
         background-color: #ddd;
         padding: 0.25em 0.25em 0.25em 0.5em;
         font-size: 150%;
         font-weight: bold;
         border: solid 1px #aaa;
         vertical-align: middle;
 }
 
 div#header img#logo {
         float: right;
 }
 
 div#content {
         margin: 0.5em 0.5em;
 }
 
 div.error {
         color: red;
         font-weight: bold;
         margin: 1em 2em;
 }
 div.ls-dir a {
         font-weight: bold;
 }
 th.filesize, td.filesize {
         text-align: right;
 }
 th.filemode, td.filemode {
         text-align: center;
 }
+
+td.blob {
+        white-space: pre;
+        font-family: courier;
+        font-size: 100%;
+}
\ No newline at end of file
diff --git a/ui-summary.c b/ui-summary.c
index 29baa74..46814dd 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,60 +1,60 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                 int flags, void *cb_data)
 {
         struct commit *commit;
         char buf[256], *url;
 
         commit = lookup_commit(sha1);
         if (commit && !parse_commit(commit)){
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "log", 
                                    fmt("h=%s", refname));
                 html_link_open(url, NULL, NULL);
                 strncpy(buf, refname, sizeof(buf));
                 html_txt(buf);
                 html_link_close();
                 html("</td><td>");
                 pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
                                     sizeof(buf), 0, NULL, NULL, 0);
                 html_txt(buf);
                 html("</td><td><a href='");
                 html_attr(cgit_pageurl(cgit_query_repo, "tree", 
                                        fmt("id=%s", 
                                            sha1_to_hex(commit->tree->object.sha1))));
                 html("'>tree</a>");
                 html("</td></tr>\n");
         } else {
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td>");
                 htmlf("*** bad ref %s", sha1_to_hex(sha1));
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static void cgit_print_branches()
 {
         html("<table class='list'>");
-        html("<tr><th>Branch name</th><th>Latest</th><th>Link</th></tr>\n");
+        html("<tr><th>Branch</th><th>Last commit</th><th>Link</th></tr>\n");
         for_each_branch_ref(cgit_print_branch_cb, NULL);
         html("</table>");
 }
 
 void cgit_print_summary()
 {
         html("<h2>");
         html_txt("Repo summary page");
         html("</h2>");
         cgit_print_branches();
 }
diff --git a/ui-view.c b/ui-view.c
index 1bf8472..9d13be1 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -1,40 +1,42 @@
 /* ui-view.c: functions to output _any_ object, given it's sha1
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 void cgit_print_view(char *hex)
 {
         unsigned char sha1[20];
         char type[20];
         unsigned char *buf;
         unsigned long size;
 
         if (get_sha1_hex(hex, sha1)){
                 cgit_print_error(fmt("Bad hex value: %s", hex));
                 return;
         }
 
         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 view</h2>");
-        htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size);
-        html("<pre>");
+        html("<h2>Object content</h2>\n");
+        html("<table class='list'>\n");
+        htmlf("<tr><th>%s %s, %li bytes</th></tr>\n", type, hex, size);
+        html("<tr><td class='blob'>\n");
         html_txt(buf);
-        html("</pre>");
+        html("\n</td></tr>\n");
+        html("</table>\n");
 }