author | Lars Hjemli <hjemli@gmail.com> | 2007-11-11 12:17:13 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-11 12:17:13 (UTC) |
commit | a7cf406c802394460cb14c79f3f43582d1428a45 (patch) (unidiff) | |
tree | 71f3069c782698ae2972459258d551055f502c4f | |
parent | ab21082c21867e035cd925a06d6d55fb3143d883 (diff) | |
parent | 2ff33a8a0405b420cd75e0e207c7efeecd6f130b (diff) | |
download | cgit-a7cf406c802394460cb14c79f3f43582d1428a45.zip cgit-a7cf406c802394460cb14c79f3f43582d1428a45.tar.gz cgit-a7cf406c802394460cb14c79f3f43582d1428a45.tar.bz2 |
Merge branch 'lh/testsuite'
* lh/testsuite:
Set commit date on snapshot contents
Fix html error detected by test-suite
Create initial testsuite
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | cgit.css | 6 | ||||
-rw-r--r-- | html.c | 2 | ||||
-rw-r--r-- | tests/.gitignore | 2 | ||||
-rw-r--r-- | tests/Makefile | 13 | ||||
-rwxr-xr-x | tests/setup.sh | 108 | ||||
-rwxr-xr-x | tests/t0010-validate-html.sh | 31 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 13 | ||||
-rwxr-xr-x | tests/t0102-summary.sh | 20 | ||||
-rwxr-xr-x | tests/t0103-log.sh | 15 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 21 | ||||
-rwxr-xr-x | tests/t0105-commit.sh | 22 | ||||
-rwxr-xr-x | tests/t0106-diff.sh | 20 | ||||
-rwxr-xr-x | tests/t0107-snapshot.sh | 36 | ||||
-rw-r--r-- | ui-commit.c | 6 | ||||
-rw-r--r-- | ui-diff.c | 2 | ||||
-rw-r--r-- | ui-log.c | 2 | ||||
-rw-r--r-- | ui-repolist.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 24 | ||||
-rw-r--r-- | ui-snapshot.c | 1 | ||||
-rw-r--r-- | ui-summary.c | 2 | ||||
-rw-r--r-- | ui-tree.c | 6 |
22 files changed, 334 insertions, 25 deletions
@@ -23,9 +23,9 @@ ifdef NEEDS_LIBICONV | |||
23 | EXTLIBS += -liconv | 23 | EXTLIBS += -liconv |
24 | endif | 24 | endif |
25 | 25 | ||
26 | 26 | ||
27 | .PHONY: all git install clean distclean emptycache force-version get-git | 27 | .PHONY: all git test install clean distclean emptycache force-version get-git |
28 | 28 | ||
29 | all: cgit git | 29 | all: cgit git |
30 | 30 | ||
31 | VERSION: force-version | 31 | VERSION: force-version |
@@ -53,8 +53,11 @@ git/libgit.a: | git | |||
53 | git: | 53 | git: |
54 | cd git && $(MAKE) xdiff/lib.a | 54 | cd git && $(MAKE) xdiff/lib.a |
55 | cd git && $(MAKE) libgit.a | 55 | cd git && $(MAKE) libgit.a |
56 | 56 | ||
57 | test: all | ||
58 | $(MAKE) -C tests | ||
59 | |||
57 | install: all | 60 | install: all |
58 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 61 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
59 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 62 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
60 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 63 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
@@ -110,9 +110,13 @@ div#sidebar div.infobox { | |||
110 | 110 | ||
111 | div#sidebar div.infobox h1 { | 111 | div#sidebar div.infobox h1 { |
112 | font-size: 10pt; | 112 | font-size: 10pt; |
113 | font-weight: bold; | 113 | font-weight: bold; |
114 | margin: 0px; | 114 | margin: 8px 0px 0px 0px; |
115 | } | ||
116 | |||
117 | div#sidebar div.infobox h1.first { | ||
118 | margin-top: 0px; | ||
115 | } | 119 | } |
116 | 120 | ||
117 | div#sidebar div.infobox a.menu { | 121 | div#sidebar div.infobox a.menu { |
118 | display: block; | 122 | display: block; |
@@ -131,9 +131,9 @@ void html_option(char *value, char *text, char *selected_value) | |||
131 | html("<option value='"); | 131 | html("<option value='"); |
132 | html_attr(value); | 132 | html_attr(value); |
133 | html("'"); | 133 | html("'"); |
134 | if (selected_value && !strcmp(selected_value, value)) | 134 | if (selected_value && !strcmp(selected_value, value)) |
135 | html(" selected"); | 135 | html(" selected='selected'"); |
136 | html(">"); | 136 | html(">"); |
137 | html_txt(text); | 137 | html_txt(text); |
138 | html("</option>\n"); | 138 | html("</option>\n"); |
139 | } | 139 | } |
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 @@ | |||
1 | trash | ||
2 | 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 @@ | |||
1 | |||
2 | |||
3 | T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) | ||
4 | |||
5 | all: $(T) | ||
6 | |||
7 | $(T): | ||
8 | @$@ | ||
9 | |||
10 | clean: | ||
11 | $(RM) -rf trash | ||
12 | |||
13 | .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 @@ | |||
1 | # This file should be sourced by all test-scripts | ||
2 | # | ||
3 | # Main functions: | ||
4 | # prepare_tests(description) - setup for testing, i.e. create repos+config | ||
5 | # run_test(description, script) - run one test, i.e. eval script | ||
6 | # | ||
7 | # Helper functions | ||
8 | # cgit_query(querystring) - call cgit with the specified querystring | ||
9 | # cgit_url(url) - call cgit with the specified virtual url | ||
10 | # | ||
11 | # Example script: | ||
12 | # | ||
13 | # . setup.sh | ||
14 | # prepare_tests "html validation" | ||
15 | # run_test 'repo index' 'cgit_url "/" | tidy -e' | ||
16 | # run_test 'repo summary' 'cgit_url "/foo" | tidy -e' | ||
17 | |||
18 | |||
19 | mkrepo() { | ||
20 | name=$1 | ||
21 | count=$2 | ||
22 | dir=$PWD | ||
23 | test -d $name && return | ||
24 | printf "Creating testrepo %s\n" $name | ||
25 | mkdir -p $name | ||
26 | cd $name | ||
27 | git init | ||
28 | for ((n=1; n<=count; n++)) | ||
29 | do | ||
30 | echo $n >file-$n | ||
31 | git add file-$n | ||
32 | git commit -m "commit $n" | ||
33 | done | ||
34 | cd $dir | ||
35 | } | ||
36 | |||
37 | setup_repos() | ||
38 | { | ||
39 | rm -rf trash/cache | ||
40 | mkdir -p trash/cache | ||
41 | mkrepo trash/repos/foo 5 >/dev/null | ||
42 | mkrepo trash/repos/bar 50 >/dev/null | ||
43 | cat >trash/cgitrc <<EOF | ||
44 | virtual-root=/ | ||
45 | cache-root=$PWD/trash/cache | ||
46 | |||
47 | nocache=0 | ||
48 | snapshots=tar.gz tar.bz zip | ||
49 | enable-log-filecount=1 | ||
50 | enable-log-linecount=1 | ||
51 | summary-log=5 | ||
52 | summary-branches=5 | ||
53 | summary-tags=5 | ||
54 | |||
55 | repo.url=foo | ||
56 | repo.path=$PWD/trash/repos/foo/.git | ||
57 | repo.desc=the foo repo | ||
58 | |||
59 | repo.url=bar | ||
60 | repo.path=$PWD/trash/repos/bar/.git | ||
61 | repo.desc=the bar repo | ||
62 | EOF | ||
63 | } | ||
64 | |||
65 | prepare_tests() | ||
66 | { | ||
67 | setup_repos | ||
68 | test_count=0 | ||
69 | test_failed=0 | ||
70 | echo "$@" "($0)" | ||
71 | } | ||
72 | |||
73 | tests_done() | ||
74 | { | ||
75 | printf "\n" | ||
76 | if test $test_failed -gt 0 | ||
77 | then | ||
78 | printf "[%s of %s tests failed]\n" $test_failed $test_count | ||
79 | false | ||
80 | fi | ||
81 | } | ||
82 | |||
83 | run_test() | ||
84 | { | ||
85 | desc=$1 | ||
86 | script=$2 | ||
87 | ((test_count++)) | ||
88 | eval "$2" >test-output.log | ||
89 | res=$? | ||
90 | if test $res = 0 | ||
91 | then | ||
92 | printf " %s: ok - %s\n" $test_count "$desc" | ||
93 | else | ||
94 | ((test_failed++)) | ||
95 | printf " %s: fail - %s\n" $test_count "$desc" | ||
96 | fi | ||
97 | } | ||
98 | |||
99 | cgit_query() | ||
100 | { | ||
101 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit" | ||
102 | } | ||
103 | |||
104 | cgit_url() | ||
105 | { | ||
106 | CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" | ||
107 | } | ||
108 | |||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | |||
6 | test_url() | ||
7 | { | ||
8 | tidy_opt="-eq" | ||
9 | test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" | ||
10 | cgit_url "$1" | sed -e "1,4d" >trash/tidy-$test_count | ||
11 | tidy $tidy_opt trash/tidy-$test_count | ||
12 | rc=$? | ||
13 | if test $rc = 2 | ||
14 | then | ||
15 | false | ||
16 | else | ||
17 | : | ||
18 | fi | ||
19 | } | ||
20 | |||
21 | prepare_tests 'Validate html with tidy' | ||
22 | |||
23 | run_test 'index page' 'test_url ""' | ||
24 | run_test 'foo' 'test_url "foo"' | ||
25 | run_test 'foo/log' 'test_url "foo/log"' | ||
26 | run_test 'foo/tree' 'test_url "foo/tree"' | ||
27 | run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' | ||
28 | run_test 'foo/commit' 'test_url "foo/commit"' | ||
29 | run_test 'foo/diff' 'test_url "foo/diff"' | ||
30 | |||
31 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on index page" | ||
6 | |||
7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' | ||
8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' | ||
9 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' | ||
10 | run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp' | ||
11 | run_test 'no log-link' 'grep -ve "foo/log" trash/tmp' | ||
12 | |||
13 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on summary page" | ||
6 | |||
7 | run_test 'generate foo summary' 'cgit_url "foo" >trash/tmp' | ||
8 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | ||
10 | run_test 'find branch master' 'grep -e "master" trash/tmp' | ||
11 | run_test 'no tags' 'grep -ve "tags" trash/tmp' | ||
12 | |||
13 | run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' | ||
14 | run_test 'no commit 45' 'grep -ve "commit 45" trash/tmp' | ||
15 | run_test 'find commit 46' 'grep -e "commit 46" trash/tmp' | ||
16 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | ||
17 | run_test 'find branch master' 'grep -e "master" trash/tmp' | ||
18 | run_test 'no tags' 'grep -ve "tags" trash/tmp' | ||
19 | |||
20 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on log page" | ||
6 | |||
7 | run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp' | ||
8 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | ||
10 | |||
11 | run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp' | ||
12 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
13 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | ||
14 | |||
15 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on tree page" | ||
6 | |||
7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' | ||
8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' | ||
9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' | ||
10 | |||
11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' | ||
12 | |||
13 | run_test 'find line 1' ' | ||
14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp | ||
15 | ' | ||
16 | |||
17 | run_test 'no line 2' ' | ||
18 | grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp | ||
19 | ' | ||
20 | |||
21 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on commit page" | ||
6 | |||
7 | run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp' | ||
8 | run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' | ||
9 | run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' | ||
10 | |||
11 | run_test 'find commit subject' ' | ||
12 | grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp | ||
13 | ' | ||
14 | |||
15 | run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' | ||
16 | run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp' | ||
17 | |||
18 | run_test 'find diff summary' ' | ||
19 | grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp | ||
20 | ' | ||
21 | |||
22 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Check content on diff page" | ||
6 | |||
7 | run_test 'generate foo/diff' 'cgit_url "foo/diff" >trash/tmp' | ||
8 | run_test 'find diff header' 'grep -e "a/file-5 b/file-5" trash/tmp' | ||
9 | run_test 'find blob link' 'grep -e "<a href=./foo/tree/file-5?id=" trash/tmp' | ||
10 | run_test 'find added file' 'grep -e "new file mode 100644" trash/tmp' | ||
11 | |||
12 | run_test 'find hunk header' ' | ||
13 | grep -e "<div class=.hunk.>@@ -0,0 +1 @@</div>" trash/tmp | ||
14 | ' | ||
15 | |||
16 | run_test 'find added line' ' | ||
17 | grep -e "<div class=.add.>+5</div>" trash/tmp | ||
18 | ' | ||
19 | |||
20 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . ./setup.sh | ||
4 | |||
5 | prepare_tests "Verify snapshot" | ||
6 | |||
7 | run_test 'get foo/snapshot/test.tar.gz' ' | ||
8 | cgit_url "foo/snapshot/test.tar.gz" >trash/tmp | ||
9 | ' | ||
10 | |||
11 | run_test 'check html headers' ' | ||
12 | head -n 1 trash/tmp | | ||
13 | grep -e "Content-Type: application/x-tar" && | ||
14 | |||
15 | head -n 2 trash/tmp | | ||
16 | grep -e "Content-Disposition: inline; filename=.test.tar.gz." | ||
17 | ' | ||
18 | |||
19 | run_test 'strip off the header lines' ' | ||
20 | tail -n +6 trash/tmp > trash/test.tar.gz | ||
21 | ' | ||
22 | |||
23 | run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' | ||
24 | run_test 'untar' 'tar -xf trash/test.tar.gz -C trash' | ||
25 | |||
26 | run_test 'count files' ' | ||
27 | c=$(ls -1 trash/foo/ | wc -l) && | ||
28 | test $c = 5 | ||
29 | ' | ||
30 | |||
31 | run_test 'verify untarred file-5' ' | ||
32 | grep -e "^5$" trash/foo/file-5 && | ||
33 | test $(cat trash/foo/file-5 | wc -l) = 1 | ||
34 | ' | ||
35 | |||
36 | tests_done | ||
diff --git a/ui-commit.c b/ui-commit.c index 4ac8955..bd55a33 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -83,9 +83,9 @@ void print_fileinfo(struct fileinfo *info) | |||
83 | info->old_path); | 83 | info->old_path); |
84 | html("</td><td class='right'>"); | 84 | html("</td><td class='right'>"); |
85 | htmlf("%d", info->added + info->removed); | 85 | htmlf("%d", info->added + info->removed); |
86 | html("</td><td class='graph'>"); | 86 | html("</td><td class='graph'>"); |
87 | htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 87 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
88 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 88 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
89 | info->added * 100.0 / max_changes); | 89 | info->added * 100.0 / max_changes); |
90 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 90 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
91 | info->removed * 100.0 / max_changes); | 91 | info->removed * 100.0 / max_changes); |
@@ -156,9 +156,9 @@ void cgit_print_commit(char *hex) | |||
156 | return; | 156 | return; |
157 | } | 157 | } |
158 | info = cgit_parse_commit(commit); | 158 | info = cgit_parse_commit(commit); |
159 | 159 | ||
160 | html("<table class='commit-info'>\n"); | 160 | html("<table summary='commit info' class='commit-info'>\n"); |
161 | html("<tr><th>author</th><td>"); | 161 | html("<tr><th>author</th><td>"); |
162 | html_txt(info->author); | 162 | html_txt(info->author); |
163 | html(" "); | 163 | html(" "); |
164 | html_txt(info->author_email); | 164 | html_txt(info->author_email); |
@@ -208,9 +208,9 @@ void cgit_print_commit(char *hex) | |||
208 | html_txt(info->msg); | 208 | html_txt(info->msg); |
209 | html("</div>"); | 209 | html("</div>"); |
210 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { | 210 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { |
211 | html("<div class='diffstat-header'>Diffstat</div>"); | 211 | html("<div class='diffstat-header'>Diffstat</div>"); |
212 | html("<table class='diffstat'>"); | 212 | html("<table summary='diffstat' class='diffstat'>"); |
213 | max_changes = 0; | 213 | max_changes = 0; |
214 | cgit_diff_commit(commit, inspect_filepair); | 214 | cgit_diff_commit(commit, inspect_filepair); |
215 | for(i = 0; i<files; i++) | 215 | for(i = 0; i<files; i++) |
216 | print_fileinfo(&items[i]); | 216 | print_fileinfo(&items[i]); |
@@ -140,9 +140,9 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
140 | commit2 = lookup_commit_reference(old_rev_sha1); | 140 | commit2 = lookup_commit_reference(old_rev_sha1); |
141 | if (!commit2 || parse_commit(commit2)) | 141 | if (!commit2 || parse_commit(commit2)) |
142 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); | 142 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
143 | } | 143 | } |
144 | html("<table class='diff'>"); | 144 | html("<table summary='diff' class='diff'>"); |
145 | html("<tr><td>"); | 145 | html("<tr><td>"); |
146 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); | 146 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
147 | html("</td></tr>"); | 147 | html("</td></tr>"); |
148 | html("</table>"); | 148 | html("</table>"); |
@@ -89,9 +89,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
89 | compile_grep_patterns(rev.grep_filter); | 89 | compile_grep_patterns(rev.grep_filter); |
90 | } | 90 | } |
91 | prepare_revision_walk(&rev); | 91 | prepare_revision_walk(&rev); |
92 | 92 | ||
93 | html("<table class='list nowrap'>"); | 93 | html("<table summary='log' class='list nowrap'>"); |
94 | html("<tr class='nohover'><th class='left'>Age</th>" | 94 | html("<tr class='nohover'><th class='left'>Age</th>" |
95 | "<th class='left'>Message</th>"); | 95 | "<th class='left'>Message</th>"); |
96 | 96 | ||
97 | if (cgit_repo->enable_log_filecount) { | 97 | if (cgit_repo->enable_log_filecount) { |
diff --git a/ui-repolist.c b/ui-repolist.c index 9aa5c1e..3e97ca9 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -52,9 +52,9 @@ void cgit_print_repolist(struct cacheitem *item) | |||
52 | 52 | ||
53 | cgit_print_docstart(cgit_root_title, item); | 53 | cgit_print_docstart(cgit_root_title, item); |
54 | cgit_print_pageheader(cgit_root_title, 0); | 54 | cgit_print_pageheader(cgit_root_title, 0); |
55 | 55 | ||
56 | html("<table class='list nowrap'>"); | 56 | html("<table summary='repository list' class='list nowrap'>"); |
57 | if (cgit_index_header) { | 57 | if (cgit_index_header) { |
58 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", | 58 | htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", |
59 | columns); | 59 | columns); |
60 | html_include(cgit_index_header); | 60 | html_include(cgit_index_header); |
diff --git a/ui-shared.c b/ui-shared.c index 7c69f60..9ec646b 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -357,9 +357,9 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
358 | ttl_seconds(item->ttl))); | 358 | ttl_seconds(item->ttl))); |
359 | html("\n"); | 359 | html("\n"); |
360 | html(cgit_doctype); | 360 | html(cgit_doctype); |
361 | html("<html>\n"); | 361 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
362 | html("<head>\n"); | 362 | html("<head>\n"); |
363 | html("<title>"); | 363 | html("<title>"); |
364 | html_txt(title); | 364 | html_txt(title); |
365 | html("</title>\n"); | 365 | html("</title>\n"); |
@@ -372,9 +372,9 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
372 | } | 372 | } |
373 | 373 | ||
374 | void cgit_print_docend() | 374 | void cgit_print_docend() |
375 | { | 375 | { |
376 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); | 376 | html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); |
377 | } | 377 | } |
378 | 378 | ||
379 | int print_branch_option(const char *refname, const unsigned char *sha1, | 379 | int print_branch_option(const char *refname, const unsigned char *sha1, |
380 | int flags, void *cb_data) | 380 | int flags, void *cb_data) |
@@ -455,23 +455,23 @@ void cgit_print_pageheader(char *title, int show_search) | |||
455 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; | 455 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; |
456 | int header = 0; | 456 | int header = 0; |
457 | 457 | ||
458 | html("<div id='sidebar'>\n"); | 458 | html("<div id='sidebar'>\n"); |
459 | html("<a href='"); | 459 | html("<div id='logo'><a href='"); |
460 | html_attr(cgit_rooturl()); | 460 | html_attr(cgit_rooturl()); |
461 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", | 461 | htmlf("'><img src='%s' alt='cgit'/></a></div>\n", |
462 | cgit_logo); | 462 | cgit_logo); |
463 | html("<div class='infobox'>"); | 463 | html("<div class='infobox'>"); |
464 | if (cgit_query_repo) { | 464 | if (cgit_query_repo) { |
465 | html("<h1>"); | 465 | html("<h1 class='first'>"); |
466 | html_txt(strrpart(cgit_repo->name, 20)); | 466 | html_txt(strrpart(cgit_repo->name, 20)); |
467 | html("</h1>\n"); | 467 | html("</h1>\n"); |
468 | html_txt(cgit_repo->desc); | 468 | html_txt(cgit_repo->desc); |
469 | if (cgit_repo->owner) { | 469 | if (cgit_repo->owner) { |
470 | html("<p>\n<h1>owner</h1>\n"); | 470 | html("<h1>owner</h1>\n"); |
471 | html_txt(cgit_repo->owner); | 471 | html_txt(cgit_repo->owner); |
472 | } | 472 | } |
473 | html("<p>\n<h1>navigate</h1>\n"); | 473 | html("<h1>navigate</h1>\n"); |
474 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 474 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, |
475 | NULL, NULL); | 475 | NULL, NULL); |
476 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, | 476 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, |
477 | 0, NULL, NULL); | 477 | 0, NULL, NULL); |
@@ -483,21 +483,21 @@ void cgit_print_pageheader(char *title, int show_search) | |||
483 | cgit_query_sha1, cgit_query_sha2, NULL); | 483 | cgit_query_sha1, cgit_query_sha2, NULL); |
484 | 484 | ||
485 | for_each_ref(print_archive_ref, &header); | 485 | for_each_ref(print_archive_ref, &header); |
486 | 486 | ||
487 | html("<p>\n<h1>branch</h1>\n"); | 487 | html("<h1>branch</h1>\n"); |
488 | html("<form method='get' action=''>\n"); | 488 | html("<form method='get' action=''>\n"); |
489 | add_hidden_formfields(0, 1, cgit_query_page); | 489 | add_hidden_formfields(0, 1, cgit_query_page); |
490 | html("<table class='grid'><tr><td id='branch-dropdown-cell'>"); | 490 | html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); |
491 | html("<select name='h' onchange='this.form.submit();'>\n"); | 491 | html("<select name='h' onchange='this.form.submit();'>\n"); |
492 | for_each_branch_ref(print_branch_option, cgit_query_head); | 492 | for_each_branch_ref(print_branch_option, cgit_query_head); |
493 | html("</select>\n"); | 493 | html("</select>\n"); |
494 | html("</td><td>"); | 494 | html("</td><td>"); |
495 | html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n"); | 495 | html("<noscript><input type='submit' id='switch-btn' value='..'/></noscript>\n"); |
496 | html("</td></tr></table>"); | 496 | html("</td></tr></table>"); |
497 | html("</form>\n"); | 497 | html("</form>\n"); |
498 | 498 | ||
499 | html("<p>\n<h1>search</h1>\n"); | 499 | html("<h1>search</h1>\n"); |
500 | html("<form method='get' action='"); | 500 | html("<form method='get' action='"); |
501 | if (cgit_virtual_root) | 501 | if (cgit_virtual_root) |
502 | html_attr(cgit_fileurl(cgit_query_repo, "log", | 502 | html_attr(cgit_fileurl(cgit_query_repo, "log", |
503 | cgit_query_path, NULL)); | 503 | cgit_query_path, NULL)); |
@@ -518,9 +518,9 @@ void cgit_print_pageheader(char *title, int show_search) | |||
518 | } | 518 | } |
519 | 519 | ||
520 | html("</div>\n"); | 520 | html("</div>\n"); |
521 | 521 | ||
522 | html("</div>\n<table class='grid'><tr><td id='content'>\n"); | 522 | html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n"); |
523 | } | 523 | } |
524 | 524 | ||
525 | 525 | ||
526 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, | 526 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, |
diff --git a/ui-snapshot.c b/ui-snapshot.c index bd34a28..4d1aa88 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -98,8 +98,9 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, | |||
98 | } | 98 | } |
99 | memset(&args,0,sizeof(args)); | 99 | memset(&args,0,sizeof(args)); |
100 | args.base = fmt("%s/", prefix); | 100 | args.base = fmt("%s/", prefix); |
101 | args.tree = commit->tree; | 101 | args.tree = commit->tree; |
102 | args.time = commit->date; | ||
102 | cgit_print_snapshot_start(sat->mimetype, filename, item); | 103 | cgit_print_snapshot_start(sat->mimetype, filename, item); |
103 | (*sat->write_func)(&args); | 104 | (*sat->write_func)(&args); |
104 | return; | 105 | return; |
105 | } | 106 | } |
diff --git a/ui-summary.c b/ui-summary.c index c856793..b96414e 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -189,9 +189,9 @@ void cgit_print_summary() | |||
189 | } | 189 | } |
190 | if (cgit_summary_log > 0) | 190 | if (cgit_summary_log > 0) |
191 | cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, | 191 | cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, |
192 | NULL, NULL, 0); | 192 | NULL, NULL, 0); |
193 | html("<table class='list nowrap'>"); | 193 | html("<table summary='repository info' class='list nowrap'>"); |
194 | if (cgit_summary_log > 0) | 194 | if (cgit_summary_log > 0) |
195 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 195 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
196 | cgit_print_branches(cgit_summary_branches); | 196 | cgit_print_branches(cgit_summary_branches); |
197 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 197 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
@@ -16,9 +16,9 @@ static void print_object(const unsigned char *sha1, char *path) | |||
16 | { | 16 | { |
17 | enum object_type type; | 17 | enum object_type type; |
18 | char *buf; | 18 | char *buf; |
19 | unsigned long size, lineno, start, idx; | 19 | unsigned long size, lineno, start, idx; |
20 | const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; | 20 | 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'>"; |
21 | 21 | ||
22 | type = sha1_object_info(sha1, &size); | 22 | type = sha1_object_info(sha1, &size); |
23 | if (type == OBJ_BAD) { | 23 | if (type == OBJ_BAD) { |
24 | cgit_print_error(fmt("Bad object name: %s", | 24 | cgit_print_error(fmt("Bad object name: %s", |
@@ -36,9 +36,9 @@ static void print_object(const unsigned char *sha1, char *path) | |||
36 | html(" blob: <a href='"); | 36 | html(" blob: <a href='"); |
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); | 37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); | 38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
39 | 39 | ||
40 | html("<table class='blob'>\n"); | 40 | html("<table summary='blob content' class='blob'>\n"); |
41 | idx = 0; | 41 | idx = 0; |
42 | start = 0; | 42 | start = 0; |
43 | lineno = 0; | 43 | lineno = 0; |
44 | while(idx < size) { | 44 | while(idx < size) { |
@@ -107,9 +107,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
107 | } | 107 | } |
108 | 108 | ||
109 | static void ls_head() | 109 | static void ls_head() |
110 | { | 110 | { |
111 | html("<table class='list'>\n"); | 111 | html("<table summary='tree listing' class='list'>\n"); |
112 | html("<tr class='nohover'>"); | 112 | html("<tr class='nohover'>"); |
113 | html("<th class='left'>Mode</th>"); | 113 | html("<th class='left'>Mode</th>"); |
114 | html("<th class='left'>Name</th>"); | 114 | html("<th class='left'>Name</th>"); |
115 | html("<th class='right'>Size</th>"); | 115 | html("<th class='right'>Size</th>"); |