ui-diff: close td/tr/table properly

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index bca50aa311dafc6a24c5069a7c551f31118325cd..aba93e8c135860058a275e4aec8f85a9f796ecdc 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -14,9 +14,9 @@ const char cgit_doctype[] =
 
 static char *http_date(time_t t)
 {
-       static char day[][4] = 
+       static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-       static char month[][4] = 
+       static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&t);
@@ -45,7 +45,7 @@ char *cgit_rooturl()
        if (cgit_virtual_root)
                return fmt("%s/", cgit_virtual_root);
        else
-               return "./cgit.cgi";
+               return cgit_script_name;
 }
 
 char *cgit_repourl(const char *reponame)
@@ -57,21 +57,28 @@ char *cgit_repourl(const char *reponame)
        }
 }
 
-char *cgit_pageurl(const char *reponame, const char *pagename, 
+char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
        if (cgit_virtual_root) {
-               return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, 
-                          pagename, query);
+               if (query)
+                       return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
+                                  pagename, query);
+               else
+                       return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
+                                  pagename);
        } else {
-               return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+               if (query)
+                       return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+               else
+                       return fmt("?r=%s&p=%s", reponame, pagename);
        }
 }
 
 char *cgit_currurl()
 {
        if (!cgit_virtual_root)
-               return "./cgit.cgi";
+               return cgit_script_name;
        else if (cgit_query_page)
                return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
        else if (cgit_query_repo)
@@ -81,15 +88,55 @@ char *cgit_currurl()
 }
 
 
-void cgit_print_date(unsigned long secs)
+void cgit_print_date(time_t secs, char *format)
 {
-       char buf[32];
+       char buf[64];
        struct tm *time;
 
        time = gmtime(&secs);
-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
+       strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
-       
+}
+
+void cgit_print_age(time_t t, time_t max_relative, char *format)
+{
+       time_t now, secs;
+
+       time(&now);
+       secs = now - t;
+
+       if (secs > max_relative && max_relative >= 0) {
+               cgit_print_date(t, format);
+               return;
+       }
+
+       if (secs < TM_HOUR * 2) {
+               htmlf("<span class='age-mins'>%.0f min.</span>",
+                     secs * 1.0 / TM_MIN);
+               return;
+       }
+       if (secs < TM_DAY * 2) {
+               htmlf("<span class='age-hours'>%.0f hours</span>",
+                     secs * 1.0 / TM_HOUR);
+               return;
+       }
+       if (secs < TM_WEEK * 2) {
+               htmlf("<span class='age-days'>%.0f days</span>",
+                     secs * 1.0 / TM_DAY);
+               return;
+       }
+       if (secs < TM_MONTH * 2) {
+               htmlf("<span class='age-weeks'>%.0f weeks</span>",
+                     secs * 1.0 / TM_WEEK);
+               return;
+       }
+       if (secs < TM_YEAR * 2) {
+               htmlf("<span class='age-months'>%.0f months</span>",
+                     secs * 1.0 / TM_MONTH);
+               return;
+       }
+       htmlf("<span class='age-years'>%.0f years</span>",
+             secs * 1.0 / TM_YEAR);
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
@@ -127,7 +174,7 @@ void cgit_print_pageheader(char *title, int show_search)
        html("</td><td id='logo'>");
        html("<a href='");
        html_attr(cgit_logo_link);
-       htmlf("'><img src='%s'/></a>", cgit_logo);
+       htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
        html("</td></tr>");
        html("<tr><td id='crumb'>");
        htmlf("<a href='%s'>root</a>", cgit_rooturl());
@@ -139,7 +186,7 @@ void cgit_print_pageheader(char *title, int show_search)
        html("</td>");
        html("<td id='search'>");
        if (show_search) {
-               html("<form method='get' href='");
+               html("<form method='get' action='");
                html_attr(cgit_currurl());
                html("'>");
                if (!cgit_virtual_root) {
@@ -162,7 +209,7 @@ void cgit_print_pageheader(char *title, int show_search)
        html("<tr><td id='content' colspan='2'>");
 }
 
-void cgit_print_snapshot_start(const char *mimetype, const char *filename, 
+void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                               struct cacheitem *item)
 {
        htmlf("Content-Type: %s\n", mimetype);