ui-shared: externalize add_hidden_formfields()

This function will be reused by ui-stats.c in the next commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
author: Lars Hjemli <hjemli@gmail.com> 2008-12-07 14:52:35 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2008-12-07 14:52:35 (UTC)
commit: c3c925f4eca3e863bedaae4cfe237c3ad52092b6 (patch) (unidiff)
tree: 5d3afa3a3ed0fbdbe00ad8e3519cf3cf60413e09
parent: 837d464af77d76a2661d92e05167657cbf430d80 (diff)
download: cgit-c3c925f4eca3e863bedaae4cfe237c3ad52092b6.zip
cgit-c3c925f4eca3e863bedaae4cfe237c3ad52092b6.tar.gz
cgit-c3c925f4eca3e863bedaae4cfe237c3ad52092b6.tar.bz2
2 files changed, 5 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c
index a5eb25f..1bb30c2 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -494,230 +494,230 @@ void cgit_print_docstart(struct cgit_context *ctx)
        html("<body>\n");
 }
 void cgit_print_docend()
 {
        html("</div>");
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
                htmlf("<div class='footer'>generated  by cgit %s at ",
                        cgit_version);
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
        html("</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, ctx.qry.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(ctx.qry.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)
+void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
                if (ctx.qry.path)
                        url = fmt("%s/%s", url, ctx.qry.path);
                html_hidden("url", url);
        }
        if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
            strcmp(ctx.qry.head, ctx.repo->defbranch))
                html_hidden("h", ctx.qry.head);
        if (ctx.qry.sha1)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
        if (incl_search) {
                if (ctx.qry.grep)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
        return (strcmp(cmd->name, page) ? NULL : "active");
 }
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
        html("<table id='header'>\n");
        html("<tr>\n");
        html("<td class='logo' rowspan='2'><a href='");
        if (ctx->cfg.logo_link)
                html_attr(ctx->cfg.logo_link);
        else
                html_attr(cgit_rooturl());
        html("'><img src='");
        html_attr(ctx->cfg.logo);
        html("' alt='cgit logo'/></a></td>\n");
        html("<td class='main'>");
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
-                add_hidden_formfields(0, 1, ctx->qry.page);
+                cgit_add_hidden_formfields(0, 1, ctx->qry.page);
                html("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");
                html("<input type='submit' name='' value='switch'/>");
                html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
        html("</td></tr>\n");
        html("<tr><td class='sub'>");
        if (ctx->repo) {
                html_txt(ctx->repo->desc);
                html("</td><td class='sub right'>");
                html_txt(ctx->repo->owner);
        } else {
                if (ctx->cfg.root_desc)
                        html_txt(ctx->cfg.root_desc);
                else if (ctx->cfg.index_info)
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
                cgit_summary_link("summary", NULL, hc(cmd, "summary"),
                                  ctx->qry.head);
                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
                              NULL, NULL, 0, NULL, NULL);
                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                                 ctx->qry.head, ctx->qry.sha1);
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                               ctx->qry.sha1, ctx->qry.sha2, NULL);
                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(cmd, "stats"),
                                        ctx->qry.head, NULL);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(cmd, "about"), ctx->qry.head, NULL,
                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                if (ctx->cfg.virtual_root)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");
-                add_hidden_formfields(1, 0, "log");
+                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html_option("grep", "log msg", ctx->qry.grep);
                html_option("author", "author", ctx->qry.grep);
                html_option("committer", "committer", ctx->qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");
                html_attr(ctx->qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
                site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(cmd, "about"),
                                  NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx->qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");
        }
        html("</td></tr></table>\n");
        html("<div class='content'>");
 }
 void cgit_print_filemode(unsigned short mode)
 {
        if (S_ISDIR(mode))
                html("d");
        else if (S_ISLNK(mode))
                html("l");
        else if (S_ISGITLINK(mode))
                html("m");
        else
                html("-");
        html_fileperm(mode >> 6);
        html_fileperm(mode >> 3);
        html_fileperm(mode);
 }
 void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
            char *filename;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;
                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
                               f->suffix);
                cgit_snapshot_link(filename, NULL, NULL, (char *)head,
                                   (char *)hex, filename);
                html("<br/>");
        }
 }
