X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/74620f12e4f7e91cb0a0b4ca731e07272d1b65f6..8fb2f056961e577a039ae185d89ab8e2d2840b9e:/ui-shared.c?ds=sidebyside

diff --git a/ui-shared.c b/ui-shared.c
index cb8a8df..3322561 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -25,7 +25,7 @@ static char *http_date(time_t t)
 		   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
-static int ttl_seconds(int ttl)
+static long ttl_seconds(long ttl)
 {
 	if (ttl<0)
 		return 60 * 60 * 24 * 365;
@@ -60,6 +60,30 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
 	}
 }
 
+char *cgit_currurl()
+{
+	if (!cgit_virtual_root)
+		return "./cgit.cgi";
+	else if (cgit_query_page)
+		return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
+	else if (cgit_query_repo)
+		return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
+	else
+		return fmt("%s/", cgit_virtual_root);
+}
+
+
+void cgit_print_date(unsigned long secs)
+{
+	char buf[32];
+	struct tm *time;
+
+	time = gmtime(&secs);
+	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
+	html_txt(buf);
+	
+}
+
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
 	html("Content-Type: text/html; charset=utf-8\n");
@@ -83,15 +107,40 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 
 void cgit_print_docend()
 {
+	html("</td></tr></table>");
 	html("</body>\n</html>\n");
 }
 
-void cgit_print_pageheader(char *title)
+void cgit_print_pageheader(char *title, int show_search)
 {
-	html("<div id='header'>");
+	html("<table id='layout'><tr><td id='header'>");
 	htmlf("<a href='%s'>", cgit_logo_link);
 	htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
 	htmlf("</a>");
+	if (show_search) {
+		html("<form method='get' href='");
+		html_attr(cgit_currurl());
+		html("'>");
+		if (!cgit_virtual_root) {
+			if (cgit_query_repo)
+				html_hidden("r", cgit_query_repo);
+			if (cgit_query_page)
+				html_hidden("p", cgit_query_page);
+		}
+		if (cgit_query_head)
+			html_hidden("h", cgit_query_head);
+		if (cgit_query_sha1)
+			html_hidden("id", cgit_query_sha1);
+		if (cgit_query_sha2)
+			html_hidden("id2", cgit_query_sha2);
+		html("<input type='text' name='q' value='");
+		html_attr(cgit_query_search);
+		html("'/></form>");
+	}
+	if (cgit_query_repo)
+		htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
 	html_txt(title);
-	html("</div>");
+	if (cgit_query_repo)
+		html("</a>");
+	html("</td></tr><tr><td id='content'>");
 }