Add support for prefix and gitsrc arguments to 'make'

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index b9c124393741bb290de02a79f91292dd7a23bf3e..3322561f77dc4b00efad598fc884bdc0b64863ea 100644 (file)
--- 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;
@@ -107,12 +107,13 @@ 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, 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>");
@@ -120,6 +121,12 @@ void cgit_print_pageheader(char *title, int 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)
@@ -135,5 +142,5 @@ void cgit_print_pageheader(char *title, int show_search)
        html_txt(title);
        if (cgit_query_repo)
                html("</a>");
-       html("</div>");
+       html("</td></tr><tr><td id='content'>");
 }