diff --git a/ui-shared.h b/ui-shared.h
index e3fae64..1524dc3 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,48 +1,49 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 extern char *cgit_hosturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                          const char *filename, const char *query);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                          const char *query);
 extern void cgit_index_link(char *name, char *title, char *class,
                            char *pattern, int ofs);
 extern void cgit_summary_link(char *name, char *title, char *class, char *head);
 extern void cgit_tag_link(char *name, char *title, char *class, char *head,
                          char *rev);
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path);
 extern void cgit_plain_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
                          char *rev, char *path, int ofs, char *grep,
                          char *pattern);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                             char *rev);
 extern void cgit_patch_link(char *name, char *title, char *class, char *head,
                            char *rev);
 extern void cgit_refs_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path);
 extern void cgit_snapshot_link(char *name, char *title, char *class,
                               char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                           char *new_rev, char *old_rev, char *path);
 extern void cgit_stats_link(char *name, char *title, char *class, char *head,
                            char *path);
 extern void cgit_object_link(struct object *obj);
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format, int local_time);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_http_headers(struct cgit_context *ctx);
 extern void cgit_print_docstart(struct cgit_context *ctx);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(struct cgit_context *ctx);
 extern void cgit_print_filemode(unsigned short mode);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                      const char *hex, int snapshots);
+extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
+                                       char *page);
 #endif /* UI_SHARED_H */
author	Lars Hjemli <hjemli@gmail.com>	2008-12-07 14:52:35 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2008-12-07 14:52:35 (UTC)
commit	c3c925f4eca3e863bedaae4cfe237c3ad52092b6 (patch) (unidiff)
tree	5d3afa3a3ed0fbdbe00ad8e3519cf3cf60413e09
parent	837d464af77d76a2661d92e05167657cbf430d80 (diff)
download	cgit-c3c925f4eca3e863bedaae4cfe237c3ad52092b6.zip cgit-c3c925f4eca3e863bedaae4cfe237c3ad52092b6.tar.gz cgit-c3c925f4eca3e863bedaae4cfe237c3ad52092b6.tar.bz2

