author | Lars Hjemli <hjemli@gmail.com> | 2007-05-08 21:52:56 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-08 21:52:56 (UTC) |
commit | 7250a154678477a1e8260efbc9810ec389754ef9 (patch) (unidiff) | |
tree | 519559a2f9238fc386b7715c55bc3e2326be8d54 | |
parent | 61c3ca978c586c673aec618cb94210657278dda8 (diff) | |
download | cgit-7250a154678477a1e8260efbc9810ec389754ef9.zip cgit-7250a154678477a1e8260efbc9810ec389754ef9.tar.gz cgit-7250a154678477a1e8260efbc9810ec389754ef9.tar.bz2 |
ui-view: show pathname if specified in querystring
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | ui-view.c | 11 |
3 files changed, 10 insertions, 5 deletions
@@ -106,13 +106,13 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
106 | cgit_query_search); | 106 | cgit_query_search); |
107 | } else if (!strcmp(cgit_query_page, "tree")) { | 107 | } else if (!strcmp(cgit_query_page, "tree")) { |
108 | cgit_print_tree(cgit_query_sha1, cgit_query_path); | 108 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
109 | } else if (!strcmp(cgit_query_page, "commit")) { | 109 | } else if (!strcmp(cgit_query_page, "commit")) { |
110 | cgit_print_commit(cgit_query_sha1); | 110 | cgit_print_commit(cgit_query_sha1); |
111 | } else if (!strcmp(cgit_query_page, "view")) { | 111 | } else if (!strcmp(cgit_query_page, "view")) { |
112 | cgit_print_view(cgit_query_sha1); | 112 | cgit_print_view(cgit_query_sha1, cgit_query_path); |
113 | } else if (!strcmp(cgit_query_page, "diff")) { | 113 | } else if (!strcmp(cgit_query_page, "diff")) { |
114 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); | 114 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); |
115 | } else { | 115 | } else { |
116 | cgit_print_error("Invalid request"); | 116 | cgit_print_error("Invalid request"); |
117 | } | 117 | } |
118 | cgit_print_docend(); | 118 | cgit_print_docend(); |
@@ -152,13 +152,13 @@ extern void cgit_print_snapshot_start(const char *mimetype, | |||
152 | const char *filename, | 152 | const char *filename, |
153 | struct cacheitem *item); | 153 | struct cacheitem *item); |
154 | 154 | ||
155 | extern void cgit_print_repolist(struct cacheitem *item); | 155 | extern void cgit_print_repolist(struct cacheitem *item); |
156 | extern void cgit_print_summary(); | 156 | extern void cgit_print_summary(); |
157 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep); | 157 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep); |
158 | extern void cgit_print_view(const char *hex); | 158 | extern void cgit_print_view(const char *hex, char *path); |
159 | extern void cgit_print_tree(const char *hex, char *path); | 159 | extern void cgit_print_tree(const char *hex, char *path); |
160 | extern void cgit_print_commit(const char *hex); | 160 | extern void cgit_print_commit(const char *hex); |
161 | extern void cgit_print_diff(const char *old_hex, const char *new_hex); | 161 | extern void cgit_print_diff(const char *old_hex, const char *new_hex); |
162 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 162 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
163 | const char *format, const char *prefix, | 163 | const char *format, const char *prefix, |
164 | const char *filename); | 164 | const char *filename); |
@@ -5,13 +5,13 @@ | |||
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_view(const char *hex) | 11 | void cgit_print_view(const char *hex, char *path) |
12 | { | 12 | { |
13 | unsigned char sha1[20]; | 13 | unsigned char sha1[20]; |
14 | enum object_type type; | 14 | enum object_type type; |
15 | unsigned char *buf; | 15 | unsigned char *buf; |
16 | unsigned long size; | 16 | unsigned long size; |
17 | 17 | ||
@@ -31,13 +31,18 @@ void cgit_print_view(const char *hex) | |||
31 | cgit_print_error(fmt("Error reading object %s", hex)); | 31 | cgit_print_error(fmt("Error reading object %s", hex)); |
32 | return; | 32 | return; |
33 | } | 33 | } |
34 | 34 | ||
35 | buf[size] = '\0'; | 35 | buf[size] = '\0'; |
36 | html("<table class='list'>\n"); | 36 | html("<table class='list'>\n"); |
37 | htmlf("<tr class='nohover'><th class='left'>%s %s, %li bytes</th></tr>\n", | 37 | html("<tr class='nohover'><th class='left'>"); |
38 | typename(type), hex, size); | 38 | if (path) |
39 | htmlf("%s (", path); | ||
40 | htmlf("%s %s, %li bytes", typename(type), hex, size); | ||
41 | if (path) | ||
42 | html(")"); | ||
43 | html("</th></tr>\n"); | ||
39 | html("<tr><td class='blob'>\n"); | 44 | html("<tr><td class='blob'>\n"); |
40 | html_txt(buf); | 45 | html_txt(buf); |
41 | html("\n</td></tr>\n"); | 46 | html("\n</td></tr>\n"); |
42 | html("</table>\n"); | 47 | html("</table>\n"); |
43 | } | 48 | } |