-rw-r--r-- | cgit.css | 9 | ||||
-rw-r--r-- | ui-shared.c | 4 |
2 files changed, 12 insertions, 1 deletions
@@ -1,120 +1,127 @@ | |||
1 | body { | 1 | body { |
2 | font-family: arial; | 2 | font-family: arial; |
3 | font-size: normal; | 3 | font-size: normal; |
4 | background: white; | 4 | background: white; |
5 | padding: 0em; | 5 | padding: 0em; |
6 | margin: 0.5em; | 6 | margin: 0.5em; |
7 | } | 7 | } |
8 | 8 | ||
9 | 9 | ||
10 | h2 { | 10 | h2 { |
11 | font-size: normal; | 11 | font-size: normal; |
12 | font-weight: bold; | 12 | font-weight: bold; |
13 | margin-bottom: 0.1em; | 13 | margin-bottom: 0.1em; |
14 | } | 14 | } |
15 | 15 | ||
16 | a { | ||
17 | color: blue; | ||
18 | text-decoration: none; | ||
19 | } | ||
20 | |||
21 | a:hover { | ||
22 | text-decoration: underline; | ||
23 | } | ||
16 | 24 | ||
17 | table.list { | 25 | table.list { |
18 | border: solid 1px black; | 26 | border: solid 1px black; |
19 | border-collapse: collapse; | 27 | border-collapse: collapse; |
20 | border: solid 1px #aaa; | 28 | border: solid 1px #aaa; |
21 | } | 29 | } |
22 | 30 | ||
23 | table.list th { | 31 | table.list th { |
24 | font-weight: bold; | 32 | font-weight: bold; |
25 | background: #ddd; | 33 | background: #ddd; |
26 | border-bottom: solid 1px #aaa; | 34 | border-bottom: solid 1px #aaa; |
27 | padding: 0.1em 0.5em 0.1em 0.5em; | 35 | padding: 0.1em 0.5em 0.1em 0.5em; |
28 | vertical-align: baseline; | 36 | vertical-align: baseline; |
29 | } | 37 | } |
30 | table.list td { | 38 | table.list td { |
31 | border: none; | 39 | border: none; |
32 | padding: 0.1em 0.5em 0.1em 0.5em; | 40 | padding: 0.1em 0.5em 0.1em 0.5em; |
33 | background: white; | 41 | background: white; |
34 | } | 42 | } |
35 | 43 | ||
36 | img { | 44 | img { |
37 | border: none; | 45 | border: none; |
38 | } | 46 | } |
39 | 47 | ||
40 | 48 | ||
41 | div#header { | 49 | div#header { |
42 | background-color: #ddd; | 50 | background-color: #ddd; |
43 | padding: 0.25em 0.25em 0.25em 0.5em; | 51 | padding: 0.25em 0.25em 0.25em 0.5em; |
44 | font-size: 150%; | 52 | font-size: 150%; |
45 | font-weight: bold; | 53 | font-weight: bold; |
46 | border: solid 1px #aaa; | 54 | border: solid 1px #aaa; |
47 | vertical-align: middle; | 55 | vertical-align: middle; |
48 | } | 56 | } |
49 | |||
50 | div#header img#logo { | 57 | div#header img#logo { |
51 | float: right; | 58 | float: right; |
52 | } | 59 | } |
53 | 60 | ||
54 | div#content { | 61 | div#content { |
55 | margin: 0.5em 0.5em; | 62 | margin: 0.5em 0.5em; |
56 | } | 63 | } |
57 | 64 | ||
58 | div#blob { | 65 | div#blob { |
59 | border: solid 1px black; | 66 | border: solid 1px black; |
60 | } | 67 | } |
61 | 68 | ||
62 | div.error { | 69 | div.error { |
63 | color: red; | 70 | color: red; |
64 | font-weight: bold; | 71 | font-weight: bold; |
65 | margin: 1em 2em; | 72 | margin: 1em 2em; |
66 | } | 73 | } |
67 | div.ls-dir a { | 74 | div.ls-dir a { |
68 | font-weight: bold; | 75 | font-weight: bold; |
69 | } | 76 | } |
70 | th.filesize, td.filesize { | 77 | th.filesize, td.filesize { |
71 | text-align: right; | 78 | text-align: right; |
72 | } | 79 | } |
73 | th.filemode, td.filemode { | 80 | th.filemode, td.filemode { |
74 | text-align: center; | 81 | text-align: center; |
75 | } | 82 | } |
76 | 83 | ||
77 | td.blob { | 84 | td.blob { |
78 | white-space: pre; | 85 | white-space: pre; |
79 | font-family: courier; | 86 | font-family: courier; |
80 | font-size: 100%; | 87 | font-size: 100%; |
81 | } | 88 | } |
82 | 89 | ||
83 | table.log td { | 90 | table.log td { |
84 | white-space: nowrap; | 91 | white-space: nowrap; |
85 | } | 92 | } |
86 | 93 | ||
87 | table.commit-info { | 94 | table.commit-info { |
88 | border-collapse: collapse; | 95 | border-collapse: collapse; |
89 | margin-top: 1em; | 96 | margin-top: 1em; |
90 | 97 | ||
91 | } | 98 | } |
92 | table.commit-info th { | 99 | table.commit-info th { |
93 | text-align: left; | 100 | text-align: left; |
94 | font-weight: normal; | 101 | font-weight: normal; |
95 | padding: 0.1em 1em 0.1em 0.1em; | 102 | padding: 0.1em 1em 0.1em 0.1em; |
96 | } | 103 | } |
97 | table.commit-info td { | 104 | table.commit-info td { |
98 | font-weight: normal; | 105 | font-weight: normal; |
99 | padding: 0.1em 1em 0.1em 0.1em; | 106 | padding: 0.1em 1em 0.1em 0.1em; |
100 | } | 107 | } |
101 | div.commit-subject { | 108 | div.commit-subject { |
102 | font-weight: bold; | 109 | font-weight: bold; |
103 | font-size: 110%; | 110 | font-size: 110%; |
104 | margin: 1em 0em 1em; | 111 | margin: 1em 0em 1em; |
105 | } | 112 | } |
106 | div.commit-msg { | 113 | div.commit-msg { |
107 | white-space: pre; | 114 | white-space: pre; |
108 | font-family: courier; | 115 | font-family: courier; |
109 | font-size: 100%; | 116 | font-size: 100%; |
110 | } | 117 | } |
111 | .sha1 { | 118 | .sha1 { |
112 | font-family: courier; | 119 | font-family: courier; |
113 | font-size: 90%; | 120 | font-size: 90%; |
114 | } | 121 | } |
115 | .left { | 122 | .left { |
116 | text-align: left; | 123 | text-align: left; |
117 | } | 124 | } |
118 | .right { | 125 | .right { |
119 | text-align: right; | 126 | text-align: right; |
120 | } | 127 | } |
diff --git a/ui-shared.c b/ui-shared.c index 1a6c127..9ec4be8 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -1,109 +1,113 @@ | |||
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 int ttl_seconds(int ttl) | 28 | static int ttl_seconds(int 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_repourl(const char *reponame) | 43 | char *cgit_repourl(const char *reponame) |
44 | { | 44 | { |
45 | if (cgit_virtual_root) { | 45 | if (cgit_virtual_root) { |
46 | return fmt("%s/%s/", cgit_virtual_root, reponame); | 46 | return fmt("%s/%s/", cgit_virtual_root, reponame); |
47 | } else { | 47 | } else { |
48 | return fmt("?r=%s", reponame); | 48 | return fmt("?r=%s", reponame); |
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | char *cgit_pageurl(const char *reponame, const char *pagename, | 52 | char *cgit_pageurl(const char *reponame, const char *pagename, |
53 | const char *query) | 53 | const char *query) |
54 | { | 54 | { |
55 | if (cgit_virtual_root) { | 55 | if (cgit_virtual_root) { |
56 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, | 56 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, |
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 | 63 | ||
64 | void cgit_print_date(unsigned long secs) | 64 | void cgit_print_date(unsigned long secs) |
65 | { | 65 | { |
66 | char buf[32]; | 66 | char buf[32]; |
67 | struct tm *time; | 67 | struct tm *time; |
68 | 68 | ||
69 | time = gmtime(&secs); | 69 | time = gmtime(&secs); |
70 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); | 70 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); |
71 | html_txt(buf); | 71 | html_txt(buf); |
72 | 72 | ||
73 | } | 73 | } |
74 | 74 | ||
75 | void cgit_print_docstart(char *title, struct cacheitem *item) | 75 | void cgit_print_docstart(char *title, struct cacheitem *item) |
76 | { | 76 | { |
77 | html("Content-Type: text/html; charset=utf-8\n"); | 77 | html("Content-Type: text/html; charset=utf-8\n"); |
78 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 78 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
79 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 79 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
80 | ttl_seconds(item->ttl))); | 80 | ttl_seconds(item->ttl))); |
81 | html("\n"); | 81 | html("\n"); |
82 | html(cgit_doctype); | 82 | html(cgit_doctype); |
83 | html("<html>\n"); | 83 | html("<html>\n"); |
84 | html("<head>\n"); | 84 | html("<head>\n"); |
85 | html("<title>"); | 85 | html("<title>"); |
86 | html_txt(title); | 86 | html_txt(title); |
87 | html("</title>\n"); | 87 | html("</title>\n"); |
88 | htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); | 88 | htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); |
89 | html("<link rel='stylesheet' type='text/css' href='"); | 89 | html("<link rel='stylesheet' type='text/css' href='"); |
90 | html_attr(cgit_css); | 90 | html_attr(cgit_css); |
91 | html("'/>\n"); | 91 | html("'/>\n"); |
92 | html("</head>\n"); | 92 | html("</head>\n"); |
93 | html("<body>\n"); | 93 | html("<body>\n"); |
94 | } | 94 | } |
95 | 95 | ||
96 | void cgit_print_docend() | 96 | void cgit_print_docend() |
97 | { | 97 | { |
98 | html("</body>\n</html>\n"); | 98 | html("</body>\n</html>\n"); |
99 | } | 99 | } |
100 | 100 | ||
101 | void cgit_print_pageheader(char *title) | 101 | void cgit_print_pageheader(char *title) |
102 | { | 102 | { |
103 | html("<div id='header'>"); | 103 | html("<div id='header'>"); |
104 | htmlf("<a href='%s'>", cgit_logo_link); | 104 | htmlf("<a href='%s'>", cgit_logo_link); |
105 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); | 105 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); |
106 | htmlf("</a>"); | 106 | htmlf("</a>"); |
107 | if (cgit_query_repo) | ||
108 | htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo)); | ||
107 | html_txt(title); | 109 | html_txt(title); |
110 | if (cgit_query_repo) | ||
111 | html("</a>"); | ||
108 | html("</div>"); | 112 | html("</div>"); |
109 | } | 113 | } |