22 files changed, 334 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 685e662..72c189c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,78 +3,81 @@ CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.5.3.5
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
 # Let the user override the above settings.
 #
 -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
 
 
 ifdef NEEDS_LIBICONV
         EXTLIBS += -liconv
 endif
 
 
-.PHONY: all git install clean distclean emptycache force-version get-git
+.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
 
 
 CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
 cgit: cgit.c $(OBJECTS)
         $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
 
 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
 
 uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
         rm -f $(CGIT_SCRIPT_PATH)/cgit.css
         rm -f $(CGIT_SCRIPT_PATH)/cgit.png
 
 clean:
         rm -f cgit VERSION *.o
         cd git && $(MAKE) clean
 
 distclean: clean
         git clean -d -x
         cd git && git clean -d -x
 
 emptycache:
         rm -rf $(DESTDIR)$(CACHE_ROOT)/*
 
 get-git:
         curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
diff --git a/cgit.css b/cgit.css
index f1003b4..565427f 100644
--- a/cgit.css
+++ b/cgit.css
@@ -90,49 +90,53 @@ 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 {
         margin: 0px 0px 0px 0px;
         padding: 0.5em;
         text-align: left;
         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: 10pt;
         font-weight: bold;
-        margin: 0px;
+        margin: 8px 0px 0px 0px;
+}
+
+div#sidebar div.infobox h1.first {
+        margin-top: 0px;
 }
 
 div#sidebar div.infobox a.menu {
         display: block;
         background-color: #ccc;
         padding: 0.1em 0.5em;
         text-decoration: none;
 }
 
 div#sidebar div.infobox a.menu:hover {
         background-color: #bbb;
         text-decoration: none;
 }
 
 div#sidebar div.infobox select {
         width: 100%;
         margin: 2px 0px 0px 0px;
 }
 
 td#branch-dropdown-cell {
         width: 99%;
 }
 
 input#switch-btn {
diff --git a/html.c b/html.c
index 6c9cc8b..eb163d9 100644
--- a/html.c
+++ b/html.c
@@ -111,49 +111,49 @@ void html_attr(char *txt)
                                 html("&quote;");
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 html(txt);
 }
 
 void html_hidden(char *name, char *value)
 {
         html("<input type='hidden' name='");
         html_attr(name);
         html("' value='");
         html_attr(value);
         html("'/>");
 }
 
 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)
 {
         html("<a href='");
         html_attr(url);
         if (title) {
                 html("' title='");
                 html_attr(title);
         }
         if (class) {
                 html("' class='");
                 html_attr(class);
         }
         html("'>");
 }
 
 void html_link_close(void)
 {
         html("</a>");
 }
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
@@ -63,49 +63,49 @@ void print_fileinfo(struct fileinfo *info)
         htmlf("<td class='mode'>");
         if (is_null_sha1(info->new_sha1)) {
                 html_filemode(info->old_mode);
         } else {
                 html_filemode(info->new_mode);
         }
 
         if (info->old_mode != info->new_mode &&
             !is_null_sha1(info->old_sha1) &&
             !is_null_sha1(info->new_sha1)) {
                 html("<span class='modechange'>[");
                 html_filemode(info->old_mode);
                 html("]</span>");
         }
         htmlf("</td><td class='%s'>", class);
         cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
                        NULL, info->new_path);
         if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                 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);
         html("</tr></table></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
 {
         if (line && (len > 0)) {
                 if (line[0] == '+')
                         lines_added++;
                 else if (line[0] == '-')
                         lines_removed++;
         }
 }
 
 void inspect_filepair(struct diff_filepair *pair)
 {
         files++;
         lines_added = 0;
         lines_removed = 0;
@@ -136,49 +136,49 @@ void inspect_filepair(struct diff_filepair *pair)
 void cgit_print_commit(char *hex)
 {
         struct commit *commit, *parent;
         struct commitinfo *info;
         struct commit_list *p;
         unsigned char sha1[20];
         char *tmp;
         int i;
 
         if (!hex)
                 hex = cgit_query_head;
         curr_rev = hex;
 
         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);
 
-        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);
         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>tree</th><td colspan='2' class='sha1'>");
         tmp = xstrdup(hex);
         cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                        cgit_query_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) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
@@ -188,39 +188,39 @@ void cgit_print_commit(char *hex)
                 html("<tr><th>parent</th>"
                      "<td colspan='2' class='sha1'>");
                 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
                                  cgit_query_head, sha1_to_hex(p->item->object.sha1));
                 html(" (");
                 cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
                                sha1_to_hex(p->item->object.sha1), NULL);
                 html(")</td></tr>");
         }
         if (cgit_repo->snapshots) {
                 html("<tr><th>download</th><td colspan='2' class='sha1'>");
                 cgit_print_snapshot_links(cgit_query_repo, cgit_query_head,
                                           hex, cgit_repo->snapshots);
                 html("</td></tr>");
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
         html_txt(info->subject);
         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'>");
                 htmlf("%d files changed, %d insertions, %d deletions (",
                       files, total_adds, total_rems);
                 cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
                                NULL, NULL);
                 html(")</div>");
         }
         cgit_free_commitinfo(info);
 }
diff --git a/ui-diff.c b/ui-diff.c
index ac9a3fa..4fcf852 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -120,30 +120,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                 return;
         }
 
         commit = lookup_commit_reference(new_rev_sha1);
         if (!commit || parse_commit(commit))
                 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 
         if (old_rev)
                 get_sha1(old_rev, old_rev_sha1);
         else if (commit->parents && commit->parents->item)
                 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
         else
                 hashclr(old_rev_sha1);
 
         if (!is_null_sha1(old_rev_sha1)) {
                 type = sha1_object_info(old_rev_sha1, &size);
                 if (type == OBJ_BAD) {
                         cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
                         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 e5f3c57..a41d2b2 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -69,49 +69,49 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         if (!tip)
                 argv[1] = cgit_query_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 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='right'>Files</th>");
                 if (cgit_repo->enable_log_linecount)
                         html("<th class='right'>Lines</th>");
         }
         html("<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);
                 commit->parents = NULL;
         }
 
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                 print_commit(commit);
                 free(commit->buffer);
                 commit->buffer = NULL;
diff --git a/ui-repolist.c b/ui-repolist.c
index 9aa5c1e..3e97ca9 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -32,49 +32,49 @@ static void print_modtime(struct repoinfo *repo)
 
         path = fmt("%s/%s", repo->path, cgit_agefile);
         if (stat(path, &s) == 0) {
                 cgit_print_age(read_agefile(path), -1, NULL);
                 return;
         }
 
         path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
         if (stat(path, &s) != 0)
                 return;
         cgit_print_age(s.st_mtime, -1, NULL);
 }
 
 void cgit_print_repolist(struct cacheitem *item)
 {
         int i, columns = 4;
         char *last_group = NULL;
 
         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>");
         }
         html("<tr class='nohover'>"
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
              "<th class='left'>Owner</th>"
              "<th class='left'>Idle</th>");
         if (cgit_enable_index_links)
                 html("<th>Links</th>");
         html("</tr>\n");
 
         for (i=0; i<cgit_repolist.count; i++) {
                 cgit_repo = &cgit_repolist.repos[i];
                 if ((last_group == NULL && cgit_repo->group != NULL) ||
                     (last_group != NULL && cgit_repo->group == NULL) ||
                     (last_group != NULL && cgit_repo->group != NULL &&
                      strcmp(cgit_repo->group, last_group))) {
                         htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
                               columns);
                         html_txt(cgit_repo->group);
diff --git a/ui-shared.c b/ui-shared.c
index 7c69f60..9ec646b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -337,64 +337,64 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
                 return;
         }
         if (secs < TM_MONTH * 2) {
                 htmlf("<span class='age-weeks'>%.0f weeks</span>",
                       secs * 1.0 / TM_WEEK);
                 return;
         }
         if (secs < TM_YEAR * 2) {
                 htmlf("<span class='age-months'>%.0f months</span>",
                       secs * 1.0 / TM_MONTH);
                 return;
         }
         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=" 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);
         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;
         html_option(name, name, cgit_query_head);
         return 0;
 }
 
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
         struct tag *tag;
         struct taginfo *info;
         struct object *obj;
         char buf[256], *url;
         unsigned char fileid[20];
         int *header = (int *)cb_data;
 
         if (prefixcmp(refname, "refs/archives"))
                 return 0;
         strncpy(buf, refname+14, sizeof(buf));
         obj = parse_object(sha1);
@@ -435,103 +435,103 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
         }
 
         if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
                 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);
 
         if (incl_search) {
                 if (cgit_query_grep)
                         html_hidden("qt", cgit_query_grep);
                 if (cgit_query_search)
                         html_hidden("q", cgit_query_search);
         }
 }
 
 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;
 
         html("<div id='sidebar'>\n");
-        html("<a href='");
+        html("<div id='logo'><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></div>\n",
               cgit_logo);
         html("<div class='infobox'>");
         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);
 
                 for_each_ref(print_archive_ref, &header);
 
-                html("<p>\n<h1>branch</h1>\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("<noscript><input type='submit' id='switch-btn' value='..'/></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");
                 html("<select name='qt'>\n");
                 html_option("grep", "log msg", cgit_query_grep);
                 html_option("author", "author", cgit_query_grep);
                 html_option("committer", "committer", cgit_query_grep);
                 html("</select>\n");
                 html("<input class='txt' type='text' name='q' value='");
                 html_attr(cgit_query_search);
                 html("'/>\n");
                 html("</form>\n");
         } else {
                 if (!cgit_index_info || html_include(cgit_index_info))
                         html(default_info);
         }
 
         html("</div>\n");
 
-        html("</div>\n<table class='grid'><tr><td id='content'>\n");
+        html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n");
 }
 
 
 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");
 }
 
 /* vim:set sw=8: */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index bd34a28..4d1aa88 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -78,48 +78,49 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head,
         unsigned char sha1[20];
         int f, sl, fnl = strlen(filename);
 
         for(f=0; f<snapshot_archives_len; f++) {
                 sat = &snapshot_archives[f];
                 if(!(snapshots & sat->bit))
                         continue;
                 sl = strlen(sat->suffix);
                 if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
                         continue;
                 if (!hex)
                         hex = 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("Not a commit reference: %s", hex));
                         return;;
                 }
                 memset(&args,0,sizeof(args));
                 args.base = fmt("%s/", prefix);
                 args.tree = commit->tree;
