-rw-r--r-- | ui-shared.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c index bebd3e0..6300516 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -62,78 +62,79 @@ char *cgit_pageurl(const char *reponame, const char *pagename, | |||
62 | 62 | ||
63 | char *cgit_currurl() | 63 | char *cgit_currurl() |
64 | { | 64 | { |
65 | if (!cgit_virtual_root) | 65 | if (!cgit_virtual_root) |
66 | return "./cgit.cgi"; | 66 | return "./cgit.cgi"; |
67 | else if (cgit_query_page) | 67 | else if (cgit_query_page) |
68 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); | 68 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); |
69 | else if (cgit_query_repo) | 69 | else if (cgit_query_repo) |
70 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); | 70 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); |
71 | else | 71 | else |
72 | return fmt("%s/", cgit_virtual_root); | 72 | return fmt("%s/", cgit_virtual_root); |
73 | } | 73 | } |
74 | 74 | ||
75 | 75 | ||
76 | void cgit_print_date(unsigned long secs) | 76 | void cgit_print_date(unsigned long secs) |
77 | { | 77 | { |
78 | char buf[32]; | 78 | char buf[32]; |
79 | struct tm *time; | 79 | struct tm *time; |
80 | 80 | ||
81 | time = gmtime(&secs); | 81 | time = gmtime(&secs); |
82 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); | 82 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); |
83 | html_txt(buf); | 83 | html_txt(buf); |
84 | 84 | ||
85 | } | 85 | } |
86 | 86 | ||
87 | void cgit_print_docstart(char *title, struct cacheitem *item) | 87 | void cgit_print_docstart(char *title, struct cacheitem *item) |
88 | { | 88 | { |
89 | html("Content-Type: text/html; charset=utf-8\n"); | 89 | html("Content-Type: text/html; charset=utf-8\n"); |
90 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 90 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
91 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 91 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
92 | ttl_seconds(item->ttl))); | 92 | ttl_seconds(item->ttl))); |
93 | html("\n"); | 93 | html("\n"); |
94 | html(cgit_doctype); | 94 | html(cgit_doctype); |
95 | html("<html>\n"); | 95 | html("<html>\n"); |
96 | html("<head>\n"); | 96 | html("<head>\n"); |
97 | html("<title>"); | 97 | html("<title>"); |
98 | html_txt(title); | 98 | html_txt(title); |
99 | html("</title>\n"); | 99 | html("</title>\n"); |
100 | htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); | 100 | htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version); |
101 | html("<link rel='stylesheet' type='text/css' href='"); | 101 | html("<link rel='stylesheet' type='text/css' href='"); |
102 | html_attr(cgit_css); | 102 | html_attr(cgit_css); |
103 | html("'/>\n"); | 103 | html("'/>\n"); |
104 | html("</head>\n"); | 104 | html("</head>\n"); |
105 | html("<body>\n"); | 105 | html("<body>\n"); |
106 | } | 106 | } |
107 | 107 | ||
108 | void cgit_print_docend() | 108 | void cgit_print_docend() |
109 | { | 109 | { |
110 | html("</td></tr></table>"); | ||
110 | html("</body>\n</html>\n"); | 111 | html("</body>\n</html>\n"); |
111 | } | 112 | } |
112 | 113 | ||
113 | void cgit_print_pageheader(char *title, int show_search) | 114 | void cgit_print_pageheader(char *title, int show_search) |
114 | { | 115 | { |
115 | html("<div id='header'>"); | 116 | html("<table id='layout'><tr><td id='header'>"); |
116 | htmlf("<a href='%s'>", cgit_logo_link); | 117 | htmlf("<a href='%s'>", cgit_logo_link); |
117 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); | 118 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); |
118 | htmlf("</a>"); | 119 | htmlf("</a>"); |
119 | if (show_search) { | 120 | if (show_search) { |
120 | html("<form method='get' href='"); | 121 | html("<form method='get' href='"); |
121 | html_attr(cgit_currurl()); | 122 | html_attr(cgit_currurl()); |
122 | html("'>"); | 123 | html("'>"); |
123 | if (cgit_query_head) | 124 | if (cgit_query_head) |
124 | html_hidden("h", cgit_query_head); | 125 | html_hidden("h", cgit_query_head); |
125 | if (cgit_query_sha1) | 126 | if (cgit_query_sha1) |
126 | html_hidden("id", cgit_query_sha1); | 127 | html_hidden("id", cgit_query_sha1); |
127 | if (cgit_query_sha2) | 128 | if (cgit_query_sha2) |
128 | html_hidden("id2", cgit_query_sha2); | 129 | html_hidden("id2", cgit_query_sha2); |
129 | html("<input type='text' name='q' value='"); | 130 | html("<input type='text' name='q' value='"); |
130 | html_attr(cgit_query_search); | 131 | html_attr(cgit_query_search); |
131 | html("'/></form>"); | 132 | html("'/></form>"); |
132 | } | 133 | } |
133 | if (cgit_query_repo) | 134 | if (cgit_query_repo) |
134 | htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo)); | 135 | htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo)); |
135 | html_txt(title); | 136 | html_txt(title); |
136 | if (cgit_query_repo) | 137 | if (cgit_query_repo) |
137 | html("</a>"); | 138 | html("</a>"); |
138 | html("</div>"); | 139 | html("</td></tr><tr><td id='content'>"); |
139 | } | 140 | } |