tree: move layout into page function

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6be0c2e3297b0cb406bfd6bfff40356dc9ed5e9f..de06256d447da52d9af7178fedd62a1ff8bb6485 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -604,35 +604,31 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                path[len - 1] = tail;
 }
 
                path[len - 1] = tail;
 }
 

-void cgit_print_date(time_t secs, const char *format, int local_time)
+static const char *fmt_date(time_t secs, const char *format, int local_time)

 {
 {

-       char buf[64];
+       static char buf[64];

        struct tm *time;
 
        if (!secs)
        struct tm *time;
 
        if (!secs)

-               return;
+               return "";

        if (local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        if (local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);

-       html_txt(buf);
+       return buf;
+}
+
+void cgit_print_date(time_t secs, const char *format, int local_time)
+{
+       html_txt(fmt_date(secs, format, local_time));

 }
 
 static void print_rel_date(time_t t, double value,
        const char *class, const char *suffix)
 {
 }
 
 static void print_rel_date(time_t t, double value,
        const char *class, const char *suffix)
 {

-       char buf[64];
-       struct tm *time;
-
-       if (ctx.cfg.local_time)
-               time = localtime(&t);
-       else
-               time = gmtime(&t);
-       strftime(buf, sizeof(buf) - 1, FMT_LONGDATE, time);
-

        htmlf("<span class='%s' title='", class);
        htmlf("<span class='%s' title='", class);

-       html_attr(buf);
+       html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));

        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 


@@ -648,7 +644,11 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
                secs = 0;
 
        if (secs > max_relative && max_relative >= 0) {
                secs = 0;
 
        if (secs > max_relative && max_relative >= 0) {

+               html("<span title='");
+               html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
+               html("'>");

                cgit_print_date(t, format, ctx.cfg.local_time);
                cgit_print_date(t, format, ctx.cfg.local_time);

+               html("</span>");

                return;
        }
 
                return;
        }
 


@@ -706,8 +706,7 @@ void cgit_print_http_headers(void)
 void cgit_redirect(const char *url, bool permanent)
 {
        htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
 void cgit_redirect(const char *url, bool permanent)
 {
        htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");

-       htmlf("Location: %s\n", url);
-       htmlf("\n");
+       htmlf("Location: %s\n\n", url);

        exit(0);
 }
 
        exit(0);
 }
 


@@ -789,6 +788,32 @@ void cgit_print_docend(void)
        html("</body>\n</html>\n");
 }
 
        html("</body>\n</html>\n");
 }
 

+void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
+{
+       va_list ap;
+       ctx.page.status = code;
+       ctx.page.statusmsg = msg;
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+       va_start(ap, fmt);
+       cgit_vprint_error(fmt, ap);
+       va_end(ap);
+       cgit_print_docend();
+}
+
+void cgit_print_layout_start(void)
+{
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+}
+
+void cgit_print_layout_end(void)
+{
+       cgit_print_docend();
+}
+

 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);