author | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 12:33:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 12:33:59 (UTC) |
commit | 977a0b173df6fe1a4d362fe4c70f9badff1fd46c (patch) (unidiff) | |
tree | 8bd383fff396bb1790c03ab5b461d899af997568 | |
parent | d4dbfdfbaea3aa93e824ea484787de10e73eae65 (diff) | |
parent | de69ce020c4ccd7146d6ac72bbd8f417088e8c03 (diff) | |
download | cgit-977a0b173df6fe1a4d362fe4c70f9badff1fd46c.zip cgit-977a0b173df6fe1a4d362fe4c70f9badff1fd46c.tar.gz cgit-977a0b173df6fe1a4d362fe4c70f9badff1fd46c.tar.bz2 |
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
@@ -70,16 +70,17 @@ struct taginfo { | |||
70 | extern const char cgit_version[]; | 70 | extern const char cgit_version[]; |
71 | 71 | ||
72 | extern struct repolist cgit_repolist; | 72 | extern struct repolist cgit_repolist; |
73 | extern struct repoinfo *cgit_repo; | 73 | extern struct repoinfo *cgit_repo; |
74 | 74 | ||
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; |
81 | extern char *cgit_script_name; | 82 | extern char *cgit_script_name; |
82 | extern char *cgit_cache_root; | 83 | extern char *cgit_cache_root; |
83 | 84 | ||
84 | extern int cgit_nocache; | 85 | extern int cgit_nocache; |
85 | extern int cgit_snapshots; | 86 | extern int cgit_snapshots; |
@@ -139,16 +140,17 @@ extern void html(const char *txt); | |||
139 | extern void htmlf(const char *format,...); | 140 | extern void htmlf(const char *format,...); |
140 | extern void html_txt(char *txt); | 141 | extern void html_txt(char *txt); |
141 | extern void html_ntxt(int len, char *txt); | 142 | extern void html_ntxt(int len, char *txt); |
142 | extern void html_attr(char *txt); | 143 | extern void html_attr(char *txt); |
143 | extern void html_hidden(char *name, char *value); | 144 | 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); |
150 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 152 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
151 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 153 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
152 | 154 | ||
153 | extern char *cache_safe_filename(const char *unsafe); | 155 | extern char *cache_safe_filename(const char *unsafe); |
154 | extern int cache_lock(struct cacheitem *item); | 156 | extern int cache_lock(struct cacheitem *item); |
@@ -161,8 +161,22 @@ void html_filemode(unsigned short mode) | |||
161 | else if (S_ISDIRLNK(mode)) | 161 | else if (S_ISDIRLNK(mode)) |
162 | html("m"); | 162 | html("m"); |
163 | else | 163 | else |
164 | html("-"); | 164 | html("-"); |
165 | html_fileperm(mode >> 6); | 165 | html_fileperm(mode >> 6); |
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 | } | ||
@@ -9,16 +9,17 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | struct repolist cgit_repolist; | 11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | 13 | ||
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; |
20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 21 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 22 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 23 | ||
23 | int cgit_nocache = 0; | 24 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; | 25 | int cgit_snapshots = 0; |
@@ -96,16 +97,18 @@ struct repoinfo *add_repo(const char *url) | |||
96 | void cgit_global_config_cb(const char *name, const char *value) | 97 | void cgit_global_config_cb(const char *name, const char *value) |
97 | { | 98 | { |
98 | if (!strcmp(name, "root-title")) | 99 | if (!strcmp(name, "root-title")) |
99 | cgit_root_title = xstrdup(value); | 100 | cgit_root_title = xstrdup(value); |
100 | else if (!strcmp(name, "css")) | 101 | else if (!strcmp(name, "css")) |
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")) |
107 | cgit_module_link = xstrdup(value); | 110 | cgit_module_link = xstrdup(value); |
108 | else if (!strcmp(name, "virtual-root")) | 111 | else if (!strcmp(name, "virtual-root")) |
109 | cgit_virtual_root = xstrdup(value); | 112 | cgit_virtual_root = xstrdup(value); |
110 | else if (!strcmp(name, "nocache")) | 113 | else if (!strcmp(name, "nocache")) |
111 | cgit_nocache = atoi(value); | 114 | cgit_nocache = atoi(value); |
diff --git a/ui-repolist.c b/ui-repolist.c index d7311e4..8e367a2 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -12,16 +12,21 @@ void cgit_print_repolist(struct cacheitem *item) | |||
12 | { | 12 | { |
13 | struct repoinfo *repo; | 13 | struct repoinfo *repo; |
14 | int i; | 14 | int i; |
15 | 15 | ||
16 | cgit_print_docstart(cgit_root_title, item); | 16 | cgit_print_docstart(cgit_root_title, 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>" |
23 | "<th class='left'>Owner</th>" | 28 | "<th class='left'>Owner</th>" |
24 | "<th class='left'>Links</th></tr>\n"); | 29 | "<th class='left'>Links</th></tr>\n"); |
25 | 30 | ||
26 | for (i=0; i<cgit_repolist.count; i++) { | 31 | for (i=0; i<cgit_repolist.count; i++) { |
27 | repo = &cgit_repolist.repos[i]; | 32 | repo = &cgit_repolist.repos[i]; |