diff --git a/ui-shared.c b/ui-shared.c index a5eb25f..1bb30c2 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -494,230 +494,230 @@ void cgit_print_docstart(struct cgit_context *ctx)
494	html("<body>\n");	494	html("<body>\n");
495	}	495	}
496		496
497	void cgit_print_docend()	497	void cgit_print_docend()
498	{	498	{
499	html("</div>");	499	html("</div>");
500	if (ctx.cfg.footer)	500	if (ctx.cfg.footer)
501	html_include(ctx.cfg.footer);	501	html_include(ctx.cfg.footer);
502	else {	502	else {
503	htmlf("<div class='footer'>generated by cgit %s at ",	503	htmlf("<div class='footer'>generated by cgit %s at ",
504	cgit_version);	504	cgit_version);
505	cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);	505	cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
506	html("</div>\n");	506	html("</div>\n");
507	}	507	}
508	html("</body>\n</html>\n");	508	html("</body>\n</html>\n");
509	}	509	}
510		510
511	int print_branch_option(const char refname, const unsigned char sha1,	511	int print_branch_option(const char refname, const unsigned char sha1,
512	int flags, void *cb_data)	512	int flags, void *cb_data)
513	{	513	{
514	char name = (char )refname;	514	char name = (char )refname;
515	html_option(name, name, ctx.qry.head);	515	html_option(name, name, ctx.qry.head);
516	return 0;	516	return 0;
517	}	517	}
518		518
519	int print_archive_ref(const char refname, const unsigned char sha1,	519	int print_archive_ref(const char refname, const unsigned char sha1,
520	int flags, void *cb_data)	520	int flags, void *cb_data)
521	{	521	{
522	struct tag *tag;	522	struct tag *tag;
523	struct taginfo *info;	523	struct taginfo *info;
524	struct object *obj;	524	struct object *obj;
525	char buf[256], *url;	525	char buf[256], *url;
526	unsigned char fileid[20];	526	unsigned char fileid[20];
527	int header = (int )cb_data;	527	int header = (int )cb_data;
528		528
529	if (prefixcmp(refname, "refs/archives"))	529	if (prefixcmp(refname, "refs/archives"))
530	return 0;	530	return 0;
531	strncpy(buf, refname+14, sizeof(buf));	531	strncpy(buf, refname+14, sizeof(buf));
532	obj = parse_object(sha1);	532	obj = parse_object(sha1);
533	if (!obj)	533	if (!obj)
534	return 1;	534	return 1;
535	if (obj->type == OBJ_TAG) {	535	if (obj->type == OBJ_TAG) {
536	tag = lookup_tag(sha1);	536	tag = lookup_tag(sha1);
537	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))	537	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))
538	return 0;	538	return 0;
539	hashcpy(fileid, tag->tagged->sha1);	539	hashcpy(fileid, tag->tagged->sha1);
540	} else if (obj->type != OBJ_BLOB) {	540	} else if (obj->type != OBJ_BLOB) {
541	return 0;	541	return 0;
542	} else {	542	} else {
543	hashcpy(fileid, sha1);	543	hashcpy(fileid, sha1);
544	}	544	}
545	if (!*header) {	545	if (!*header) {
546	html("<h1>download</h1>\n");	546	html("<h1>download</h1>\n");
547	*header = 1;	547	*header = 1;
548	}	548	}
549	url = cgit_pageurl(ctx.qry.repo, "blob",	549	url = cgit_pageurl(ctx.qry.repo, "blob",
550	fmt("id=%s&path=%s", sha1_to_hex(fileid),	550	fmt("id=%s&path=%s", sha1_to_hex(fileid),
551	buf));	551	buf));
552	html_link_open(url, NULL, "menu");	552	html_link_open(url, NULL, "menu");
553	html_txt(strlpart(buf, 20));	553	html_txt(strlpart(buf, 20));
554	html_link_close();	554	html_link_close();
555	return 0;	555	return 0;
556	}	556	}
557		557
558	void add_hidden_formfields(int incl_head, int incl_search, char *page)	558	void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
559	{	559	{
560	char *url;	560	char *url;
561		561
562	if (!ctx.cfg.virtual_root) {	562	if (!ctx.cfg.virtual_root) {
563	url = fmt("%s/%s", ctx.qry.repo, page);	563	url = fmt("%s/%s", ctx.qry.repo, page);
564	if (ctx.qry.path)	564	if (ctx.qry.path)
565	url = fmt("%s/%s", url, ctx.qry.path);	565	url = fmt("%s/%s", url, ctx.qry.path);
566	html_hidden("url", url);	566	html_hidden("url", url);
567	}	567	}
568		568
569	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&	569	if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
570	strcmp(ctx.qry.head, ctx.repo->defbranch))	570	strcmp(ctx.qry.head, ctx.repo->defbranch))
571	html_hidden("h", ctx.qry.head);	571	html_hidden("h", ctx.qry.head);
572		572
573	if (ctx.qry.sha1)	573	if (ctx.qry.sha1)
574	html_hidden("id", ctx.qry.sha1);	574	html_hidden("id", ctx.qry.sha1);
575	if (ctx.qry.sha2)	575	if (ctx.qry.sha2)
576	html_hidden("id2", ctx.qry.sha2);	576	html_hidden("id2", ctx.qry.sha2);
577		577
578	if (incl_search) {	578	if (incl_search) {
579	if (ctx.qry.grep)	579	if (ctx.qry.grep)
580	html_hidden("qt", ctx.qry.grep);	580	html_hidden("qt", ctx.qry.grep);
581	if (ctx.qry.search)	581	if (ctx.qry.search)
582	html_hidden("q", ctx.qry.search);	582	html_hidden("q", ctx.qry.search);
583	}	583	}
584	}	584	}
585		585
586	char hc(struct cgit_cmd cmd, const char *page)	586	char hc(struct cgit_cmd cmd, const char *page)
587	{	587	{
588	return (strcmp(cmd->name, page) ? NULL : "active");	588	return (strcmp(cmd->name, page) ? NULL : "active");
589	}	589	}
590		590
591	void cgit_print_pageheader(struct cgit_context *ctx)	591	void cgit_print_pageheader(struct cgit_context *ctx)
592	{	592	{
593	struct cgit_cmd *cmd = cgit_get_cmd(ctx);	593	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
594		594
595	html("<table id='header'>\n");	595	html("<table id='header'>\n");
596	html("<tr>\n");	596	html("<tr>\n");
597	html("<td class='logo' rowspan='2'><a href='");	597	html("<td class='logo' rowspan='2'><a href='");
598	if (ctx->cfg.logo_link)	598	if (ctx->cfg.logo_link)
599	html_attr(ctx->cfg.logo_link);	599	html_attr(ctx->cfg.logo_link);
600	else	600	else
601	html_attr(cgit_rooturl());	601	html_attr(cgit_rooturl());
602	html("'><img src='");	602	html("'><img src='");
603	html_attr(ctx->cfg.logo);	603	html_attr(ctx->cfg.logo);
604	html("' alt='cgit logo'/></a></td>\n");	604	html("' alt='cgit logo'/></a></td>\n");
605		605
606	html("<td class='main'>");	606	html("<td class='main'>");
607	if (ctx->repo) {	607	if (ctx->repo) {
608	cgit_index_link("index", NULL, NULL, NULL, 0);	608	cgit_index_link("index", NULL, NULL, NULL, 0);
609	html(" : ");	609	html(" : ");
610	cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);	610	cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
611	html("</td><td class='form'>");	611	html("</td><td class='form'>");
612	html("<form method='get' action=''>\n");	612	html("<form method='get' action=''>\n");
613	add_hidden_formfields(0, 1, ctx->qry.page);	613	cgit_add_hidden_formfields(0, 1, ctx->qry.page);
614	html("<select name='h' onchange='this.form.submit();'>\n");	614	html("<select name='h' onchange='this.form.submit();'>\n");
615	for_each_branch_ref(print_branch_option, ctx->qry.head);	615	for_each_branch_ref(print_branch_option, ctx->qry.head);
616	html("</select> ");	616	html("</select> ");
617	html("<input type='submit' name='' value='switch'/>");	617	html("<input type='submit' name='' value='switch'/>");
618	html("</form>");	618	html("</form>");
619	} else	619	} else
620	html_txt(ctx->cfg.root_title);	620	html_txt(ctx->cfg.root_title);
621	html("</td></tr>\n");	621	html("</td></tr>\n");
622		622
623	html("<tr><td class='sub'>");	623	html("<tr><td class='sub'>");
624	if (ctx->repo) {	624	if (ctx->repo) {
625	html_txt(ctx->repo->desc);	625	html_txt(ctx->repo->desc);
626	html("</td><td class='sub right'>");	626	html("</td><td class='sub right'>");
627	html_txt(ctx->repo->owner);	627	html_txt(ctx->repo->owner);
628	} else {	628	} else {
629	if (ctx->cfg.root_desc)	629	if (ctx->cfg.root_desc)
630	html_txt(ctx->cfg.root_desc);	630	html_txt(ctx->cfg.root_desc);
631	else if (ctx->cfg.index_info)	631	else if (ctx->cfg.index_info)
632	html_include(ctx->cfg.index_info);	632	html_include(ctx->cfg.index_info);
633	}	633	}
634	html("</td></tr></table>\n");	634	html("</td></tr></table>\n");
635		635
636	html("<table class='tabs'><tr><td>\n");	636	html("<table class='tabs'><tr><td>\n");
637	if (ctx->repo) {	637	if (ctx->repo) {
638	cgit_summary_link("summary", NULL, hc(cmd, "summary"),	638	cgit_summary_link("summary", NULL, hc(cmd, "summary"),
639	ctx->qry.head);	639	ctx->qry.head);
640	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,	640	cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
641	ctx->qry.sha1, NULL);	641	ctx->qry.sha1, NULL);
642	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,	642	cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
643	NULL, NULL, 0, NULL, NULL);	643	NULL, NULL, 0, NULL, NULL);
644	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,	644	cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
645	ctx->qry.sha1, NULL);	645	ctx->qry.sha1, NULL);
646	cgit_commit_link("commit", NULL, hc(cmd, "commit"),	646	cgit_commit_link("commit", NULL, hc(cmd, "commit"),
647	ctx->qry.head, ctx->qry.sha1);	647	ctx->qry.head, ctx->qry.sha1);
648	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,	648	cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
649	ctx->qry.sha1, ctx->qry.sha2, NULL);	649	ctx->qry.sha1, ctx->qry.sha2, NULL);
650	if (ctx->repo->max_stats)	650	if (ctx->repo->max_stats)
651	cgit_stats_link("stats", NULL, hc(cmd, "stats"),	651	cgit_stats_link("stats", NULL, hc(cmd, "stats"),
652	ctx->qry.head, NULL);	652	ctx->qry.head, NULL);
653	if (ctx->repo->readme)	653	if (ctx->repo->readme)
654	reporevlink("about", "about", NULL,	654	reporevlink("about", "about", NULL,
655	hc(cmd, "about"), ctx->qry.head, NULL,	655	hc(cmd, "about"), ctx->qry.head, NULL,
656	NULL);	656	NULL);
657	html("</td><td class='form'>");	657	html("</td><td class='form'>");
658	html("<form class='right' method='get' action='");	658	html("<form class='right' method='get' action='");
659	if (ctx->cfg.virtual_root)	659	if (ctx->cfg.virtual_root)
660	html_url_path(cgit_fileurl(ctx->qry.repo, "log",	660	html_url_path(cgit_fileurl(ctx->qry.repo, "log",
661	ctx->qry.path, NULL));	661	ctx->qry.path, NULL));
662	html("'>\n");	662	html("'>\n");
663	add_hidden_formfields(1, 0, "log");	663	cgit_add_hidden_formfields(1, 0, "log");
664	html("<select name='qt'>\n");	664	html("<select name='qt'>\n");
665	html_option("grep", "log msg", ctx->qry.grep);	665	html_option("grep", "log msg", ctx->qry.grep);
666	html_option("author", "author", ctx->qry.grep);	666	html_option("author", "author", ctx->qry.grep);
667	html_option("committer", "committer", ctx->qry.grep);	667	html_option("committer", "committer", ctx->qry.grep);
668	html("</select>\n");	668	html("</select>\n");
669	html("<input class='txt' type='text' size='10' name='q' value='");	669	html("<input class='txt' type='text' size='10' name='q' value='");
670	html_attr(ctx->qry.search);	670	html_attr(ctx->qry.search);
671	html("'/>\n");	671	html("'/>\n");
672	html("<input type='submit' value='search'/>\n");	672	html("<input type='submit' value='search'/>\n");
673	html("</form>\n");	673	html("</form>\n");
674	} else {	674	} else {
675	site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);	675	site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
676	if (ctx->cfg.root_readme)	676	if (ctx->cfg.root_readme)
677	site_link("about", "about", NULL, hc(cmd, "about"),	677	site_link("about", "about", NULL, hc(cmd, "about"),
678	NULL, 0);	678	NULL, 0);
679	html("</td><td class='form'>");	679	html("</td><td class='form'>");
680	html("<form method='get' action='");	680	html("<form method='get' action='");
681	html_attr(cgit_rooturl());	681	html_attr(cgit_rooturl());
682	html("'>\n");	682	html("'>\n");
683	html("<input type='text' name='q' size='10' value='");	683	html("<input type='text' name='q' size='10' value='");
684	html_attr(ctx->qry.search);	684	html_attr(ctx->qry.search);
685	html("'/>\n");	685	html("'/>\n");
686	html("<input type='submit' value='search'/>\n");	686	html("<input type='submit' value='search'/>\n");
687	html("</form>");	687	html("</form>");
688	}	688	}
689	html("</td></tr></table>\n");	689	html("</td></tr></table>\n");
690	html("<div class='content'>");	690	html("<div class='content'>");
691	}	691	}
692		692
693	void cgit_print_filemode(unsigned short mode)	693	void cgit_print_filemode(unsigned short mode)
694	{	694	{
695	if (S_ISDIR(mode))	695	if (S_ISDIR(mode))
696	html("d");	696	html("d");
697	else if (S_ISLNK(mode))	697	else if (S_ISLNK(mode))
698	html("l");	698	html("l");
699	else if (S_ISGITLINK(mode))	699	else if (S_ISGITLINK(mode))
700	html("m");	700	html("m");
701	else	701	else
702	html("-");	702	html("-");
703	html_fileperm(mode >> 6);	703	html_fileperm(mode >> 6);
704	html_fileperm(mode >> 3);	704	html_fileperm(mode >> 3);
705	html_fileperm(mode);	705	html_fileperm(mode);
706	}	706	}
707		707
708	void cgit_print_snapshot_links(const char repo, const char head,	708	void cgit_print_snapshot_links(const char repo, const char head,
709	const char *hex, int snapshots)	709	const char *hex, int snapshots)
710	{	710	{
711	const struct cgit_snapshot_format* f;	711	const struct cgit_snapshot_format* f;
712	char *filename;	712	char *filename;
713		713
714	for (f = cgit_snapshot_formats; f->suffix; f++) {	714	for (f = cgit_snapshot_formats; f->suffix; f++) {
715	if (!(snapshots & f->bit))	715	if (!(snapshots & f->bit))
716	continue;	716	continue;
717	filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,	717	filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
718	f->suffix);	718	f->suffix);
719	cgit_snapshot_link(filename, NULL, NULL, (char *)head,	719	cgit_snapshot_link(filename, NULL, NULL, (char *)head,
720	(char *)hex, filename);	720	(char *)hex, filename);
721	html("<br/>");	721	html("<br/>");
722	}	722	}
723	}	723	}


