Add ofs argument to cgit_log_link and use it in ui-log.c

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 172499ce807a16ae4c6c1b89a6c983637d59f05f..bfcc2ac5a880cf5a27ac8d0c227cea562b1956a9 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 *http_date(time_t t)
 {

-       static char day[][4] = 
+       static char day[][4] =

                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
                {"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);
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&t);


@@ -40,6 +40,14 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
        html("</div>\n");
 }
 

+char *cgit_rooturl()
+{
+       if (cgit_virtual_root)
+               return fmt("%s/", cgit_virtual_root);
+       else
+               return cgit_script_name;
+}
+

 char *cgit_repourl(const char *reponame)
 {
        if (cgit_virtual_root) {
 char *cgit_repourl(const char *reponame)
 {
        if (cgit_virtual_root) {


@@ -49,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) {
                   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 {
        } else {

-               return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+               if (query)
+                       return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
+               else
+                       return fmt("?r=%s&amp;p=%s", reponame, pagename);

        }
 }
 
 char *cgit_currurl()
 {
        if (!cgit_virtual_root)
        }
 }
 
 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)
        else if (cgit_query_page)
                return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
        else if (cgit_query_repo)


@@ -72,16 +87,186 @@ char *cgit_currurl()
                return fmt("%s/", cgit_virtual_root);
 }
 
                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("/");
+               if (page) {
+                       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("/");
+               if (page) {
+                       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_print_date(unsigned long secs)
+void cgit_log_link(char *name, char *title, char *class, char *head,
+                  char *rev, char *path, int ofs)

 {
 {

-       char buf[32];
+       char *delim;
+
+       delim = repolink(title, class, "log", head, path);
+       if (rev && strcmp(rev, cgit_query_head)) {
+               html(delim);
+               html("id=");
+               html_attr(rev);
+               delim = "&";
+       }
+       if (ofs > 0) {
+               html(delim);
+               html("ofs=");
+               htmlf("%d", ofs);
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
+}
+
+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_diff_link(char *name, char *title, char *class, char *head,
+                   char *new_rev, char *old_rev, char *path)
+{
+       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);
        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);
        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)
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)


@@ -113,12 +298,44 @@ void cgit_print_docend()
 
 void cgit_print_pageheader(char *title, int show_search)
 {
 
 void cgit_print_pageheader(char *title, int show_search)
 {

-       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>");
+       html("<table id='layout'>");
+       html("<tr><td id='header'><a href='");
+       html_attr(cgit_rooturl());
+       html("'>");
+       html_txt(cgit_root_title);
+       html("</a></td><td id='logo'>");
+       html("<a href='");
+       html_attr(cgit_logo_link);
+       htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
+       html("</td></tr>");
+       html("<tr><td id='crumb'>");
+       if (cgit_query_repo) {
+               html_txt(cgit_repo->name);
+               html(" (");
+               html_txt(cgit_query_head);
+               html(") : &nbsp;");
+               reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
+                           NULL, NULL);
+               html(" ");
+               cgit_log_link("log", NULL, NULL, cgit_query_head,
+                             cgit_query_sha1, cgit_query_path, 0);
+               html(" ");
+               cgit_tree_link("tree", NULL, NULL, cgit_query_head,
+                              cgit_query_sha1, NULL);
+               html(" ");
+               cgit_commit_link("commit", NULL, NULL, cgit_query_head,
+                             cgit_query_sha1);
+               html(" ");
+               cgit_diff_link("diff", NULL, NULL, cgit_query_head,
+                              cgit_query_sha1, cgit_query_sha2,
+                              cgit_query_path);
+       } else {
+               html_txt("Index of repositories");
+       }
+       html("</td>");
+       html("<td id='search'>");

        if (show_search) {
        if (show_search) {

-               html("<form method='get' href='");
+               html("<form method='get' action='");

                html_attr(cgit_currurl());
                html("'>");
                if (!cgit_virtual_root) {
                html_attr(cgit_currurl());
                html("'>");
                if (!cgit_virtual_root) {


@@ -137,15 +354,11 @@ void cgit_print_pageheader(char *title, int show_search)
                html_attr(cgit_query_search);
                html("'/></form>");
        }
                html_attr(cgit_query_search);
                html("'/></form>");
        }

-       if (cgit_query_repo)
-               htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
-       html_txt(title);
-       if (cgit_query_repo)
-               html("</a>");
-       html("</td></tr><tr><td id='content'>");
+       html("</td></tr>");
+       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);
                               struct cacheitem *item)
 {
        htmlf("Content-Type: %s\n", mimetype);