X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/66cacd053ba900c8eb3b7962027370c84a97f990..42e459bb1f209df8278f4f4f0ee3f4bcfae80da8:/ui-shared.c diff --git a/ui-shared.c b/ui-shared.c index bca50aa..64c237f 100644 --- 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) @@ -80,16 +87,170 @@ 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("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 = "&"; + } + if (head && strcmp(head, cgit_repo->defbranch)) { + html(delim); + html("h="); + html_attr(head); + delim = "&"; + } + return fmt("%s", delim); +} -void cgit_print_date(unsigned long secs) +static void reporevlink(char *page, char *name, char *title, char *class, + char *head, char *rev, char *path) { - char buf[32]; + 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(""); +} + +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_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 = "&"; + } + if (old_rev) { + html(delim); + html("id2="); + html_attr(old_rev); + } + html("'>"); + html_txt(name); + html(""); +} + +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("%.0f min.", + secs * 1.0 / TM_MIN); + return; + } + if (secs < TM_DAY * 2) { + htmlf("%.0f hours", + secs * 1.0 / TM_HOUR); + return; + } + if (secs < TM_WEEK * 2) { + htmlf("%.0f days", + secs * 1.0 / TM_DAY); + return; + } + if (secs < TM_MONTH * 2) { + htmlf("%.0f weeks", + secs * 1.0 / TM_WEEK); + return; + } + if (secs < TM_YEAR * 2) { + htmlf("%.0f months", + secs * 1.0 / TM_MONTH); + return; + } + htmlf("%.0f years", + secs * 1.0 / TM_YEAR); } void cgit_print_docstart(char *title, struct cacheitem *item) @@ -122,24 +283,43 @@ void cgit_print_docend() void cgit_print_pageheader(char *title, int show_search) { html(""); - html(""); html(""); html("
"); - htmlf("root", cgit_rooturl()); if (cgit_query_repo) { - htmlf(" : ", cgit_repourl(cgit_repo->url)); html_txt(cgit_repo->name); - htmlf(" : %s", title); + html(" ("); + html_txt(cgit_query_head); + html(") :  "); + 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); + 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("
"); } -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);