1 files changed, 55 insertions, 16 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 110c696..d4376ce 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,331 +1,370 @@
 /* ui-shared.c: common web output functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 static char *http_date(time_t t)
 {
        static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 static long ttl_seconds(long ttl)
 {
        if (ttl<0)
                return 60 * 60 * 24 * 365;
        else
                return ttl * 60;
 }
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
        html_txt(msg);
        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) {
                return fmt("%s/%s/", cgit_virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
 }
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
        if (cgit_virtual_root) {
                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 {
                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)
                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)
                return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
        else
                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);
+                if (page) {
-                html("/");
+                        html(page);
-                if (path)
+                        html("/");
-                        html_attr(path);
+                        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);
+                if (page) {
-                html("/");
+                        html(page);
-                if (path)
+                        html("/");
-                        html_attr(path);
+                        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)
+                   char *rev, char *path, int ofs)
 {
-        reporevlink("log", name, title, class, head, rev, path);
+        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);
        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");
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
        html(cgit_doctype);
        html("<html>\n");
        html("<head>\n");
        html("<title>");
        html_txt(title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
        html("</td></tr></table>");
        html("</body>\n</html>\n");
 }
 void cgit_print_pageheader(char *title, int show_search)
 {
        html("<table id='layout'>");
-        html("<tr><td id='header'>");
+        html("<tr><td id='header'><a href='");
-        html(cgit_root_title);
+        html_attr(cgit_rooturl());
-        html("</td><td id='logo'>");
+        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'>");
-        htmlf("<a href='%s'>root</a>", cgit_rooturl());
        if (cgit_query_repo) {
-                htmlf(" : <a href='%s'>", cgit_repourl(cgit_repo->url));
                html_txt(cgit_repo->name);
-                htmlf("</a> : %s", title);
+                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) {
                html("<form method='get' action='");
                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)
                        html_hidden("id", cgit_query_sha1);
                if (cgit_query_sha2)
                        html_hidden("id2", cgit_query_sha2);
                html("<input type='text' name='q' value='");
                html_attr(cgit_query_search);
                html("'/></form>");
        }
        html("</td></tr>");
        html("<tr><td id='content' colspan='2'>");
 }
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                               struct cacheitem *item)
 {
        htmlf("Content-Type: %s\n", mimetype);
        htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
 }