28 files changed, 651 insertions, 74 deletions

diff --git a/Makefile b/Makefile
index 68d617e..e39be18 100644
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,21 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 -include cgit.conf
 
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
         ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
-        ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
+        ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
 
 
-.PHONY: all git install clean distclean emptycache force-version get-git
+ifdef NEEDS_LIBICONV
+        EXTLIBS += -liconv
+endif
+
+
+.PHONY: all git test install clean distclean emptycache force-version get-git
 
 all: cgit git
 
 VERSION: force-version
         @./gen-version.sh "$(CGIT_VERSION)"
 -include VERSION
@@ -46,12 +51,15 @@ git/xdiff/lib.a: | git
 git/libgit.a: | git
 
 git:
         cd git && $(MAKE) xdiff/lib.a
         cd git && $(MAKE) libgit.a
 
+test: all
+        $(MAKE) -C tests
+
 install: all
         mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
         install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
         install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
         install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
 
diff --git a/cgit.c b/cgit.c
index 142e416..e8acc03 100644
--- a/cgit.c
+++ b/cgit.c
@@ -42,19 +42,50 @@ static int cgit_prepare_cache(struct cacheitem *item)
                 else
                         item->ttl = cgit_cache_repo_ttl;
         }
         return 1;
 }
 
+struct refmatch {
+        char *req_ref;
+        char *first_ref;
+        int match;
+};
+
+int find_current_ref(const char *refname, const unsigned char *sha1,
+                     int flags, void *cb_data)
+{
+        struct refmatch *info;
+
+        info = (struct refmatch *)cb_data;
+        if (!strcmp(refname, info->req_ref))
+                info->match = 1;
+        if (!info->first_ref)
+                info->first_ref = xstrdup(refname);
+        return info->match;
+}
+
+char *find_default_branch(struct repoinfo *repo)
+{
+        struct refmatch info;
+
+        info.req_ref = repo->defbranch;
+        info.first_ref = NULL;
+        info.match = 0;
+        for_each_branch_ref(find_current_ref, &info);
+        if (info.match)
+                return info.req_ref;
+        else
+                return info.first_ref;
+}
+
 static void cgit_print_repo_page(struct cacheitem *item)
 {
-        char *title;
+        char *title, *tmp;
         int show_search;
-
-        if (!cgit_query_head)
-                cgit_query_head = cgit_repo->defbranch;
+        unsigned char sha1[20];
 
         if (chdir(cgit_repo->path)) {
                 title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
                 cgit_print_error(fmt("Unable to scan repository: %s",
@@ -64,20 +95,48 @@ static void cgit_print_repo_page(struct cacheitem *item)
         }
 
         title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
         show_search = 0;
         setenv("GIT_DIR", cgit_repo->path, 1);
 
+        if (!cgit_query_head) {
+                cgit_query_head = xstrdup(find_default_branch(cgit_repo));
+                cgit_repo->defbranch = cgit_query_head;
+        }
+
+        if (!cgit_query_head) {
+                cgit_print_docstart(title, item);
+                cgit_print_pageheader(title, 0);
+                cgit_print_error("Repository seems to be empty");
+                cgit_print_docend();
+                return;
+        }
+
+        if (get_sha1(cgit_query_head, sha1)) {
+                tmp = xstrdup(cgit_query_head);
+                cgit_query_head = cgit_repo->defbranch;
+                cgit_print_docstart(title, item);
+                cgit_print_pageheader(title, 0);
+                cgit_print_error(fmt("Invalid branch: %s", tmp));
+                cgit_print_docend();
+                return;
+        }
+
         if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
                 cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
                                     cgit_repobasename(cgit_repo->url),
                                     cgit_query_path,
                                     cgit_repo->snapshots );
                 return;
         }
 
+        if (cgit_cmd == CMD_PATCH) {
+                cgit_print_patch(cgit_query_sha1, item);
+                return;
+        }
+
         if (cgit_cmd == CMD_BLOB) {
                 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
                 return;
         }
 
         show_search = (cgit_cmd == CMD_LOG);
diff --git a/cgit.css b/cgit.css
index 1b2e9d6..17c2712 100644
--- a/cgit.css
+++ b/cgit.css
@@ -5,13 +5,13 @@ body, table {
 
 body {
         font-family: sans;
         font-size: 10pt;
         color: #333;
         background: white;
-        padding-left: 4px;
+        padding: 4px;
 }
 
 table {
       border-collapse: collapse;
 }
 
@@ -75,86 +75,90 @@ table.list td {
 }
 
 img {
         border: none;
 }
 
-div#sidebar {
+table#layout {
+        border-collapse: collapse;
+        border: none;
+        margin: 0px;
+}
+
+td#sidebar {
         vertical-align: top;
         width: 162px;
         padding: 0px 0px 0px 0px;
-        margin: 4px;
-        float: left;
+        margin: 0px;
 }
 
-div#logo {
+td#sidebar table {
+        border-collapse: separate;
+        border-spacing: 0px;
         margin: 0px;
-        padding: 4px 0px 4px 0px;
-        text-align: center;
+        padding: 0px;
         background-color: #ccc;
