diff options
author | Lars Hjemli | 2007-05-20 14:33:59 +0200 |
---|---|---|
committer | Lars Hjemli | 2007-05-20 14:33:59 +0200 |
commit | 977a0b173df6fe1a4d362fe4c70f9badff1fd46c (patch) | |
tree | 8bd383fff396bb1790c03ab5b461d899af997568 | |
parent | d4dbfdfbaea3aa93e824ea484787de10e73eae65 (diff) | |
parent | de69ce020c4ccd7146d6ac72bbd8f417088e8c03 (diff) | |
download | cgit-977a0b173df6fe1a4d362fe4c70f9badff1fd46c.tar.gz cgit-977a0b173df6fe1a4d362fe4c70f9badff1fd46c.tar.bz2 cgit-977a0b173df6fe1a4d362fe4c70f9badff1fd46c.zip |
Merge branch 'index-header'
* index-header:
Teach cgit howto include an external file on index page.
Add html_include()
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | html.c | 14 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 5 |
4 files changed, 24 insertions, 0 deletions
@@ -75,6 +75,7 @@ extern struct repoinfo *cgit_repo; | |||
75 | extern char *cgit_root_title; | 75 | extern char *cgit_root_title; |
76 | extern char *cgit_css; | 76 | extern char *cgit_css; |
77 | extern char *cgit_logo; | 77 | extern char *cgit_logo; |
78 | extern char *cgit_index_header; | ||
78 | extern char *cgit_logo_link; | 79 | extern char *cgit_logo_link; |
79 | extern char *cgit_module_link; | 80 | extern char *cgit_module_link; |
80 | extern char *cgit_virtual_root; | 81 | extern char *cgit_virtual_root; |
@@ -144,6 +145,7 @@ extern void html_hidden(char *name, char *value); | |||
144 | extern void html_link_open(char *url, char *title, char *class); | 145 | extern void html_link_open(char *url, char *title, char *class); |
145 | extern void html_link_close(void); | 146 | extern void html_link_close(void); |
146 | extern void html_filemode(unsigned short mode); | 147 | extern void html_filemode(unsigned short mode); |
148 | extern int html_include(const char *filename); | ||
147 | 149 | ||
148 | extern int cgit_read_config(const char *filename, configfn fn); | 150 | extern int cgit_read_config(const char *filename, configfn fn); |
149 | extern int cgit_parse_query(char *txt, configfn fn); | 151 | extern int cgit_parse_query(char *txt, configfn fn); |
@@ -166,3 +166,17 @@ void html_filemode(unsigned short mode) | |||
166 | html_fileperm(mode >> 3); | 166 | html_fileperm(mode >> 3); |
167 | html_fileperm(mode); | 167 | html_fileperm(mode); |
168 | } | 168 | } |
169 | |||
170 | int html_include(const char *filename) | ||
171 | { | ||
172 | FILE *f; | ||
173 | char buf[4096]; | ||
174 | size_t len; | ||
175 | |||
176 | if (!(f = fopen(filename, "r"))) | ||
177 | return -1; | ||
178 | while((len = fread(buf, 1, 4096, f)) > 0) | ||
179 | write(htmlfd, buf, len); | ||
180 | fclose(f); | ||
181 | return 0; | ||
182 | } | ||
@@ -14,6 +14,7 @@ struct repoinfo *cgit_repo; | |||
14 | char *cgit_root_title = "Git repository browser"; | 14 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; | 15 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; | 16 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_index_header = NULL; | ||
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 18 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 19 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; | 20 | char *cgit_virtual_root = NULL; |
@@ -101,6 +102,8 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
101 | cgit_css = xstrdup(value); | 102 | cgit_css = xstrdup(value); |
102 | else if (!strcmp(name, "logo")) | 103 | else if (!strcmp(name, "logo")) |
103 | cgit_logo = xstrdup(value); | 104 | cgit_logo = xstrdup(value); |
105 | else if (!strcmp(name, "index-header")) | ||
106 | cgit_index_header = xstrdup(value); | ||
104 | else if (!strcmp(name, "logo-link")) | 107 | else if (!strcmp(name, "logo-link")) |
105 | cgit_logo_link = xstrdup(value); | 108 | cgit_logo_link = xstrdup(value); |
106 | else if (!strcmp(name, "module-link")) | 109 | else if (!strcmp(name, "module-link")) |
diff --git a/ui-repolist.c b/ui-repolist.c index d7311e4..8e367a2 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -17,6 +17,11 @@ void cgit_print_repolist(struct cacheitem *item) | |||
17 | cgit_print_pageheader(cgit_root_title, 0); | 17 | cgit_print_pageheader(cgit_root_title, 0); |
18 | 18 | ||
19 | html("<table class='list nowrap'>"); | 19 | html("<table class='list nowrap'>"); |
20 | if (cgit_index_header) { | ||
21 | html("<tr class='nohover'><td colspan='4' class='include-block'>"); | ||
22 | html_include(cgit_index_header); | ||
23 | html("</td></tr>"); | ||
24 | } | ||
20 | html("<tr class='nohover'>" | 25 | html("<tr class='nohover'>" |
21 | "<th class='left'>Name</th>" | 26 | "<th class='left'>Name</th>" |
22 | "<th class='left'>Description</th>" | 27 | "<th class='left'>Description</th>" |