-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgit.css | 5 | ||||
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | html.c | 10 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 28 |
7 files changed, 51 insertions, 5 deletions
@@ -13,22 +13,22 @@ const char cgit_version[] = CGIT_VERSION; | |||
13 | static void cgit_print_repo_page(struct cacheitem *item) | 13 | static void cgit_print_repo_page(struct cacheitem *item) |
14 | { | 14 | { |
15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || | 15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { | 16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
18 | cgit_print_docstart(title, item); | 18 | cgit_print_docstart(title, item); |
19 | cgit_print_pageheader(title); | 19 | cgit_print_pageheader(title, 0); |
20 | cgit_print_error(fmt("Unable to scan repository: %s", | 20 | cgit_print_error(fmt("Unable to scan repository: %s", |
21 | strerror(errno))); | 21 | strerror(errno))); |
22 | cgit_print_docend(); | 22 | cgit_print_docend(); |
23 | return; | 23 | return; |
24 | } | 24 | } |
25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); | 25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); | 26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
27 | cgit_print_docstart(title, item); | 27 | cgit_print_docstart(title, item); |
28 | cgit_print_pageheader(title); | 28 | cgit_print_pageheader(title, 0); |
29 | if (!cgit_query_page) { | 29 | if (!cgit_query_page) { |
30 | cgit_print_summary(); | 30 | cgit_print_summary(); |
31 | } else if (!strcmp(cgit_query_page, "log")) { | 31 | } else if (!strcmp(cgit_query_page, "log")) { |
32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); | 32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); |
33 | } else if (!strcmp(cgit_query_page, "tree")) { | 33 | } else if (!strcmp(cgit_query_page, "tree")) { |
34 | cgit_print_tree(cgit_query_sha1); | 34 | cgit_print_tree(cgit_query_sha1); |
@@ -58,12 +58,17 @@ div#header { | |||
58 | vertical-align: middle; | 58 | vertical-align: middle; |
59 | margin-bottom: 2em; | 59 | margin-bottom: 2em; |
60 | } | 60 | } |
61 | div#header img#logo { | 61 | div#header img#logo { |
62 | float: right; | 62 | float: right; |
63 | } | 63 | } |
64 | |||
65 | div#header input { | ||
66 | float: right; | ||
67 | margin: 0.25em 1em; | ||
68 | } | ||
64 | div#header a { | 69 | div#header a { |
65 | color: black; | 70 | color: black; |
66 | } | 71 | } |
67 | 72 | ||
68 | div#content { | 73 | div#content { |
69 | margin: 0.5em 0.5em; | 74 | margin: 0.5em 0.5em; |
@@ -52,12 +52,13 @@ extern char *cgit_repo_owner; | |||
52 | extern int cgit_query_has_symref; | 52 | extern int cgit_query_has_symref; |
53 | extern int cgit_query_has_sha1; | 53 | extern int cgit_query_has_sha1; |
54 | 54 | ||
55 | extern char *cgit_querystring; | 55 | extern char *cgit_querystring; |
56 | extern char *cgit_query_repo; | 56 | extern char *cgit_query_repo; |
57 | extern char *cgit_query_page; | 57 | extern char *cgit_query_page; |
58 | extern char *cgit_query_search; | ||
58 | extern char *cgit_query_head; | 59 | extern char *cgit_query_head; |
59 | extern char *cgit_query_sha1; | 60 | extern char *cgit_query_sha1; |
60 | extern char *cgit_query_sha2; | 61 | extern char *cgit_query_sha2; |
61 | extern int cgit_query_ofs; | 62 | extern int cgit_query_ofs; |
62 | 63 | ||
63 | extern int htmlfd; | 64 | extern int htmlfd; |
@@ -72,12 +73,13 @@ extern char *fmt(const char *format,...); | |||
72 | 73 | ||
73 | extern void html(const char *txt); | 74 | extern void html(const char *txt); |
74 | extern void htmlf(const char *format,...); | 75 | extern void htmlf(const char *format,...); |
75 | extern void html_txt(char *txt); | 76 | extern void html_txt(char *txt); |
76 | extern void html_ntxt(int len, char *txt); | 77 | extern void html_ntxt(int len, char *txt); |
77 | extern void html_attr(char *txt); | 78 | extern void html_attr(char *txt); |
79 | extern void html_hidden(char *name, char *value); | ||
78 | extern void html_link_open(char *url, char *title, char *class); | 80 | extern void html_link_open(char *url, char *title, char *class); |
79 | extern void html_link_close(void); | 81 | extern void html_link_close(void); |
80 | extern void html_filemode(unsigned short mode); | 82 | extern void html_filemode(unsigned short mode); |
81 | 83 | ||
82 | extern int cgit_read_config(const char *filename, configfn fn); | 84 | extern int cgit_read_config(const char *filename, configfn fn); |
83 | extern int cgit_parse_query(char *txt, configfn fn); | 85 | extern int cgit_parse_query(char *txt, configfn fn); |
@@ -95,13 +97,13 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename, | |||
95 | const char *query); | 97 | const char *query); |
96 | 98 | ||
97 | extern void cgit_print_error(char *msg); | 99 | extern void cgit_print_error(char *msg); |
98 | extern void cgit_print_date(unsigned long secs); | 100 | extern void cgit_print_date(unsigned long secs); |
99 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 101 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
100 | extern void cgit_print_docend(); | 102 | extern void cgit_print_docend(); |
101 | extern void cgit_print_pageheader(char *title); | 103 | extern void cgit_print_pageheader(char *title, int show_search); |
102 | 104 | ||
103 | extern void cgit_print_repolist(struct cacheitem *item); | 105 | extern void cgit_print_repolist(struct cacheitem *item); |
104 | extern void cgit_print_summary(); | 106 | extern void cgit_print_summary(); |
105 | extern void cgit_print_log(const char *tip, int ofs, int cnt); | 107 | extern void cgit_print_log(const char *tip, int ofs, int cnt); |
106 | extern void cgit_print_view(const char *hex); | 108 | extern void cgit_print_view(const char *hex); |
107 | extern void cgit_print_tree(const char *hex); | 109 | extern void cgit_print_tree(const char *hex); |
@@ -114,12 +114,21 @@ void html_attr(char *txt) | |||
114 | t++; | 114 | t++; |
115 | } | 115 | } |
116 | if (t!=txt) | 116 | if (t!=txt) |
117 | html(txt); | 117 | html(txt); |
118 | } | 118 | } |
119 | 119 | ||
120 | void html_hidden(char *name, char *value) | ||
121 | { | ||
122 | html("<input type='hidden' name='"); | ||
123 | html_attr(name); | ||
124 | html("' value='"); | ||
125 | html_attr(value); | ||
126 | html("'/>"); | ||
127 | } | ||
128 | |||
120 | void html_link_open(char *url, char *title, char *class) | 129 | void html_link_open(char *url, char *title, char *class) |
121 | { | 130 | { |
122 | html("<a href='"); | 131 | html("<a href='"); |
123 | html_attr(url); | 132 | html_attr(url); |
124 | if (title) { | 133 | if (title) { |
125 | html("' title='"); | 134 | html("' title='"); |
@@ -152,6 +161,7 @@ void html_filemode(unsigned short mode) | |||
152 | else | 161 | else |
153 | html("-"); | 162 | html("-"); |
154 | html_fileperm(mode >> 6); | 163 | html_fileperm(mode >> 6); |
155 | html_fileperm(mode >> 3); | 164 | html_fileperm(mode >> 3); |
156 | html_fileperm(mode); | 165 | html_fileperm(mode); |
157 | } | 166 | } |
167 | |||
@@ -33,12 +33,13 @@ int cgit_query_has_symref = 0; | |||
33 | int cgit_query_has_sha1 = 0; | 33 | int cgit_query_has_sha1 = 0; |
34 | 34 | ||
35 | char *cgit_querystring = NULL; | 35 | char *cgit_querystring = NULL; |
36 | char *cgit_query_repo = NULL; | 36 | char *cgit_query_repo = NULL; |
37 | char *cgit_query_page = NULL; | 37 | char *cgit_query_page = NULL; |
38 | char *cgit_query_head = NULL; | 38 | char *cgit_query_head = NULL; |
39 | char *cgit_query_search = NULL; | ||
39 | char *cgit_query_sha1 = NULL; | 40 | char *cgit_query_sha1 = NULL; |
40 | char *cgit_query_sha2 = NULL; | 41 | char *cgit_query_sha2 = NULL; |
41 | int cgit_query_ofs = 0; | 42 | int cgit_query_ofs = 0; |
42 | 43 | ||
43 | int htmlfd = 0; | 44 | int htmlfd = 0; |
44 | 45 | ||
@@ -83,12 +84,14 @@ void cgit_repo_config_cb(const char *name, const char *value) | |||
83 | void cgit_querystring_cb(const char *name, const char *value) | 84 | void cgit_querystring_cb(const char *name, const char *value) |
84 | { | 85 | { |
85 | if (!strcmp(name,"r")) { | 86 | if (!strcmp(name,"r")) { |
86 | cgit_query_repo = xstrdup(value); | 87 | cgit_query_repo = xstrdup(value); |
87 | } else if (!strcmp(name, "p")) { | 88 | } else if (!strcmp(name, "p")) { |
88 | cgit_query_page = xstrdup(value); | 89 | cgit_query_page = xstrdup(value); |
90 | } else if (!strcmp(name, "q")) { | ||
91 | cgit_query_search = xstrdup(value); | ||
89 | } else if (!strcmp(name, "h")) { | 92 | } else if (!strcmp(name, "h")) { |
90 | cgit_query_head = xstrdup(value); | 93 | cgit_query_head = xstrdup(value); |
91 | cgit_query_has_symref = 1; | 94 | cgit_query_has_symref = 1; |
92 | } else if (!strcmp(name, "id")) { | 95 | } else if (!strcmp(name, "id")) { |
93 | cgit_query_sha1 = xstrdup(value); | 96 | cgit_query_sha1 = xstrdup(value); |
94 | cgit_query_has_sha1 = 1; | 97 | cgit_query_has_sha1 = 1; |
diff --git a/ui-repolist.c b/ui-repolist.c index 7090c12..9f12b18 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -14,13 +14,13 @@ void cgit_print_repolist(struct cacheitem *item) | |||
14 | struct dirent *de; | 14 | struct dirent *de; |
15 | struct stat st; | 15 | struct stat st; |
16 | char *name; | 16 | char *name; |
17 | 17 | ||
18 | chdir(cgit_root); | 18 | chdir(cgit_root); |
19 | cgit_print_docstart(cgit_root_title, item); | 19 | cgit_print_docstart(cgit_root_title, item); |
20 | cgit_print_pageheader(cgit_root_title); | 20 | cgit_print_pageheader(cgit_root_title, 0); |
21 | 21 | ||
22 | if (!(d = opendir("."))) { | 22 | if (!(d = opendir("."))) { |
23 | cgit_print_error(fmt("Unable to scan repository directory: %s", | 23 | cgit_print_error(fmt("Unable to scan repository directory: %s", |
24 | strerror(errno))); | 24 | strerror(errno))); |
25 | cgit_print_docend(); | 25 | cgit_print_docend(); |
26 | return; | 26 | return; |
diff --git a/ui-shared.c b/ui-shared.c index 9ec4be8..b9c1243 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -57,12 +57,24 @@ char *cgit_pageurl(const char *reponame, const char *pagename, | |||
57 | pagename, query); | 57 | pagename, query); |
58 | } else { | 58 | } else { |
59 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); | 59 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); |
60 | } | 60 | } |
61 | } | 61 | } |
62 | 62 | ||
63 | char *cgit_currurl() | ||
64 | { | ||
65 | if (!cgit_virtual_root) | ||
66 | return "./cgit.cgi"; | ||
67 | else if (cgit_query_page) | ||
68 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); | ||
69 | else if (cgit_query_repo) | ||
70 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); | ||
71 | else | ||
72 | return fmt("%s/", cgit_virtual_root); | ||
73 | } | ||
74 | |||
63 | 75 | ||
64 | void cgit_print_date(unsigned long secs) | 76 | void cgit_print_date(unsigned long secs) |
65 | { | 77 | { |
66 | char buf[32]; | 78 | char buf[32]; |
67 | struct tm *time; | 79 | struct tm *time; |
68 | 80 | ||
@@ -95,18 +107,32 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
95 | 107 | ||
96 | void cgit_print_docend() | 108 | void cgit_print_docend() |
97 | { | 109 | { |
98 | html("</body>\n</html>\n"); | 110 | html("</body>\n</html>\n"); |
99 | } | 111 | } |
100 | 112 | ||
101 | void cgit_print_pageheader(char *title) | 113 | void cgit_print_pageheader(char *title, int show_search) |
102 | { | 114 | { |
103 | html("<div id='header'>"); | 115 | html("<div id='header'>"); |
104 | htmlf("<a href='%s'>", cgit_logo_link); | 116 | htmlf("<a href='%s'>", cgit_logo_link); |
105 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); | 117 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); |
106 | htmlf("</a>"); | 118 | htmlf("</a>"); |
119 | if (show_search) { | ||
120 | html("<form method='get' href='"); | ||
121 | html_attr(cgit_currurl()); | ||
122 | html("'>"); | ||
123 | if (cgit_query_head) | ||
124 | html_hidden("h", cgit_query_head); | ||
125 | if (cgit_query_sha1) | ||
126 | html_hidden("id", cgit_query_sha1); | ||
127 | if (cgit_query_sha2) | ||
128 | html_hidden("id2", cgit_query_sha2); | ||
129 | html("<input type='text' name='q' value='"); | ||
130 | html_attr(cgit_query_search); | ||
131 | html("'/></form>"); | ||
132 | } | ||
107 | if (cgit_query_repo) | 133 | if (cgit_query_repo) |
108 | htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo)); | 134 | htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo)); |
109 | html_txt(title); | 135 | html_txt(title); |
110 | if (cgit_query_repo) | 136 | if (cgit_query_repo) |
111 | html("</a>"); | 137 | html("</a>"); |
112 | html("</div>"); | 138 | html("</div>"); |