+}
+
+td#sidebar table.sidebar td.sidebar {
+        padding: 4px;
         border-top: solid 1px #eee;
         border-left: solid 1px #eee;
         border-right: solid 1px #aaa;
         border-bottom: solid 1px #aaa;
 }
 
-div#sidebar div.infobox {
-        margin: 0px 0px 0px 0px;
-        padding: 0.5em;
-        text-align: left;
+div#logo {
+        margin: 0px;
+        padding: 4px 0px 4px 0px;
+        text-align: center;
         background-color: #ccc;
         border-top: solid 1px #eee;
         border-left: solid 1px #eee;
         border-right: solid 1px #aaa;
         border-bottom: solid 1px #aaa;
 }
 
-div#sidebar div.infobox h1 {
-        font-size: 11pt;
+td#sidebar h1 {
+        font-size: 10pt;
         font-weight: bold;
-        margin: 0px;
+        margin: 8px 0px 0px 0px;
 }
 
-div#sidebar div.infobox a.menu {
+td#sidebar h1.first {
+        margin-top: 0px;
+}
+
+td#sidebar a.menu {
         display: block;
         background-color: #ccc;
         padding: 0.1em 0.5em;
         text-decoration: none;
 }
 
-div#sidebar div.infobox a.menu:hover {
+td#sidebar a.menu:hover {
         background-color: #bbb;
         text-decoration: none;
 }
 
-div#sidebar div.infobox select {
+td#sidebar select {
         width: 100%;
-        border: solid 1px #aaa;
-        background-color: #bbb;
         margin: 2px 0px 0px 0px;
-        padding: 0px;
 }
 
-td#branch-dropdown-cell {
-        width: 99%;
+td#sidebar form {
+        text-align: right;
 }
 
 input#switch-btn {
-        width: 20px;
-        border: solid 1px #aaa;
-        background-color: #bbb;
         margin: 2px 0px 0px 0px;
-        padding: 0px;
 }
 
-div#sidebar div.infobox input.txt {
+td#sidebar input.txt {
         width: 100%;
-        border: solid 1px #aaa;
-        background-color: #bbb;
         margin: 2px 0px 0px 0px;
-        padding: 0;
 }
 
 table#grid {
         margin: 0px;
 }
 
diff --git a/cgit.h b/cgit.h
index 163f355..66c40b9 100644
--- a/cgit.h
+++ b/cgit.h
@@ -13,12 +13,13 @@
 #include <diffcore.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>
 #include <xdiff/xdiff.h>
+#include <utf8.h>
 
 
 /*
  * The valid cgit repo-commands
  */
 #define CMD_LOG      1
@@ -26,12 +27,13 @@
 #define CMD_DIFF     3
 #define CMD_TREE     4
 #define CMD_BLOB     5
 #define CMD_SNAPSHOT 6
 #define CMD_TAG      7
 #define CMD_REFS     8
+#define CMD_PATCH    9
 
 /*
  * Dateformats used on misc. pages
  */
 #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
 #define FMT_SHORTDATE "%Y-%m-%d"
@@ -45,12 +47,17 @@
 #define TM_DAY   (TM_HOUR * 24)
 #define TM_WEEK  (TM_DAY * 7)
 #define TM_YEAR  (TM_DAY * 365)
 #define TM_MONTH (TM_YEAR / 12.0)
 
 