diff --git a/ui-shared.h b/ui-shared.h index e3fae64..1524dc3 100644 --- a/ui-shared.h +++ b/ui-shared.h
@@ -1,48 +1,49 @@
1	#ifndef UI_SHARED_H	1	#ifndef UI_SHARED_H
2	#define UI_SHARED_H	2	#define UI_SHARED_H
3		3
4	extern char *cgit_hosturl();	4	extern char *cgit_hosturl();
5	extern char cgit_repourl(const char reponame);	5	extern char cgit_repourl(const char reponame);
6	extern char cgit_fileurl(const char reponame, const char *pagename,	6	extern char cgit_fileurl(const char reponame, const char *pagename,
7	const char filename, const char query);	7	const char filename, const char query);
8	extern char cgit_pageurl(const char reponame, const char *pagename,	8	extern char cgit_pageurl(const char reponame, const char *pagename,
9	const char *query);	9	const char *query);
10		10
11	extern void cgit_index_link(char name, char title, char *class,	11	extern void cgit_index_link(char name, char title, char *class,
12	char *pattern, int ofs);	12	char *pattern, int ofs);
13	extern void cgit_summary_link(char name, char title, char class, char head);	13	extern void cgit_summary_link(char name, char title, char class, char head);
14	extern void cgit_tag_link(char name, char title, char class, char head,	14	extern void cgit_tag_link(char name, char title, char class, char head,
15	char *rev);	15	char *rev);
16	extern void cgit_tree_link(char name, char title, char class, char head,	16	extern void cgit_tree_link(char name, char title, char class, char head,
17	char rev, char path);	17	char rev, char path);
18	extern void cgit_plain_link(char name, char title, char class, char head,	18	extern void cgit_plain_link(char name, char title, char class, char head,
19	char rev, char path);	19	char rev, char path);
20	extern void cgit_log_link(char name, char title, char class, char head,	20	extern void cgit_log_link(char name, char title, char class, char head,
21	char rev, char path, int ofs, char *grep,	21	char rev, char path, int ofs, char *grep,
22	char *pattern);	22	char *pattern);
23	extern void cgit_commit_link(char name, char title, char class, char head,	23	extern void cgit_commit_link(char name, char title, char class, char head,
24	char *rev);	24	char *rev);
25	extern void cgit_patch_link(char name, char title, char class, char head,	25	extern void cgit_patch_link(char name, char title, char class, char head,
26	char *rev);	26	char *rev);
27	extern void cgit_refs_link(char name, char title, char class, char head,	27	extern void cgit_refs_link(char name, char title, char class, char head,
28	char rev, char path);	28	char rev, char path);
29	extern void cgit_snapshot_link(char name, char title, char *class,	29	extern void cgit_snapshot_link(char name, char title, char *class,
30	char head, char rev, char *archivename);	30	char head, char rev, char *archivename);
31	extern void cgit_diff_link(char name, char title, char class, char head,	31	extern void cgit_diff_link(char name, char title, char class, char head,
32	char new_rev, char old_rev, char *path);	32	char new_rev, char old_rev, char *path);
33	extern void cgit_stats_link(char name, char title, char class, char head,	33	extern void cgit_stats_link(char name, char title, char class, char head,
34	char *path);	34	char *path);
35	extern void cgit_object_link(struct object *obj);	35	extern void cgit_object_link(struct object *obj);
36		36
37	extern void cgit_print_error(char *msg);	37	extern void cgit_print_error(char *msg);
38	extern void cgit_print_date(time_t secs, char *format, int local_time);	38	extern void cgit_print_date(time_t secs, char *format, int local_time);
39	extern void cgit_print_age(time_t t, time_t max_relative, char *format);	39	extern void cgit_print_age(time_t t, time_t max_relative, char *format);
40	extern void cgit_print_http_headers(struct cgit_context *ctx);	40	extern void cgit_print_http_headers(struct cgit_context *ctx);
41	extern void cgit_print_docstart(struct cgit_context *ctx);	41	extern void cgit_print_docstart(struct cgit_context *ctx);
42	extern void cgit_print_docend();	42	extern void cgit_print_docend();
43	extern void cgit_print_pageheader(struct cgit_context *ctx);	43	extern void cgit_print_pageheader(struct cgit_context *ctx);
44	extern void cgit_print_filemode(unsigned short mode);	44	extern void cgit_print_filemode(unsigned short mode);
45	extern void cgit_print_snapshot_links(const char repo, const char head,	45	extern void cgit_print_snapshot_links(const char repo, const char head,
46	const char *hex, int snapshots);	46	const char *hex, int snapshots);
47		47	extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
		48	char *page);
48	#endif /* UI_SHARED_H */	49	#endif /* UI_SHARED_H */