Add cgit_diff_link()

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6f5cf2b9155f6b4f5c158e34c0b2f14c3a2dff1f..15d825460f6d604441c0f3746e7ffa478af18cd7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -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)
@@ -61,17 +61,24 @@ 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)
@@ -80,17 +87,168 @@ char *cgit_currurl()
                return fmt("%s/", cgit_virtual_root);
 }
 
+static char *repolink(char *title, char *class, char *page, char *head,
+                     char *path)
+{
+       char *delim = "?";
+
+       html("<a");
+       if (title) {
+               html(" title='");
+               html_attr(title);
+               html("'");
+       }
+       if (class) {
+               html(" class='");
+               html_attr(class);
+               html("'");
+       }
+       html(" href='");
+       if (cgit_virtual_root) {
+               html_attr(cgit_virtual_root);
+               if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
+                       html("/");
+               html_attr(cgit_repo->url);
+               if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+                       html("/");
+               html(page);
+               html("/");
+               if (path)
+                       html_attr(path);
+       } else {
+               html(cgit_script_name);
+               html("?url=");
+               html_attr(cgit_repo->url);
+               if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+                       html("/");
+               html(page);
+               html("/");
+               if (path)
+                       html_attr(path);
+               delim = "&amp;";
+       }
+       if (head && strcmp(head, cgit_repo->defbranch)) {
+               html(delim);
+               html("h=");
+               html_attr(head);
+               delim = "&amp;";
+       }
+       return fmt("%s", delim);
+}
+
+static void reporevlink(char *page, char *name, char *title, char *class,
+                       char *head, char *rev, char *path)
+{
+       char *delim;
+
+       delim = repolink(title, class, page, head, path);
+       if (rev && strcmp(rev, cgit_query_head)) {
+               html(delim);
+               html("id=");
+               html_attr(rev);
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
+}
+
+void cgit_tree_link(char *name, char *title, char *class, char *head,
+                   char *rev, char *path)
+{
+       reporevlink("tree", name, title, class, head, rev, path);
+}
+
+void cgit_log_link(char *name, char *title, char *class, char *head,
+                  char *rev, char *path)
+{
+       reporevlink("log", name, title, class, head, rev, path);
+}
+
+void cgit_commit_link(char *name, char *title, char *class, char *head,
+                     char *rev)
+{
+       if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
+               name[cgit_max_msg_len] = '\0';
+               name[cgit_max_msg_len - 1] = '.';
+               name[cgit_max_msg_len - 2] = '.';
+               name[cgit_max_msg_len - 3] = '.';
+       }
+       reporevlink("commit", name, title, class, head, rev, NULL);
+}
 
-void cgit_print_date(unsigned long secs)
+void cgit_diff_link(char *name, char *title, char *class, char *head,
+                   char *new_rev, char *old_rev, char *path)
 {
-       char buf[32];
+       char *delim;
+
+       delim = repolink(title, class, "diff", head, path);
+       if (new_rev && strcmp(new_rev, cgit_query_head)) {
+               html(delim);
+               html("id=");
+               html_attr(new_rev);
+               delim = "&amp;";
+       }
+       if (old_rev) {
+               html(delim);
+               html("id2=");
+               html_attr(old_rev);
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
+}
+
+void cgit_print_date(time_t secs, char *format)
+{
+       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)
 {
        html("Content-Type: text/html; charset=utf-8\n");
@@ -126,7 +284,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());
@@ -138,7 +296,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) {