+/*
+ * Default encoding
+ */
+#define PAGE_ENCODING "UTF-8"
+
 typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 struct cacheitem {
         char *name;
@@ -66,12 +73,13 @@ struct repoinfo {
         char *desc;
         char *owner;
         char *defbranch;
         char *group;
         char *module_link;
         char *readme;
+        char *clone_url;
         int snapshots;
         int enable_log_filecount;
         int enable_log_linecount;
 };
 
 struct repolist {
@@ -87,12 +95,13 @@ struct commitinfo {
         unsigned long author_date;
         char *committer;
         char *committer_email;
         unsigned long committer_date;
         char *subject;
         char *msg;
+        char *msg_encoding;
 };
 
 struct taginfo {
         char *tagger;
         char *tagger_email;
         int tagger_date;
@@ -129,12 +138,14 @@ extern char *cgit_logo_link;
 extern char *cgit_module_link;
 extern char *cgit_agefile;
 extern char *cgit_virtual_root;
 extern char *cgit_script_name;
 extern char *cgit_cache_root;
 extern char *cgit_repo_group;
+extern char *cgit_robots;
+extern char *cgit_clone_prefix;
 
 extern int cgit_nocache;
 extern int cgit_snapshots;
 extern int cgit_enable_index_links;
 extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
@@ -270,12 +281,13 @@ extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
 extern void cgit_print_refs();
 extern void cgit_print_tag(char *revname);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
+extern void cgit_print_patch(char *hex, struct cacheitem *item);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
                                 const char *hex, const char *prefix,
                                 const char *filename, int snapshot);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                       const char *hex, int snapshots);
 extern int cgit_parse_snapshots_mask(const char *str);
diff --git a/cgit.png b/cgit.png
index ee48197..22f7e95 100644
--- a/cgit.png
+++ b/cgit.png
diff --git a/cgitrc b/cgitrc
index 6363c9c..ce0c01b 100644
--- a/cgitrc
+++ b/cgitrc
@@ -5,12 +5,17 @@
 
 ## Uncomment and set to 1 to deactivate caching of generated pages. Mostly
 ## usefull for testing.
 #nocache=0
 
 
+## This variable can be used to override the default value for "robots"
+## meta-tag. If unset, the meta-tag isn't generated.
+#robots=index, nofollow
+
+
 ## Set allowed snapshot types by default. Can be overridden per repo
 # can be any combination of zip/tar.gz/tar.bz2/tar
 #snapshots=0
 
 
 ## Enable/disable extra links to summary/log/tree per repo on index page
@@ -108,12 +113,17 @@
 
 
 ## Url loaded when clicking a submodule link
 #module-link=./?repo=%s&page=commit&id=%s
 
 
+## Shared prefix which, when combined with repo url, becomes the url used
+## to clone the repo
+#clone-prefix=
+
+
 ## Number of chars shown of repo description (in repolist view)
 #max-repodesc-length=60
 
 
 ## Number of chars shown of commit subject message (in log view)
 #max-message-length=60
@@ -159,18 +169,20 @@
         #repo.defbranch=master                  ## define a default branch
         #repo.snapshots=tar.bz2                         ## override a sitewide snapshot-setting
         #repo.enable-log-filecount=0            ## override the default filecount setting
         #repo.enable-log-linecount=0            ## override the default linecount setting
         #repo.module-link=/git/%s/commit/?id=%s         ## override the standard module-link
         #repo.readme=info/web/readme            ## specify a file to include on summary page
+#repo.clone-url=git://hjemli.net/pub/git/cgit
 
 ## Additional repositories grouped under "mirrors"
 #repo.group=mirrors
 
 #repo.url=git
 #repo.path=/pub/git/git
+#repo.clone-url=git://hjemli.net/pub/git/git
 #
 #repo.url=linux
 #repo.path=/pub/git/linux
 
 ## A group of private repositories (with a working directory)
 #repo.group=private
diff --git a/html.c b/html.c
index 6c9cc8b..eb163d9 100644
--- a/html.c
+++ b/html.c
@@ -129,13 +129,13 @@ void html_hidden(char *name, char *value)
 void html_option(char *value, char *text, char *selected_value)
 {
         html("<option value='");
         html_attr(value);
         html("'");
         if (selected_value && !strcmp(selected_value, value))
-                html(" selected");
+                html(" selected='selected'");
         html(">");
         html_txt(text);
         html("</option>\n");
 }
 
 void html_link_open(char *url, char *title, char *class)
diff --git a/parsing.c b/parsing.c
index 55a485d..5093b8b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -196,12 +196,13 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
         ret->author = NULL;
         ret->author_email = NULL;
         ret->committer = NULL;
         ret->committer_email = NULL;
         ret->subject = NULL;
         ret->msg = NULL;
+        ret->msg_encoding = NULL;
 
         if (p == NULL)
                 return ret;
 
         if (strncmp(p, "tree ", 5))
                 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
@@ -230,12 +231,20 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                 t = strchr(t, '>') + 1;
                 ret->committer_email = substr(p, t);
                 ret->committer_date = atol(t+1);
                 p = strchr(t, '\n') + 1;
         }
 
+        if (!strncmp(p, "encoding ", 9)) {
+                p += 9;
+                t = strchr(p, '\n') + 1;
+                ret->msg_encoding = substr(p, t);
+                p = t;
+        } else
+                ret->msg_encoding = xstrdup(PAGE_ENCODING);
+
         while (*p && (*p != '\n'))
                 p = strchr(p, '\n') + 1; // skip unknown header fields
 
         while (*p == '\n')
                 p = strchr(p, '\n') + 1;
 
@@ -250,12 +259,28 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                 while (*p == '\n')
                         p = strchr(p, '\n') + 1;
                 ret->msg = xstrdup(p);
         } else
                 ret->subject = substr(p, p+strlen(p));
 
+        if(strcmp(ret->msg_encoding, PAGE_ENCODING)) {
+                t = reencode_string(ret->subject, PAGE_ENCODING,
+                                    ret->msg_encoding);
+                if(t) {
+                        free(ret->subject);
+                        ret->subject = t;
+                }
+
+                t = reencode_string(ret->msg, PAGE_ENCODING,
+                                    ret->msg_encoding);
+                if(t) {
+                        free(ret->msg);
+                        ret->msg = t;
+                }
+        }
+
         return ret;
 }
 
 
 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
diff --git a/shared.c b/shared.c
index 84aa281..bf0581f 100644
--- a/shared.c
+++ b/shared.c
@@ -23,12 +23,14 @@ char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_agefile      = "info/web/last-modified";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = CGIT_CACHE_ROOT;
 char *cgit_repo_group   = NULL;
+char *cgit_robots       = "index, nofollow";
+char *cgit_clone_prefix = NULL;
 
 int cgit_nocache               =  0;
 int cgit_snapshots             =  0;
 int cgit_enable_index_links    =  0;
 int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
