Fix html error detected by test-suite

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

diff --git a/cgit.css b/cgit.css
index f1003b4a3024fff25e9c5aed71f2198d6d36f258..565427f58544b655e8819de2ccc63f1b1d943558 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -111,7 +111,11 @@ div#sidebar div.infobox {
 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 {

diff --git a/html.c b/html.c
index 6c9cc8b67342b6df67dc35b586cbdb622612c5ca..eb163d9d1f3a249feb36ee155ab5a464ef4aa64a 100644 (file)
--- a/html.c
+++ b/html.c
@@ -132,7 +132,7 @@ void html_option(char *value, char *text, char *selected_value)
        html_attr(value);
        html("'");
        if (selected_value && !strcmp(selected_value, value))
-               html(" selected");
+               html(" selected='selected'");
        html(">");
        html_txt(text);
        html("</option>\n");

diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 9c362ca12c56a6e09f46c18dd0e9aa21389e7f3e..2516c72137fcd2b20ea3aefa82aa33817a958d3c 100755 (executable)
--- a/tests/t0104-tree.sh
+++ b/tests/t0104-tree.sh
@@ -9,7 +9,13 @@ 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 name=.1.>1</a>" trash/tmp'
-run_test 'no line 2' 'grep -ve "<a name=.2.>2</a>" 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
index 71377510c41ec691b0a4841f58f6660884f9afd3..aa2bf33326203c1ad779fa23ba8e0ec2cd09e60c 100755 (executable)
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -13,7 +13,7 @@ run_test 'find commit subject' '
 '
 
 run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp'
-run_test 'find diffstat' 'grep -e "<table class=.diffstat.>" 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

diff --git a/ui-commit.c b/ui-commit.c
index 4ac8955379b12f17fbb2c47cd5bea5299353dce2..bd55a33827bca96978943f5f3e2b6310abc2a40a 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -84,7 +84,7 @@ void print_fileinfo(struct fileinfo *info)
        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%%;'/>",
@@ -157,7 +157,7 @@ void cgit_print_commit(char *hex)
        }
        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(" ");
@@ -209,7 +209,7 @@ void cgit_print_commit(char *hex)
        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++)

diff --git a/ui-diff.c b/ui-diff.c
index ac9a3faf6f97f735777ec8ec554a23e4c67ecac9..4fcf8523f719f46c77ace75569277f717ef3298d 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -141,7 +141,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                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>");

diff --git a/ui-log.c b/ui-log.c
index e5f3c574038273869ec695a739e1863af801ef6e..a41d2b2f03c181e73cf9ce2ce1b8657ad2851aaf 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -90,7 +90,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        }
        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>");
 

diff --git a/ui-repolist.c b/ui-repolist.c
index 9aa5c1ede644b5ed4755ab3a79bea101ef0ae3f8..3e97ca9bd5ad1145077cfdfbccc0ff7b19836497 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -53,7 +53,7 @@ void cgit_print_repolist(struct cacheitem *item)
        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);

diff --git a/ui-shared.c b/ui-shared.c
index 7c69f60f80a5a8dd495b73497132693297496a81..9ec646be6423579484d1972076be62f4cdc0f09f 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -358,7 +358,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
                                         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);
@@ -373,7 +373,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 
 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,
@@ -456,21 +456,21 @@ void cgit_print_pageheader(char *title, int show_search)
        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,
@@ -484,19 +484,19 @@ void cgit_print_pageheader(char *title, int show_search)
 
                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",
@@ -519,7 +519,7 @@ void cgit_print_pageheader(char *title, int show_search)
 
        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");
 }
 
 

diff --git a/ui-summary.c b/ui-summary.c
index c856793b978da4e05b7eb81de236d3fc3df8875b..b96414e18a826009c782794beca8897186fd07e5 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -190,7 +190,7 @@ void cgit_print_summary()
        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);

diff --git a/ui-tree.c b/ui-tree.c
index c22e30b82ef08f0901fe32d8ebe72afdc7b6e919..c1388779a483a57166ac5d082625f5984a452a59 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -17,7 +17,7 @@ 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) {
@@ -37,7 +37,7 @@ static void print_object(const unsigned char *sha1, char *path)
        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;
@@ -108,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 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>");