author | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 22:00:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 22:00:25 (UTC) |
commit | de69ce020c4ccd7146d6ac72bbd8f417088e8c03 (patch) (unidiff) | |
tree | 38abaae795c5465f8086ed325b4a6587de76268e | |
parent | 5e75128a8bee885d83563d8c521172328d511d12 (diff) | |
download | cgit-de69ce020c4ccd7146d6ac72bbd8f417088e8c03.zip cgit-de69ce020c4ccd7146d6ac72bbd8f417088e8c03.tar.gz cgit-de69ce020c4ccd7146d6ac72bbd8f417088e8c03.tar.bz2 |
Teach cgit howto include an external file on index page.
The new parameter index-header can be used to name an external file
which will be included verbatim at the top of the index page.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 5 |
3 files changed, 9 insertions, 0 deletions
@@ -54,48 +54,49 @@ struct commitinfo { | |||
54 | char *author_email; | 54 | char *author_email; |
55 | unsigned long author_date; | 55 | unsigned long author_date; |
56 | char *committer; | 56 | char *committer; |
57 | char *committer_email; | 57 | char *committer_email; |
58 | unsigned long committer_date; | 58 | unsigned long committer_date; |
59 | char *subject; | 59 | char *subject; |
60 | char *msg; | 60 | char *msg; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | struct taginfo { | 63 | struct taginfo { |
64 | char *tagger; | 64 | char *tagger; |
65 | char *tagger_email; | 65 | char *tagger_email; |
66 | int tagger_date; | 66 | int tagger_date; |
67 | char *msg; | 67 | char *msg; |
68 | }; | 68 | }; |
69 | 69 | ||
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; |
86 | extern int cgit_enable_log_filecount; | 87 | extern int cgit_enable_log_filecount; |
87 | extern int cgit_enable_log_linecount; | 88 | extern int cgit_enable_log_linecount; |
88 | extern int cgit_max_lock_attempts; | 89 | extern int cgit_max_lock_attempts; |
89 | extern int cgit_cache_root_ttl; | 90 | extern int cgit_cache_root_ttl; |
90 | extern int cgit_cache_repo_ttl; | 91 | extern int cgit_cache_repo_ttl; |
91 | extern int cgit_cache_dynamic_ttl; | 92 | extern int cgit_cache_dynamic_ttl; |
92 | extern int cgit_cache_static_ttl; | 93 | extern int cgit_cache_static_ttl; |
93 | extern int cgit_cache_max_create_time; | 94 | extern int cgit_cache_max_create_time; |
94 | 95 | ||
95 | extern int cgit_max_msg_len; | 96 | extern int cgit_max_msg_len; |
96 | extern int cgit_max_repodesc_len; | 97 | extern int cgit_max_repodesc_len; |
97 | extern int cgit_max_commit_count; | 98 | extern int cgit_max_commit_count; |
98 | 99 | ||
99 | extern int cgit_query_has_symref; | 100 | extern int cgit_query_has_symref; |
100 | extern int cgit_query_has_sha1; | 101 | extern int cgit_query_has_sha1; |
101 | 102 | ||
@@ -1,40 +1,41 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
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; |
25 | int cgit_enable_log_filecount = 0; | 26 | int cgit_enable_log_filecount = 0; |
26 | int cgit_enable_log_linecount = 0; | 27 | int cgit_enable_log_linecount = 0; |
27 | int cgit_max_lock_attempts = 5; | 28 | int cgit_max_lock_attempts = 5; |
28 | int cgit_cache_root_ttl = 5; | 29 | int cgit_cache_root_ttl = 5; |
29 | int cgit_cache_repo_ttl = 5; | 30 | int cgit_cache_repo_ttl = 5; |
30 | int cgit_cache_dynamic_ttl = 5; | 31 | int cgit_cache_dynamic_ttl = 5; |
31 | int cgit_cache_static_ttl = -1; | 32 | int cgit_cache_static_ttl = -1; |
32 | int cgit_cache_max_create_time = 5; | 33 | int cgit_cache_max_create_time = 5; |
33 | 34 | ||
34 | int cgit_max_msg_len = 60; | 35 | int cgit_max_msg_len = 60; |
35 | int cgit_max_repodesc_len = 60; | 36 | int cgit_max_repodesc_len = 60; |
36 | int cgit_max_commit_count = 50; | 37 | int cgit_max_commit_count = 50; |
37 | 38 | ||
38 | int cgit_query_has_symref = 0; | 39 | int cgit_query_has_symref = 0; |
39 | int cgit_query_has_sha1 = 0; | 40 | int cgit_query_has_sha1 = 0; |
40 | 41 | ||
@@ -80,48 +81,50 @@ struct repoinfo *add_repo(const char *url) | |||
80 | } | 81 | } |
81 | 82 | ||
82 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
83 | ret->url = xstrdup(url); | 84 | ret->url = xstrdup(url); |
84 | ret->name = ret->url; | 85 | ret->name = ret->url; |
85 | ret->path = NULL; | 86 | ret->path = NULL; |
86 | ret->desc = NULL; | 87 | ret->desc = NULL; |
87 | ret->owner = NULL; | 88 | ret->owner = NULL; |
88 | ret->defbranch = "master"; | 89 | ret->defbranch = "master"; |
89 | ret->snapshots = cgit_snapshots; | 90 | ret->snapshots = cgit_snapshots; |
90 | ret->enable_log_filecount = cgit_enable_log_filecount; | 91 | ret->enable_log_filecount = cgit_enable_log_filecount; |
91 | ret->enable_log_linecount = cgit_enable_log_linecount; | 92 | ret->enable_log_linecount = cgit_enable_log_linecount; |
92 | ret->module_link = cgit_module_link; | 93 | ret->module_link = cgit_module_link; |
93 | return ret; | 94 | return ret; |
94 | } | 95 | } |
95 | 96 | ||
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); |
112 | else if (!strcmp(name, "snapshots")) | 115 | else if (!strcmp(name, "snapshots")) |
113 | cgit_snapshots = atoi(value); | 116 | cgit_snapshots = atoi(value); |
114 | else if (!strcmp(name, "enable-log-filecount")) | 117 | else if (!strcmp(name, "enable-log-filecount")) |
115 | cgit_enable_log_filecount = atoi(value); | 118 | cgit_enable_log_filecount = atoi(value); |
116 | else if (!strcmp(name, "enable-log-linecount")) | 119 | else if (!strcmp(name, "enable-log-linecount")) |
117 | cgit_enable_log_linecount = atoi(value); | 120 | cgit_enable_log_linecount = atoi(value); |
118 | else if (!strcmp(name, "cache-root")) | 121 | else if (!strcmp(name, "cache-root")) |
119 | cgit_cache_root = xstrdup(value); | 122 | cgit_cache_root = xstrdup(value); |
120 | else if (!strcmp(name, "cache-root-ttl")) | 123 | else if (!strcmp(name, "cache-root-ttl")) |
121 | cgit_cache_root_ttl = atoi(value); | 124 | cgit_cache_root_ttl = atoi(value); |
122 | else if (!strcmp(name, "cache-repo-ttl")) | 125 | else if (!strcmp(name, "cache-repo-ttl")) |
123 | cgit_cache_repo_ttl = atoi(value); | 126 | cgit_cache_repo_ttl = atoi(value); |
124 | else if (!strcmp(name, "cache-static-ttl")) | 127 | else if (!strcmp(name, "cache-static-ttl")) |
125 | cgit_cache_static_ttl = atoi(value); | 128 | cgit_cache_static_ttl = atoi(value); |
126 | else if (!strcmp(name, "cache-dynamic-ttl")) | 129 | else if (!strcmp(name, "cache-dynamic-ttl")) |
127 | cgit_cache_dynamic_ttl = atoi(value); | 130 | cgit_cache_dynamic_ttl = atoi(value); |
diff --git a/ui-repolist.c b/ui-repolist.c index d7311e4..8e367a2 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -1,43 +1,48 @@ | |||
1 | /* ui-repolist.c: functions for generating the repolist page | 1 | /* ui-repolist.c: functions for generating the repolist page |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | void cgit_print_repolist(struct cacheitem *item) | 11 | 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]; |
28 | html("<tr><td>"); | 33 | html("<tr><td>"); |
29 | html_link_open(cgit_repourl(repo->url), NULL, NULL); | 34 | html_link_open(cgit_repourl(repo->url), NULL, NULL); |
30 | html_txt(repo->name); | 35 | html_txt(repo->name); |
31 | html_link_close(); | 36 | html_link_close(); |
32 | html("</td><td>"); | 37 | html("</td><td>"); |
33 | html_ntxt(cgit_max_repodesc_len, repo->desc); | 38 | html_ntxt(cgit_max_repodesc_len, repo->desc); |
34 | html("</td><td>"); | 39 | html("</td><td>"); |
35 | html_txt(repo->owner); | 40 | html_txt(repo->owner); |
36 | html("</td><td>"); | 41 | html("</td><td>"); |
37 | html_link_open(cgit_pageurl(repo->name, "commit", NULL), | 42 | html_link_open(cgit_pageurl(repo->name, "commit", NULL), |
38 | "Commit: display last commit", NULL); | 43 | "Commit: display last commit", NULL); |
39 | html("C</a> "); | 44 | html("C</a> "); |
40 | html_link_open(cgit_pageurl(repo->name, "diff", NULL), | 45 | html_link_open(cgit_pageurl(repo->name, "diff", NULL), |
41 | "Diff: see changes introduced by last commit", NULL); | 46 | "Diff: see changes introduced by last commit", NULL); |
42 | html("D</a> "); | 47 | html("D</a> "); |
43 | html_link_open(cgit_pageurl(repo->name, "log", NULL), | 48 | html_link_open(cgit_pageurl(repo->name, "log", NULL), |