@@ -65,13 +67,13 @@ int   cgit_query_ofs    = 0;
 int htmlfd = 0;
 
 
 int cgit_get_cmd_index(const char *cmd)
 {
         static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
-                               "snapshot", "tag", "refs", NULL};
+                               "snapshot", "tag", "refs", "patch", NULL};
         int i;
 
         for(i = 0; cmds[i]; i++)
                 if (!strcmp(cmd, cmds[i]))
                         return i + 1;
         return 0;
@@ -194,20 +196,26 @@ void cgit_global_config_cb(const char *name, const char *value)
         else if (!strcmp(name, "summary-tags"))
                 cgit_summary_tags = atoi(value);
         else if (!strcmp(name, "agefile"))
                 cgit_agefile = xstrdup(value);
         else if (!strcmp(name, "renamelimit"))
                 cgit_renamelimit = atoi(value);
+        else if (!strcmp(name, "robots"))
+                cgit_robots = xstrdup(value);
+        else if (!strcmp(name, "clone-prefix"))
+                cgit_clone_prefix = xstrdup(value);
         else if (!strcmp(name, "repo.group"))
                 cgit_repo_group = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
                 cgit_repo = add_repo(value);
         else if (!strcmp(name, "repo.name"))
                 cgit_repo->name = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.path"))
                 cgit_repo->path = trim_end(value, '/');
+        else if (cgit_repo && !strcmp(name, "repo.clone-url"))
+                cgit_repo->clone_url = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.desc"))
                 cgit_repo->desc = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.owner"))
                 cgit_repo->owner = xstrdup(value);
         else if (cgit_repo && !strcmp(name, "repo.defbranch"))
                 cgit_repo->defbranch = xstrdup(value);