+                args.time = commit->date;
                 cgit_print_snapshot_start(sat->mimetype, filename, item);
                 (*sat->write_func)(&args);
                 return;
         }
         cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
 
 void cgit_print_snapshot_links(const char *repo, const char *head,
                                const char *hex, int snapshots)
 {
         const struct snapshot_archive_t* sat;
             char *filename;
         int f;
 
         for(f=0; f<snapshot_archives_len; f++) {
                 sat = &snapshot_archives[f];
                 if(!(snapshots & sat->bit))
                         continue;
                 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
                                sat->suffix);
                 cgit_snapshot_link(filename, NULL, NULL, (char *)head,
                                    (char *)hex, filename);
                 html("<br/>");
         }
diff --git a/ui-summary.c b/ui-summary.c
index c856793..b96414e 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -169,32 +169,32 @@ void cgit_print_tags(int maxcount)
                 return;
         qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
         if (!maxcount)
                 maxcount = list.count;
         else if (maxcount > list.count)
                 maxcount = list.count;
         print_tag_header();
         for(i=0; i<maxcount; i++)
                 print_tag(list.refs[i]);
 
         if (maxcount < list.count)
                 print_refs_link("tags");
 }
 
 void cgit_print_summary()
 {
         if (cgit_repo->readme) {
                 html("<div id='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
@@ -1,64 +1,64 @@
 /* ui-tree.c: functions for tree output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 char *curr_rev;
 char *match_path;
 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;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s",
                                      sha1_to_hex(sha1)));
                 return;
         }
 
         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';
                         htmlf(linefmt, ++lineno);
                         html_txt(buf + start);
                         html("</td></tr>\n");
                         start = idx + 1;
                 }
                 idx++;
         }
         htmlf(linefmt, ++lineno);
         html_txt(buf + start);
         html("</td></tr>\n");
         html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                    const char *pathname, unsigned int mode, int stage)
 {
         char *name;
@@ -87,49 +87,49 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                               name,
                               sha1_to_hex(sha1)));
                 html("'>");
                 html_txt(name);
                 html("</a>");
         } else if (S_ISDIR(mode)) {
                 cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
                                curr_rev, fullpath);
         } else {
                 cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
                                curr_rev, fullpath);
         }
         htmlf("</td><td class='ls-size'>%li</td>", size);
 
         html("<td>");
         cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
                       fullpath, 0, NULL, NULL);
         html("</td></tr>\n");
         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");
         header = 1;
 }
 
 static void ls_tail()
 {
         if (!header)
                 return;
         html("</table>\n");
         header = 0;
 }
 
 static void ls_tree(const unsigned char *sha1, char *path)
 {
         struct tree *tree;
 
         tree = parse_tree_indirect(sha1);
         if (!tree) {
                 cgit_print_error(fmt("Not a tree object: %s",