Generate valid html for "downloads" menu header

Noticed-by: http://validator.w3.org Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Lars Hjemli <hjemli@gmail.com> 2007-11-11 12:44:39 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2007-11-11 12:44:39 (UTC)
commit: 1b7c5b2e0b918e9452694aace7c19194683989a8 (patch) (unidiff)
tree: efdb7947afbbe1862c6c54ecdce303a6c3772117
parent: a7cf406c802394460cb14c79f3f43582d1428a45 (diff)
download: cgit-1b7c5b2e0b918e9452694aace7c19194683989a8.zip
cgit-1b7c5b2e0b918e9452694aace7c19194683989a8.tar.gz
cgit-1b7c5b2e0b918e9452694aace7c19194683989a8.tar.bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 9ec646b..5192800 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -350,129 +350,129 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
              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 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");
 }
 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);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->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");
        html_txt(strlpart(buf, 20));
        html_link_close();
        return 0;
 }
 void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
        if (!cgit_virtual_root) {
                url = fmt("%s/%s", cgit_query_repo, page);
                if (cgit_query_path)
                        url = fmt("%s/%s", url, cgit_query_path);
                html_hidden("url", url);
        }
        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("<div id='logo'><a href='");
        html_attr(cgit_rooturl());
        htmlf("'><img src='%s' alt='cgit'/></a></div>\n",
              cgit_logo);
        html("<div class='infobox'>");
        if (cgit_query_repo) {
                html("<h1 class='first'>");
                html_txt(strrpart(cgit_repo->name, 20));
                html("</h1>\n");
                html_txt(cgit_repo->desc);
                if (cgit_repo->owner) {
                        html("<h1>owner</h1>\n");
                        html_txt(cgit_repo->owner);
                }
                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,
author	Lars Hjemli <hjemli@gmail.com>	2007-11-11 12:44:39 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2007-11-11 12:44:39 (UTC)
commit	1b7c5b2e0b918e9452694aace7c19194683989a8 (patch) (unidiff)
tree	efdb7947afbbe1862c6c54ecdce303a6c3772117
parent	a7cf406c802394460cb14c79f3f43582d1428a45 (diff)
download	cgit-1b7c5b2e0b918e9452694aace7c19194683989a8.zip cgit-1b7c5b2e0b918e9452694aace7c19194683989a8.tar.gz cgit-1b7c5b2e0b918e9452694aace7c19194683989a8.tar.bz2

diff --git a/ui-shared.c b/ui-shared.c index 9ec646b..5192800 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -350,129 +350,129 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
350	secs * 1.0 / TM_YEAR);	350	secs * 1.0 / TM_YEAR);
351	}	351	}
352		352
353	void cgit_print_docstart(char title, struct cacheitem item)	353	void cgit_print_docstart(char title, struct cacheitem item)
354	{	354	{
355	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");	355	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
356	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));	356	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
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 xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\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");
366	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	366	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
367	html("<link rel='stylesheet' type='text/css' href='");	367	html("<link rel='stylesheet' type='text/css' href='");
368	html_attr(cgit_css);	368	html_attr(cgit_css);
369	html("'/>\n");	369	html("'/>\n");
370	html("</head>\n");	370	html("</head>\n");
371	html("<body>\n");	371	html("<body>\n");
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)
381	{	381	{
382	char name = (char )refname;	382	char name = (char )refname;
383	html_option(name, name, cgit_query_head);	383	html_option(name, name, cgit_query_head);
384	return 0;	384	return 0;
385	}	385	}
386		386
387	int print_archive_ref(const char refname, const unsigned char sha1,	387	int print_archive_ref(const char refname, const unsigned char sha1,
388	int flags, void *cb_data)	388	int flags, void *cb_data)
389	{	389	{
390	struct tag *tag;	390	struct tag *tag;
391	struct taginfo *info;	391	struct taginfo *info;
392	struct object *obj;	392	struct object *obj;
393	char buf[256], *url;	393	char buf[256], *url;
394	unsigned char fileid[20];	394	unsigned char fileid[20];
395	int header = (int )cb_data;	395	int header = (int )cb_data;
396		396
397	if (prefixcmp(refname, "refs/archives"))	397	if (prefixcmp(refname, "refs/archives"))
398	return 0;	398	return 0;
399	strncpy(buf, refname+14, sizeof(buf));	399	strncpy(buf, refname+14, sizeof(buf));
400	obj = parse_object(sha1);	400	obj = parse_object(sha1);
401	if (!obj)	401	if (!obj)
402	return 1;	402	return 1;
403	if (obj->type == OBJ_TAG) {	403	if (obj->type == OBJ_TAG) {
404	tag = lookup_tag(sha1);	404	tag = lookup_tag(sha1);
405	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))	405	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))
406	return 0;	406	return 0;
407	hashcpy(fileid, tag->tagged->sha1);	407	hashcpy(fileid, tag->tagged->sha1);
408	} else if (obj->type != OBJ_BLOB) {	408	} else if (obj->type != OBJ_BLOB) {
409	return 0;	409	return 0;
410	} else {	410	} else {
411	hashcpy(fileid, sha1);	411	hashcpy(fileid, sha1);
412	}	412	}
413	if (!*header) {	413	if (!*header) {
414	html("<p><h1>download</h1>");	414	html("<h1>download</h1>\n");
415	*header = 1;	415	*header = 1;
416	}	416	}
417	url = cgit_pageurl(cgit_query_repo, "blob",	417	url = cgit_pageurl(cgit_query_repo, "blob",
418	fmt("id=%s&path=%s", sha1_to_hex(fileid),	418	fmt("id=%s&path=%s", sha1_to_hex(fileid),
419	buf));	419	buf));
420	html_link_open(url, NULL, "menu");	420	html_link_open(url, NULL, "menu");
421	html_txt(strlpart(buf, 20));	421	html_txt(strlpart(buf, 20));
422	html_link_close();	422	html_link_close();
423	return 0;	423	return 0;
424	}	424	}
425		425
426	void add_hidden_formfields(int incl_head, int incl_search, char *page)	426	void add_hidden_formfields(int incl_head, int incl_search, char *page)
427	{	427	{
428	char *url;	428	char *url;
429		429
430	if (!cgit_virtual_root) {	430	if (!cgit_virtual_root) {
431	url = fmt("%s/%s", cgit_query_repo, page);	431	url = fmt("%s/%s", cgit_query_repo, page);
432	if (cgit_query_path)	432	if (cgit_query_path)
433	url = fmt("%s/%s", url, cgit_query_path);	433	url = fmt("%s/%s", url, cgit_query_path);
434	html_hidden("url", url);	434	html_hidden("url", url);
435	}	435	}
436		436
437	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))	437	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
438	html_hidden("h", cgit_query_head);	438	html_hidden("h", cgit_query_head);
439		439
440	if (cgit_query_sha1)	440	if (cgit_query_sha1)
441	html_hidden("id", cgit_query_sha1);	441	html_hidden("id", cgit_query_sha1);
442	if (cgit_query_sha2)	442	if (cgit_query_sha2)
443	html_hidden("id2", cgit_query_sha2);	443	html_hidden("id2", cgit_query_sha2);
444		444
445	if (incl_search) {	445	if (incl_search) {
446	if (cgit_query_grep)	446	if (cgit_query_grep)
447	html_hidden("qt", cgit_query_grep);	447	html_hidden("qt", cgit_query_grep);
448	if (cgit_query_search)	448	if (cgit_query_search)
449	html_hidden("q", cgit_query_search);	449	html_hidden("q", cgit_query_search);
450	}	450	}
451	}	451	}
452		452
453	void cgit_print_pageheader(char *title, int show_search)	453	void cgit_print_pageheader(char *title, int show_search)
454	{	454	{
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("<div id='logo'><a href='");	459	html("<div id='logo'><a href='");
460	html_attr(cgit_rooturl());	460	html_attr(cgit_rooturl());
461	htmlf("'><img src='%s' alt='cgit'/></a></div>\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 class='first'>");	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("<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("<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);
478	cgit_tree_link("tree", NULL, "menu", cgit_query_head,	478	cgit_tree_link("tree", NULL, "menu", cgit_query_head,