@@ -264,12 +272,14 @@ void *cgit_free_commitinfo(struct commitinfo *info)
 {
         free(info->author);
         free(info->author_email);
         free(info->committer);
         free(info->committer_email);
         free(info->subject);
+        free(info->msg);
+        free(info->msg_encoding);
         free(info);
         return NULL;
 }
 
 int hextoint(char c)
 {
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..c1c1c0b
--- a/dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,2 @@
+trash
+test-output.log
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..697e5a1
--- a/dev/null
+++ b/tests/Makefile
@@ -0,0 +1,13 @@
+
+
+T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
+
+all: $(T)
+
+$(T):
+        @$@
+
+clean:
+        $(RM) -rf trash
+
+.PHONY: $(T) clean
diff --git a/tests/setup.sh b/tests/setup.sh
new file mode 100755
index 0000000..51d5a75
--- a/dev/null
+++ b/tests/setup.sh
@@ -0,0 +1,108 @@
+# This file should be sourced by all test-scripts
+#
+# Main functions:
+#   prepare_tests(description) - setup for testing, i.e. create repos+config
+#   run_test(description, script) - run one test, i.e. eval script
+#
+# Helper functions
+#   cgit_query(querystring) - call cgit with the specified querystring
+#   cgit_url(url) - call cgit with the specified virtual url
+#
+# Example script:
+#
+# . setup.sh
+# prepare_tests "html validation"
+# run_test 'repo index' 'cgit_url "/" | tidy -e'
+# run_test 'repo summary' 'cgit_url "/foo" | tidy -e'
+
+
+mkrepo() {
+        name=$1
+        count=$2
+        dir=$PWD
+        test -d $name && return
+        printf "Creating testrepo %s\n" $name
+        mkdir -p $name
+        cd $name
+        git init
+        for ((n=1; n<=count; n++))
+        do
+                echo $n >file-$n
+                git add file-$n
+                git commit -m "commit $n"
+        done
+        cd $dir
+}
+
+setup_repos()
+{
+        rm -rf trash/cache
+        mkdir -p trash/cache
+        mkrepo trash/repos/foo 5 >/dev/null
+        mkrepo trash/repos/bar 50 >/dev/null
+        cat >trash/cgitrc <<EOF
+virtual-root=/
+cache-root=$PWD/trash/cache
+
+nocache=0
+snapshots=tar.gz tar.bz zip
+enable-log-filecount=1
+enable-log-linecount=1
+summary-log=5
+summary-branches=5
+summary-tags=5
+
+repo.url=foo
+repo.path=$PWD/trash/repos/foo/.git
+repo.desc=the foo repo
+
+repo.url=bar
+repo.path=$PWD/trash/repos/bar/.git
+repo.desc=the bar repo
+EOF
+}
+
+prepare_tests()
+{
+        setup_repos
+        test_count=0
+        test_failed=0
+        echo "$@" "($0)"
+}
+
+tests_done()
+{
+        printf "\n"
+        if test $test_failed -gt 0
+        then
+                printf "[%s of %s tests failed]\n" $test_failed $test_count
+                false
+        fi
+}
+
+run_test()
+{
+        desc=$1
+        script=$2
+        ((test_count++))
+        eval "$2" >test-output.log
+        res=$?
+        if test $res = 0
+        then
+                printf "  %s: ok - %s\n" $test_count "$desc"
+        else
+                ((test_failed++))
+                printf "  %s: fail - %s\n" $test_count "$desc"
+        fi
+}
+
+cgit_query()
+{
+        CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
+}
+
+cgit_url()
+{
+        CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
+}
+
diff --git a/tests/t0010-validate-html.sh b/tests/t0010-validate-html.sh
new file mode 100755
index 0000000..907a415
--- a/dev/null
+++ b/tests/t0010-validate-html.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+. ./setup.sh
+
+
+test_url()
+{
+        tidy_opt="-eq"
+        test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no"
+        cgit_url "$1" | sed -e "1,4d" >trash/tidy-$test_count
+        tidy $tidy_opt trash/tidy-$test_count
+        rc=$?
+        if test $rc = 2
+        then
+                false
+        else
+                :
+        fi
+}
+
+prepare_tests 'Validate html with tidy'
+
+run_test 'index page' 'test_url ""'
+run_test 'foo' 'test_url "foo"'
+run_test 'foo/log' 'test_url "foo/log"'
+run_test 'foo/tree' 'test_url "foo/tree"'
+run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"'
+run_test 'foo/commit' 'test_url "foo/commit"'
+run_test 'foo/diff' 'test_url "foo/diff"'
+
+tests_done
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh
new file mode 100755
index 0000000..12ed00c
--- a/dev/null
+++ b/tests/t0101-index.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Check content on index page"
+
+run_test 'generate index page' 'cgit_url "" >trash/tmp'
+run_test 'find foo repo' 'grep -e "foo" trash/tmp'
+run_test 'find bar repo' 'grep -e "bar" trash/tmp'
+run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp'
+run_test 'no log-link' 'grep -ve "foo/log" trash/tmp'
+
+tests_done
diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh
new file mode 100755
index 0000000..7edd675
--- a/dev/null
+++ b/tests/t0102-summary.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Check content on summary page"
+
+run_test 'generate foo summary' 'cgit_url "foo" >trash/tmp'
+run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
+run_test 'find commit 5' 'grep -e "commit 5" trash/tmp'
+run_test 'find branch master' 'grep -e "master" trash/tmp'
+run_test 'no tags' 'grep -ve "tags" trash/tmp'
+
+run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp'
+run_test 'no commit 45' 'grep -ve "commit 45" trash/tmp'
+run_test 'find commit 46' 'grep -e "commit 46" trash/tmp'
+run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
+run_test 'find branch master' 'grep -e "master" trash/tmp'
+run_test 'no tags' 'grep -ve "tags" trash/tmp'
+
+tests_done
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh
new file mode 100755
index 0000000..b08cd29
--- a/dev/null
+++ b/tests/t0103-log.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Check content on log page"
+
+run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp'
+run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
+run_test 'find commit 5' 'grep -e "commit 5" trash/tmp'
+
+run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp'
+run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
+run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
+
+tests_done
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
new file mode 100755
index 0000000..2516c72
--- a/dev/null
+++ b/tests/t0104-tree.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Check content on tree page"
+
+run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp'
+run_test 'find file-1' 'grep -e "file-1" trash/tmp'
+run_test 'find file-50' 'grep -e "file-50" trash/tmp'
+
+run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp'
+
+run_test 'find line 1' '
+        grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp
+'
+
+run_test 'no line 2' '
+        grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
+'
+
+tests_done
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
new file mode 100755
index 0000000..aa2bf33
--- a/dev/null
+++ b/tests/t0105-commit.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Check content on commit page"
+
+run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp'
+run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp'
+run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp'
+
+run_test 'find commit subject' '
+        grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp
+'
+
+run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
+run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp'
+
+run_test 'find diff summary' '
+         grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp
+'
+
+tests_done
diff --git a/tests/t0106-diff.sh b/tests/t0106-diff.sh
new file mode 100755
index 0000000..e140bcc
--- a/dev/null
+++ b/tests/t0106-diff.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Check content on diff page"
+
+run_test 'generate foo/diff' 'cgit_url "foo/diff" >trash/tmp'
+run_test 'find diff header' 'grep -e "a/file-5 b/file-5" trash/tmp'
+run_test 'find blob link' 'grep -e "<a href=./foo/tree/file-5?id=" trash/tmp'
+run_test 'find added file' 'grep -e "new file mode 100644" trash/tmp'
+
+run_test 'find hunk header' '
+        grep -e "<div class=.hunk.>@@ -0,0 +1 @@</div>" trash/tmp
+'
+
+run_test 'find added line' '
+        grep -e "<div class=.add.>+5</div>" trash/tmp
+'
+
+tests_done
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
new file mode 100755
index 0000000..8e90e10
--- a/dev/null
+++ b/tests/t0107-snapshot.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests "Verify snapshot"
+
+run_test 'get foo/snapshot/test.tar.gz' '
+        cgit_url "foo/snapshot/test.tar.gz" >trash/tmp
+'
+
+run_test 'check html headers' '
+        head -n 1 trash/tmp |
+             grep -e "Content-Type: application/x-tar" &&
+
+        head -n 2 trash/tmp |
+             grep -e "Content-Disposition: inline; filename=.test.tar.gz."
+'
+
+run_test 'strip off the header lines' '
+         tail -n +6 trash/tmp > trash/test.tar.gz
+'
+
+run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz'
+run_test 'untar' 'tar -xf trash/test.tar.gz -C trash'
+
+run_test 'count files' '
+        c=$(ls -1 trash/foo/ | wc -l) &&
+        test $c = 5
+'
+
+run_test 'verify untarred file-5' '
+         grep -e "^5$" trash/foo/file-5 &&
+         test $(cat trash/foo/file-5 | wc -l) = 1
+'
+
+tests_done
diff --git a/ui-commit.c b/ui-commit.c
index 4ac8955..bd55a33 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -81,13 +81,13 @@ void print_fileinfo(struct fileinfo *info)
                 htmlf(" (%s from %s)",
                       info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
                       info->old_path);
         html("</td><td class='right'>");
         htmlf("%d", info->added + info->removed);
         html("</td><td class='graph'>");
-        htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
+        htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
         htmlf("<td class='add' style='width: %.1f%%;'/>",
               info->added * 100.0 / max_changes);
         htmlf("<td class='rem' style='width: %.1f%%;'/>",
               info->removed * 100.0 / max_changes);
         htmlf("<td class='none' style='width: %.1f%%;'/>",
               (max_changes - info->removed - info->added) * 100.0 / max_changes);
@@ -154,13 +154,13 @@ void cgit_print_commit(char *hex)
         if (!commit) {
                 cgit_print_error(fmt("Bad commit reference: %s", hex));
                 return;
         }
         info = cgit_parse_commit(commit);
 
-        html("<table class='commit-info'>\n");
+        html("<table summary='commit info' class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
         html(" ");
         html_txt(info->author_email);
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE);
@@ -206,13 +206,13 @@ void cgit_print_commit(char *hex)
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         html("</div>");
         if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
                 html("<div class='diffstat-header'>Diffstat</div>");
-                html("<table class='diffstat'>");
+                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'>");
diff --git a/ui-diff.c b/ui-diff.c
index ac9a3fa..4fcf852 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -138,12 +138,12 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                         return;
                 }
                 commit2 = lookup_commit_reference(old_rev_sha1);
                 if (!commit2 || parse_commit(commit2))
                         cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
         }
