Merge branch 'index-header' * index-header: Teach cgit howto include an external file on index page. Add html_include()
Lars Hjemli hjemli@gmail.com
Sun, 20 May 2007 14:33:59 +0200
4 files changed,
24 insertions(+),
0 deletions(-)
M
cgit.h
→
cgit.h
@@ -75,6 +75,7 @@
extern char *cgit_root_title; extern char *cgit_css; extern char *cgit_logo; +extern char *cgit_index_header; extern char *cgit_logo_link; extern char *cgit_module_link; extern char *cgit_virtual_root;@@ -144,6 +145,7 @@ extern void html_hidden(char *name, char *value);
extern void html_link_open(char *url, char *title, char *class); extern void html_link_close(void); extern void html_filemode(unsigned short mode); +extern int html_include(const char *filename); extern int cgit_read_config(const char *filename, configfn fn); extern int cgit_parse_query(char *txt, configfn fn);
M
html.c
→
html.c
@@ -166,3 +166,17 @@ html_fileperm(mode >> 6);
html_fileperm(mode >> 3); html_fileperm(mode); } + +int html_include(const char *filename) +{ + FILE *f; + char buf[4096]; + size_t len; + + if (!(f = fopen(filename, "r"))) + return -1; + while((len = fread(buf, 1, 4096, f)) > 0) + write(htmlfd, buf, len); + fclose(f); + return 0; +}
M
ui-repolist.c
→
ui-repolist.c
@@ -17,6 +17,11 @@ cgit_print_docstart(cgit_root_title, item);
cgit_print_pageheader(cgit_root_title, 0); html("<table class='list nowrap'>"); + if (cgit_index_header) { + html("<tr class='nohover'><td colspan='4' class='include-block'>"); + html_include(cgit_index_header); + html("</td></tr>"); + } html("<tr class='nohover'>" "<th class='left'>Name</th>" "<th class='left'>Description</th>"