1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 4c0613a..be2c75d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -366,176 +366,176 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        if (cgit_robots && *cgit_robots)
                htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
        html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
 }
 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("<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("<table id='layout' summary=''>\n");
        html("<tr><td id='sidebar'>\n");
-        html("<table class='sidebar' summary=''>\n");
+        html("<table class='sidebar' cellspacing='0' summary=''>\n");
        html("<tr><td class='sidebar'>\n<a href='");
        html_attr(cgit_rooturl());
        htmlf("'><img src='%s' alt='cgit'/></a>\n",
              cgit_logo);
        html("</td></tr>\n<tr><td class='sidebar'>\n");
        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,
                               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("<h1>branch</h1>\n");
                html("<form method='get' action=''>\n");
                add_hidden_formfields(0, 1, cgit_query_page);
        //      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='switch'/></noscript>\n");
        //      html("</td></tr></table>");
                html("</form>\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("</td></tr></table></td>\n");
        html("<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-shared.c b/ui-shared.c index 4c0613a..be2c75d 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -366,176 +366,176 @@ void cgit_print_docstart(char title, struct cacheitem item)
366	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	366	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
367	if (cgit_robots && *cgit_robots)	367	if (cgit_robots && *cgit_robots)
368	htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);	368	htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
369	html("<link rel='stylesheet' type='text/css' href='");	369	html("<link rel='stylesheet' type='text/css' href='");
370	html_attr(cgit_css);	370	html_attr(cgit_css);
371	html("'/>\n");	371	html("'/>\n");
372	html("</head>\n");	372	html("</head>\n");
373	html("<body>\n");	373	html("<body>\n");
374	}	374	}
375		375
376	void cgit_print_docend()	376	void cgit_print_docend()
377	{	377	{
378	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");	378	html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
379	}	379	}
380		380
381	int print_branch_option(const char refname, const unsigned char sha1,	381	int print_branch_option(const char refname, const unsigned char sha1,
382	int flags, void *cb_data)	382	int flags, void *cb_data)
383	{	383	{
384	char name = (char )refname;	384	char name = (char )refname;
385	html_option(name, name, cgit_query_head);	385	html_option(name, name, cgit_query_head);
386	return 0;	386	return 0;
387	}	387	}
388		388
389	int print_archive_ref(const char refname, const unsigned char sha1,	389	int print_archive_ref(const char refname, const unsigned char sha1,
390	int flags, void *cb_data)	390	int flags, void *cb_data)
391	{	391	{
392	struct tag *tag;	392	struct tag *tag;
393	struct taginfo *info;	393	struct taginfo *info;
394	struct object *obj;	394	struct object *obj;
395	char buf[256], *url;	395	char buf[256], *url;
396	unsigned char fileid[20];	396	unsigned char fileid[20];
397	int header = (int )cb_data;	397	int header = (int )cb_data;
398		398
399	if (prefixcmp(refname, "refs/archives"))	399	if (prefixcmp(refname, "refs/archives"))
400	return 0;	400	return 0;
401	strncpy(buf, refname+14, sizeof(buf));	401	strncpy(buf, refname+14, sizeof(buf));
402	obj = parse_object(sha1);	402	obj = parse_object(sha1);
403	if (!obj)	403	if (!obj)
404	return 1;	404	return 1;
405	if (obj->type == OBJ_TAG) {	405	if (obj->type == OBJ_TAG) {
406	tag = lookup_tag(sha1);	406	tag = lookup_tag(sha1);
407	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))	407	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))
408	return 0;	408	return 0;
409	hashcpy(fileid, tag->tagged->sha1);	409	hashcpy(fileid, tag->tagged->sha1);
410	} else if (obj->type != OBJ_BLOB) {	410	} else if (obj->type != OBJ_BLOB) {
411	return 0;	411	return 0;
412	} else {	412	} else {
413	hashcpy(fileid, sha1);	413	hashcpy(fileid, sha1);
414	}	414	}
415	if (!*header) {	415	if (!*header) {
416	html("<h1>download</h1>\n");	416	html("<h1>download</h1>\n");
417	*header = 1;	417	*header = 1;
418	}	418	}
419	url = cgit_pageurl(cgit_query_repo, "blob",	419	url = cgit_pageurl(cgit_query_repo, "blob",
420	fmt("id=%s&path=%s", sha1_to_hex(fileid),	420	fmt("id=%s&path=%s", sha1_to_hex(fileid),
421	buf));	421	buf));
422	html_link_open(url, NULL, "menu");	422	html_link_open(url, NULL, "menu");
423	html_txt(strlpart(buf, 20));	423	html_txt(strlpart(buf, 20));
424	html_link_close();	424	html_link_close();
425	return 0;	425	return 0;
426	}	426	}
427		427
428	void add_hidden_formfields(int incl_head, int incl_search, char *page)	428	void add_hidden_formfields(int incl_head, int incl_search, char *page)
429	{	429	{
430	char *url;	430	char *url;
431		431
432	if (!cgit_virtual_root) {	432	if (!cgit_virtual_root) {
433	url = fmt("%s/%s", cgit_query_repo, page);	433	url = fmt("%s/%s", cgit_query_repo, page);
434	if (cgit_query_path)	434	if (cgit_query_path)
435	url = fmt("%s/%s", url, cgit_query_path);	435	url = fmt("%s/%s", url, cgit_query_path);
436	html_hidden("url", url);	436	html_hidden("url", url);
437	}	437	}
438		438
439	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))	439	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
440	html_hidden("h", cgit_query_head);	440	html_hidden("h", cgit_query_head);
441		441
442	if (cgit_query_sha1)	442	if (cgit_query_sha1)
443	html_hidden("id", cgit_query_sha1);	443	html_hidden("id", cgit_query_sha1);
444	if (cgit_query_sha2)	444	if (cgit_query_sha2)
445	html_hidden("id2", cgit_query_sha2);	445	html_hidden("id2", cgit_query_sha2);
446		446
447	if (incl_search) {	447	if (incl_search) {
448	if (cgit_query_grep)	448	if (cgit_query_grep)
449	html_hidden("qt", cgit_query_grep);	449	html_hidden("qt", cgit_query_grep);
450	if (cgit_query_search)	450	if (cgit_query_search)
451	html_hidden("q", cgit_query_search);	451	html_hidden("q", cgit_query_search);
452	}	452	}
453	}	453	}
454		454
455	void cgit_print_pageheader(char *title, int show_search)	455	void cgit_print_pageheader(char *title, int show_search)
456	{	456	{
457	static const char *default_info = "This is cgit, a fast webinterface for git repositories";	457	static const char *default_info = "This is cgit, a fast webinterface for git repositories";
458	int header = 0;	458	int header = 0;
459		459
460	html("<table id='layout' summary=''>\n");	460	html("<table id='layout' summary=''>\n");
461	html("<tr><td id='sidebar'>\n");	461	html("<tr><td id='sidebar'>\n");
462	html("<table class='sidebar' summary=''>\n");	462	html("<table class='sidebar' cellspacing='0' summary=''>\n");
463	html("<tr><td class='sidebar'>\n<a href='");	463	html("<tr><td class='sidebar'>\n<a href='");
464	html_attr(cgit_rooturl());	464	html_attr(cgit_rooturl());
465	htmlf("'><img src='%s' alt='cgit'/></a>\n",	465	htmlf("'><img src='%s' alt='cgit'/></a>\n",
466	cgit_logo);	466	cgit_logo);
467	html("</td></tr>\n<tr><td class='sidebar'>\n");	467	html("</td></tr>\n<tr><td class='sidebar'>\n");
468	if (cgit_query_repo) {	468	if (cgit_query_repo) {
469	html("<h1 class='first'>");	469	html("<h1 class='first'>");
470	html_txt(strrpart(cgit_repo->name, 20));	470	html_txt(strrpart(cgit_repo->name, 20));
471	html("</h1>\n");	471	html("</h1>\n");
472	html_txt(cgit_repo->desc);	472	html_txt(cgit_repo->desc);
473	if (cgit_repo->owner) {	473	if (cgit_repo->owner) {
474	html("<h1>owner</h1>\n");	474	html("<h1>owner</h1>\n");
475	html_txt(cgit_repo->owner);	475	html_txt(cgit_repo->owner);
476	}	476	}
477	html("<h1>navigate</h1>\n");	477	html("<h1>navigate</h1>\n");
478	reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,	478	reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
479	NULL, NULL);	479	NULL, NULL);
480	cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,	480	cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
481	0, NULL, NULL);	481	0, NULL, NULL);
482	cgit_tree_link("tree", NULL, "menu", cgit_query_head,	482	cgit_tree_link("tree", NULL, "menu", cgit_query_head,
483	cgit_query_sha1, NULL);	483	cgit_query_sha1, NULL);
484	cgit_commit_link("commit", NULL, "menu", cgit_query_head,	484	cgit_commit_link("commit", NULL, "menu", cgit_query_head,
485	cgit_query_sha1);	485	cgit_query_sha1);
486	cgit_diff_link("diff", NULL, "menu", cgit_query_head,	486	cgit_diff_link("diff", NULL, "menu", cgit_query_head,
487	cgit_query_sha1, cgit_query_sha2, NULL);	487	cgit_query_sha1, cgit_query_sha2, NULL);
488		488
489	for_each_ref(print_archive_ref, &header);	489	for_each_ref(print_archive_ref, &header);
490		490
491	html("<h1>branch</h1>\n");	491	html("<h1>branch</h1>\n");
492	html("<form method='get' action=''>\n");	492	html("<form method='get' action=''>\n");
493	add_hidden_formfields(0, 1, cgit_query_page);	493	add_hidden_formfields(0, 1, cgit_query_page);
494	// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");	494	// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
495	html("<select name='h' onchange='this.form.submit();'>\n");	495	html("<select name='h' onchange='this.form.submit();'>\n");
496	for_each_branch_ref(print_branch_option, cgit_query_head);	496	for_each_branch_ref(print_branch_option, cgit_query_head);
497	html("</select>\n");	497	html("</select>\n");
498	// html("</td><td>");	498	// html("</td><td>");
499	html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");	499	html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
500	// html("</td></tr></table>");	500	// html("</td></tr></table>");
501	html("</form>\n");	501	html("</form>\n");
502		502
503	html("<h1>search</h1>\n");	503	html("<h1>search</h1>\n");
504	html("<form method='get' action='");	504	html("<form method='get' action='");
505	if (cgit_virtual_root)	505	if (cgit_virtual_root)
506	html_attr(cgit_fileurl(cgit_query_repo, "log",	506	html_attr(cgit_fileurl(cgit_query_repo, "log",
507	cgit_query_path, NULL));	507	cgit_query_path, NULL));
508	html("'>\n");	508	html("'>\n");
509	add_hidden_formfields(1, 0, "log");	509	add_hidden_formfields(1, 0, "log");
510	html("<select name='qt'>\n");	510	html("<select name='qt'>\n");
511	html_option("grep", "log msg", cgit_query_grep);	511	html_option("grep", "log msg", cgit_query_grep);
512	html_option("author", "author", cgit_query_grep);	512	html_option("author", "author", cgit_query_grep);
513	html_option("committer", "committer", cgit_query_grep);	513	html_option("committer", "committer", cgit_query_grep);
514	html("</select>\n");	514	html("</select>\n");
515	html("<input class='txt' type='text' name='q' value='");	515	html("<input class='txt' type='text' name='q' value='");
516	html_attr(cgit_query_search);	516	html_attr(cgit_query_search);
517	html("'/>\n");	517	html("'/>\n");
518	html("</form>\n");	518	html("</form>\n");
519	} else {	519	} else {
520	if (!cgit_index_info \|\| html_include(cgit_index_info))	520	if (!cgit_index_info \|\| html_include(cgit_index_info))
521	html(default_info);	521	html(default_info);
522	}	522	}
523		523
524	html("</td></tr></table></td>\n");	524	html("</td></tr></table></td>\n");
525		525
526	html("<td id='content'>\n");	526	html("<td id='content'>\n");
527	}	527	}
528		528
529		529
530	void cgit_print_snapshot_start(const char mimetype, const char filename,	530	void cgit_print_snapshot_start(const char mimetype, const char filename,
531	struct cacheitem *item)	531	struct cacheitem *item)
532	{	532	{
533	htmlf("Content-Type: %s\n", mimetype);	533	htmlf("Content-Type: %s\n", mimetype);
534	htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);	534	htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
535	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));	535	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
536	htmlf("Expires: %s\n", http_date(item->st.st_mtime +	536	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
537	ttl_seconds(item->ttl)));	537	ttl_seconds(item->ttl)));
538	html("\n");	538	html("\n");
539	}	539	}
540		540
541	/* vim:set sw=8: */	541	/* vim:set sw=8: */