-        html("<table class='diff'>");
+        html("<table summary='diff' class='diff'>");
         html("<tr><td>");
         cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
         html("</td></tr>");
         html("</table>");
 }
diff --git a/ui-log.c b/ui-log.c
index 9f5fdf6..a41d2b2 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -5,18 +5,24 @@
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
-int files, lines;
+int files, add_lines, rem_lines;
 
 void count_lines(char *line, int size)
 {
-        if (size>0 && (line[0] == '+' || line[0] == '-'))
-                lines++;
+        if (size <= 0)
+                return;
+
+        if (line[0] == '+')
+                add_lines++;
+
+        else if (line[0] == '-')
+                rem_lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
         files++;
         if (cgit_repo->enable_log_linecount)
@@ -32,19 +38,20 @@ void print_commit(struct commit *commit)
         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html("</td><td>");
         cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
                          sha1_to_hex(commit->object.sha1));
         if (cgit_repo->enable_log_filecount) {
                 files = 0;
-                lines = 0;
+                add_lines = 0;
+                rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 html("</td><td class='right'>");
                 htmlf("%d", files);
                 if (cgit_repo->enable_log_linecount) {
                         html("</td><td class='right'>");
-                        htmlf("%d", lines);
+                        htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
         html("</td><td>");
         html_txt(info->author);
         html("</td></tr>\n");
         cgit_free_commitinfo(info);
@@ -80,20 +87,20 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         if (rev.grep_filter) {
                 rev.grep_filter->regflags |= REG_ICASE;
                 compile_grep_patterns(rev.grep_filter);
         }
         prepare_revision_walk(&rev);
 
-        html("<table class='list nowrap'>");
+        html("<table summary='log' class='list nowrap'>");
         html("<tr class='nohover'><th class='left'>Age</th>"
              "<th class='left'>Message</th>");
 
         if (cgit_repo->enable_log_filecount) {
-                html("<th class='left'>Files</th>");
+                html("<th class='right'>Files</th>");
                 if (cgit_repo->enable_log_linecount)
-                        html("<th class='left'>Lines</th>");
+                        html("<th class='right'>Lines</th>");
         }
         html("<th class='left'>Author</th></tr>\n");
 
         if (ofs<0)
                 ofs = 0;
 
diff --git a/ui-patch.c b/ui-patch.c
new file mode 100644
index 0000000..e7a010a
--- a/dev/null
+++ b/ui-patch.c
@@ -0,0 +1,110 @@
+/* ui-patch.c: generate patch view
+ *
+ * Copyright (C) 2007 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+static void print_line(char *line, int len)
+{
+        char c = line[len-1];
+
+        line[len-1] = '\0';
+        htmlf("%s\n", line);
+        line[len-1] = c;
+}
+
+static void header(unsigned char *sha1, char *path1, int mode1,
+                   unsigned char *sha2, char *path2, int mode2)
+{
+        char *abbrev1, *abbrev2;
+        int subproject;
+
+        subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
+        htmlf("diff --git a/%s b/%s\n", path1, path2);
+
+        if (is_null_sha1(sha1))
+                path1 = "dev/null";
+        if (is_null_sha1(sha2))
+                path2 = "dev/null";
+
+        if (mode1 == 0)
+                htmlf("new file mode %.6o\n", mode2);
+
+        if (mode2 == 0)
+                htmlf("deleted file mode %.6o\n", mode1);
+
+        if (!subproject) {
+                abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+                abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
+                htmlf("index %s..%s", abbrev1, abbrev2);
+                free(abbrev1);
+                free(abbrev2);
+                if (mode1 != 0 && mode2 != 0) {
+                        htmlf(" %.6o", mode1);
+                        if (mode2 != mode1)
+                                htmlf("..%.6o", mode2);
+                }
+                htmlf("\n--- a/%s\n", path1);
+                htmlf("+++ b/%s\n", path2);
+        }
+}
+
+static void filepair_cb(struct diff_filepair *pair)
+{
+        header(pair->one->sha1, pair->one->path, pair->one->mode,
+               pair->two->sha1, pair->two->path, pair->two->mode);
+        if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
+                if (S_ISGITLINK(pair->one->mode))
+                        print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+                if (S_ISGITLINK(pair->two->mode))
+                        print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+                return;
+        }
+        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
+                html("Error running diff");
+}
+
+void cgit_print_patch(char *hex, struct cacheitem *item)
+{
+        struct commit *commit;
+        struct commitinfo *info;
+        unsigned char sha1[20], old_sha1[20];
+        char *patchname;
+
+        if (!hex)
+                hex = cgit_query_head;
+
+        if (get_sha1(hex, sha1)) {
+                cgit_print_error(fmt("Bad object id: %s", hex));
+                return;
+        }
+        commit = lookup_commit_reference(sha1);
+        if (!commit) {
+                cgit_print_error(fmt("Bad commit reference: %s", hex));
+                return;
+        }
+        info = cgit_parse_commit(commit);
+        hashcpy(old_sha1, commit->parents->item->object.sha1);
+
+        patchname = fmt("%s.patch", sha1_to_hex(sha1));
+        cgit_print_snapshot_start("text/plain", patchname, item);
+        htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
+        htmlf("From: %s%s\n", info->author, info->author_email);
+        html("Date: ");
+        cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n");
+        htmlf("Subject: %s\n\n", info->subject);
+        if (info->msg && *info->msg) {
+                htmlf("%s", info->msg);
+                if (info->msg[strlen(info->msg) - 1] != '\n')
+                        html("\n");
+        }
+        html("---\n");
+        cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
+        html("--\n");
+        htmlf("cgit %s\n", CGIT_VERSION);
+        cgit_free_commitinfo(info);
+}
diff --git a/ui-repolist.c b/ui-repolist.c
index 9aa5c1e..3e97ca9 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -50,13 +50,13 @@ void cgit_print_repolist(struct cacheitem *item)
         if (cgit_enable_index_links)
                 columns++;
 
         cgit_print_docstart(cgit_root_title, item);
         cgit_print_pageheader(cgit_root_title, 0);
 
-        html("<table class='list nowrap'>");
+        html("<table summary='repository list' class='list nowrap'>");
         if (cgit_index_header) {
                 htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
                       columns);
                 html_include(cgit_index_header);
                 html("</td></tr>");
         }
diff --git a/ui-shared.c b/ui-shared.c
index 4944dfd..60aa2e3 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -269,12 +269,18 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
         }
         html("'>");
         html_txt(name);
         html("</a>");
 }
 
+void cgit_patch_link(char *name, char *title, char *class, char *head,
+                     char *rev)
+{
+        reporevlink("patch", name, title, class, head, rev, NULL);
+}
+
 void cgit_object_link(struct object *obj)
 {
         char *page, *arg, *url;
 
         if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
@@ -353,34 +359,36 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
         htmlf("<span class='age-years'>%.0f years</span>",
               secs * 1.0 / TM_YEAR);
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
-        html("Content-Type: text/html; charset=utf-8\n");
+        html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
         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");
         html(cgit_doctype);
-        html("<html>\n");
+        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
         html("<head>\n");
         html("<title>");
         html_txt(title);
         html("</title>\n");
         htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
+        if (cgit_robots && *cgit_robots)
+                htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(cgit_css);
         html("'/>\n");
         html("</head>\n");
         html("<body>\n");
 }
 
 void cgit_print_docend()
 {
-        html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
+        html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data)
 {
         char *name = (char *)refname;
@@ -412,13 +420,13 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
         } else if (obj->type != OBJ_BLOB) {
                 return 0;
         } else {
                 hashcpy(fileid, sha1);
         }
         if (!*header) {
-                html("<p><h1>download</h1>");
+                html("<h1>download</h1>\n");
                 *header = 1;
         }
         url = cgit_pageurl(cgit_query_repo, "blob",
                            fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                                buf));
         html_link_open(url, NULL, "menu");
@@ -455,55 +463,76 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
         static const char *default_info = "This is cgit, a fast webinterface for git repositories";
         int header = 0;
+        char *url;
 
-        html("<div id='sidebar'>\n");
-        html("<a href='");
+        html("<table id='layout' summary=''>\n");
+        html("<tr><td id='sidebar'>\n");
+        html("<table class='sidebar' cellspacing='0' summary=''>\n");
+        html("<tr><td class='sidebar'>\n<a href='");
         html_attr(cgit_rooturl());
-        htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n",
+        htmlf("'><img src='%s' alt='cgit'/></a>\n",
               cgit_logo);
-        html("<div class='infobox'>");
+        html("</td></tr>\n<tr><td class='sidebar'>\n");
         if (cgit_query_repo) {
-                html("<h1>");
+                html("<h1 class='first'>");
                 html_txt(strrpart(cgit_repo->name, 20));
                 html("</h1>\n");
                 html_txt(cgit_repo->desc);
                 if (cgit_repo->owner) {
-                        html("<p>\n<h1>owner</h1>\n");
+                        html("<h1>owner</h1>\n");
                         html_txt(cgit_repo->owner);
                 }
-                html("<p>\n<h1>navigate</h1>\n");
+                html("<h1>navigate</h1>\n");
                 reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
                             NULL, NULL);
                 cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
                               0, NULL, NULL);
                 cgit_tree_link("tree", NULL, "menu", cgit_query_head,
                                cgit_query_sha1, NULL);
                 cgit_commit_link("commit", NULL, "menu", cgit_query_head,
                               cgit_query_sha1);
                 cgit_diff_link("diff", NULL, "menu", cgit_query_head,
                                cgit_query_sha1, cgit_query_sha2, NULL);
+                cgit_patch_link("patch", NULL, "menu", cgit_query_head,
+                                cgit_query_sha1);
 
                 for_each_ref(print_archive_ref, &header);
 
-                html("<p>\n<h1>branch</h1>\n");
+                if (cgit_repo->clone_url || cgit_clone_prefix) {
+                        html("<h1>clone</h1>\n");
+                        if (cgit_repo->clone_url)
+                                url = cgit_repo->clone_url;
+                        else
+                                url = fmt("%s%s", cgit_clone_prefix,
+                                          cgit_repo->url);
+                        html("<a class='menu' href='");
+                        html_attr(url);
+                        html("' title='");
+                        html_attr(url);
+                        html("'>\n");
+                        html_txt(strrpart(url, 20));
+                        html("</a>\n");
+                }
+
+                html("<h1>branch</h1>\n");
                 html("<form method='get' action=''>\n");
                 add_hidden_formfields(0, 1, cgit_query_page);
-                html("<table class='grid'><tr><td id='branch-dropdown-cell'>");
+        //      html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
                 html("<select name='h' onchange='this.form.submit();'>\n");
                 for_each_branch_ref(print_branch_option, cgit_query_head);
                 html("</select>\n");
-                html("</td><td>");
-                html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n");
-                html("</td></tr></table>");
+        //      html("</td><td>");
+                html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+        //      html("</td></tr></table>");
                 html("</form>\n");
 
-                html("<p>\n<h1>search</h1>\n");
+                html("<h1>search</h1>\n");
                 html("<form method='get' action='");
                 if (cgit_virtual_root)
                         html_attr(cgit_fileurl(cgit_query_repo, "log",
                                                cgit_query_path, NULL));
                 html("'>\n");
                 add_hidden_formfields(1, 0, "log");
@@ -518,15 +547,15 @@ void cgit_print_pageheader(char *title, int show_search)
                 html("</form>\n");
         } else {
                 if (!cgit_index_info || html_include(cgit_index_info))
                         html(default_info);
         }
 
-        html("</div>\n");
+        html("</td></tr></table></td>\n");
 
-        html("</div>\n<table class='grid'><tr><td id='content'>\n");
+        html("<td id='content'>\n");
 }
 
 
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                                struct cacheitem *item)
 {
diff --git a/ui-summary.c b/ui-summary.c
index c856793..b96414e 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -187,13 +187,13 @@ void cgit_print_summary()
                 html_include(cgit_repo->readme);
                 html("</div>");
         }
         if (cgit_summary_log > 0)
                 cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL,
                                NULL, NULL, 0);
-        html("<table class='list nowrap'>");
+        html("<table summary='repository info' class='list nowrap'>");
         if (cgit_summary_log > 0)
                 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
         cgit_print_branches(cgit_summary_branches);
         html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
         cgit_print_tags(cgit_summary_tags);
         html("</table>");
diff --git a/ui-tree.c b/ui-tree.c
index c22e30b..c138877 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -14,13 +14,13 @@ int header = 0;
 
 static void print_object(const unsigned char *sha1, char *path)
 {
         enum object_type type;
         char *buf;
         unsigned long size, lineno, start, idx;
-        const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>";
+        const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD) {
                 cgit_print_error(fmt("Bad object name: %s",
                                      sha1_to_hex(sha1)));
                 return;
@@ -34,13 +34,13 @@ static void print_object(const unsigned char *sha1, char *path)
         }
 
         html(" blob: <a href='");
         html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
         htmlf("'>%s</a>",sha1_to_hex(sha1));
 
-        html("<table class='blob'>\n");
+        html("<table summary='blob content' class='blob'>\n");
         idx = 0;
         start = 0;
         lineno = 0;
         while(idx < size) {
                 if (buf[idx] == '\n') {
                         buf[idx] = '\0';
@@ -105,13 +105,13 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
         free(name);
         return 0;
 }
 
 static void ls_head()
 {
-        html("<table class='list'>\n");
+        html("<table summary='tree listing' 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("<th/>");
         html("</tr>\n");