author | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 22:22:03 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 22:22:17 (UTC) |
commit | 6fb7d09fea94b3dd6932469283358cb24f1e7e29 (patch) (unidiff) | |
tree | ef8b1954a585006746bf528962f122d8fb3f597c | |
parent | 495e39677326284ea13b2f6d76195d6800c2a450 (diff) | |
download | cgit-6fb7d09fea94b3dd6932469283358cb24f1e7e29.zip cgit-6fb7d09fea94b3dd6932469283358cb24f1e7e29.tar.gz cgit-6fb7d09fea94b3dd6932469283358cb24f1e7e29.tar.bz2 |
ui-shared.c: fix whitespace breakage
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui-shared.c b/ui-shared.c index bca50aa..6f5cf2b 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -1,116 +1,115 @@ | |||
1 | /* ui-shared.c: common web output functions | 1 | /* ui-shared.c: common web output 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 | const char cgit_doctype[] = | 11 | const char cgit_doctype[] = |
12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" | 12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" |
13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; | 13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; |
14 | 14 | ||
15 | static char *http_date(time_t t) | 15 | static char *http_date(time_t t) |
16 | { | 16 | { |
17 | static char day[][4] = | 17 | static char day[][4] = |
18 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 18 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
19 | static char month[][4] = | 19 | static char month[][4] = |
20 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 20 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
21 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 21 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; |
22 | struct tm *tm = gmtime(&t); | 22 | struct tm *tm = gmtime(&t); |
23 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 23 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
24 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 24 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
25 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 25 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
26 | } | 26 | } |
27 | 27 | ||
28 | static long ttl_seconds(long ttl) | 28 | static long ttl_seconds(long ttl) |
29 | { | 29 | { |
30 | if (ttl<0) | 30 | if (ttl<0) |
31 | return 60 * 60 * 24 * 365; | 31 | return 60 * 60 * 24 * 365; |
32 | else | 32 | else |
33 | return ttl * 60; | 33 | return ttl * 60; |
34 | } | 34 | } |
35 | 35 | ||
36 | void cgit_print_error(char *msg) | 36 | void cgit_print_error(char *msg) |
37 | { | 37 | { |
38 | html("<div class='error'>"); | 38 | html("<div class='error'>"); |
39 | html_txt(msg); | 39 | html_txt(msg); |
40 | html("</div>\n"); | 40 | html("</div>\n"); |
41 | } | 41 | } |
42 | 42 | ||
43 | char *cgit_rooturl() | 43 | char *cgit_rooturl() |
44 | { | 44 | { |
45 | if (cgit_virtual_root) | 45 | if (cgit_virtual_root) |
46 | return fmt("%s/", cgit_virtual_root); | 46 | return fmt("%s/", cgit_virtual_root); |
47 | else | 47 | else |
48 | return "./cgit.cgi"; | 48 | return "./cgit.cgi"; |
49 | } | 49 | } |
50 | 50 | ||
51 | char *cgit_repourl(const char *reponame) | 51 | char *cgit_repourl(const char *reponame) |
52 | { | 52 | { |
53 | if (cgit_virtual_root) { | 53 | if (cgit_virtual_root) { |
54 | return fmt("%s/%s/", cgit_virtual_root, reponame); | 54 | return fmt("%s/%s/", cgit_virtual_root, reponame); |
55 | } else { | 55 | } else { |
56 | return fmt("?r=%s", reponame); | 56 | return fmt("?r=%s", reponame); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | char *cgit_pageurl(const char *reponame, const char *pagename, | 60 | char *cgit_pageurl(const char *reponame, const char *pagename, |
61 | const char *query) | 61 | const char *query) |
62 | { | 62 | { |
63 | if (cgit_virtual_root) { | 63 | if (cgit_virtual_root) { |
64 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, | 64 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, |
65 | pagename, query); | 65 | pagename, query); |
66 | } else { | 66 | } else { |
67 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); | 67 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); |
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | char *cgit_currurl() | 71 | char *cgit_currurl() |
72 | { | 72 | { |
73 | if (!cgit_virtual_root) | 73 | if (!cgit_virtual_root) |
74 | return "./cgit.cgi"; | 74 | return "./cgit.cgi"; |
75 | else if (cgit_query_page) | 75 | else if (cgit_query_page) |
76 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); | 76 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); |
77 | else if (cgit_query_repo) | 77 | else if (cgit_query_repo) |
78 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); | 78 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); |
79 | else | 79 | else |
80 | return fmt("%s/", cgit_virtual_root); | 80 | return fmt("%s/", cgit_virtual_root); |
81 | } | 81 | } |
82 | 82 | ||
83 | 83 | ||
84 | void cgit_print_date(unsigned long secs) | 84 | void cgit_print_date(unsigned long secs) |
85 | { | 85 | { |
86 | char buf[32]; | 86 | char buf[32]; |
87 | struct tm *time; | 87 | struct tm *time; |
88 | 88 | ||
89 | time = gmtime(&secs); | 89 | time = gmtime(&secs); |
90 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); | 90 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); |
91 | html_txt(buf); | 91 | html_txt(buf); |
92 | |||
93 | } | 92 | } |
94 | 93 | ||
95 | void cgit_print_docstart(char *title, struct cacheitem *item) | 94 | void cgit_print_docstart(char *title, struct cacheitem *item) |
96 | { | 95 | { |
97 | html("Content-Type: text/html; charset=utf-8\n"); | 96 | html("Content-Type: text/html; charset=utf-8\n"); |
98 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 97 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
99 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 98 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
100 | ttl_seconds(item->ttl))); | 99 | ttl_seconds(item->ttl))); |
101 | html("\n"); | 100 | html("\n"); |
102 | html(cgit_doctype); | 101 | html(cgit_doctype); |
103 | html("<html>\n"); | 102 | html("<html>\n"); |
104 | html("<head>\n"); | 103 | html("<head>\n"); |
105 | html("<title>"); | 104 | html("<title>"); |
106 | html_txt(title); | 105 | html_txt(title); |
107 | html("</title>\n"); | 106 | html("</title>\n"); |
108 | htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); | 107 | htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); |
109 | html("<link rel='stylesheet' type='text/css' href='"); | 108 | html("<link rel='stylesheet' type='text/css' href='"); |
110 | html_attr(cgit_css); | 109 | html_attr(cgit_css); |
111 | html("'/>\n"); | 110 | html("'/>\n"); |
112 | html("</head>\n"); | 111 | html("</head>\n"); |
113 | html("<body>\n"); | 112 | html("<body>\n"); |
114 | } | 113 | } |
115 | 114 | ||
116 | void cgit_print_docend() | 115 | void cgit_print_docend() |
@@ -141,34 +140,34 @@ void cgit_print_pageheader(char *title, int show_search) | |||
141 | if (show_search) { | 140 | if (show_search) { |
142 | html("<form method='get' href='"); | 141 | html("<form method='get' href='"); |
143 | html_attr(cgit_currurl()); | 142 | html_attr(cgit_currurl()); |
144 | html("'>"); | 143 | html("'>"); |
145 | if (!cgit_virtual_root) { | 144 | if (!cgit_virtual_root) { |
146 | if (cgit_query_repo) | 145 | if (cgit_query_repo) |
147 | html_hidden("r", cgit_query_repo); | 146 | html_hidden("r", cgit_query_repo); |
148 | if (cgit_query_page) | 147 | if (cgit_query_page) |
149 | html_hidden("p", cgit_query_page); | 148 | html_hidden("p", cgit_query_page); |
150 | } | 149 | } |
151 | if (cgit_query_head) | 150 | if (cgit_query_head) |
152 | html_hidden("h", cgit_query_head); | 151 | html_hidden("h", cgit_query_head); |
153 | if (cgit_query_sha1) | 152 | if (cgit_query_sha1) |
154 | html_hidden("id", cgit_query_sha1); | 153 | html_hidden("id", cgit_query_sha1); |
155 | if (cgit_query_sha2) | 154 | if (cgit_query_sha2) |
156 | html_hidden("id2", cgit_query_sha2); | 155 | html_hidden("id2", cgit_query_sha2); |
157 | html("<input type='text' name='q' value='"); | 156 | html("<input type='text' name='q' value='"); |
158 | html_attr(cgit_query_search); | 157 | html_attr(cgit_query_search); |
159 | html("'/></form>"); | 158 | html("'/></form>"); |
160 | } | 159 | } |
161 | html("</td></tr>"); | 160 | html("</td></tr>"); |
162 | html("<tr><td id='content' colspan='2'>"); | 161 | html("<tr><td id='content' colspan='2'>"); |
163 | } | 162 | } |
164 | 163 | ||
165 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, | 164 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, |
166 | struct cacheitem *item) | 165 | struct cacheitem *item) |
167 | { | 166 | { |
168 | htmlf("Content-Type: %s\n", mimetype); | 167 | htmlf("Content-Type: %s\n", mimetype); |
169 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); | 168 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); |
170 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 169 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
171 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 170 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
172 | ttl_seconds(item->ttl))); | 171 | ttl_seconds(item->ttl))); |
173 | html("\n"); | 172 | html("\n"); |
174 | } | 173 | } |