X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/dd0f27eb36e737261b57d6ebcbd9fe20e559470d..2915483ef6c9c29ac1493e6945688bb62f7825b4:/ui-shared.c diff --git a/ui-shared.c b/ui-shared.c index e4bb98f..9ec646b 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -60,19 +60,21 @@ char *cgit_repourl(const char *reponame) char *cgit_fileurl(const char *reponame, const char *pagename, const char *filename, const char *query) { + char *tmp; + char *delim; + if (cgit_virtual_root) { - if (query) - return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame, - pagename, filename?filename:"", query); - else - return fmt("%s/%s/%s/", cgit_virtual_root, reponame, - pagename); + tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame, + pagename, (filename ? filename:"")); + delim = "?"; } else { - if (query) - return fmt("?r=%s&p=%s&%s", reponame, pagename, query); - else - return fmt("?r=%s&p=%s", reponame, pagename); + tmp = fmt("?url=%s/%s/%s", reponame, pagename, + (filename ? filename : "")); + delim = "&"; } + if (query) + tmp = fmt("%s%s%s", tmp, delim, query); + return tmp; } char *cgit_pageurl(const char *reponame, const char *pagename, @@ -194,7 +196,7 @@ void cgit_tree_link(char *name, char *title, char *class, char *head, } void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path, int ofs) + char *rev, char *path, int ofs, char *grep, char *pattern) { char *delim; @@ -205,6 +207,15 @@ void cgit_log_link(char *name, char *title, char *class, char *head, html_attr(rev); delim = "&"; } + if (grep && pattern) { + html(delim); + html("qt="); + html_attr(grep); + delim = "&"; + html(delim); + html("q="); + html_attr(pattern); + } if (ofs > 0) { html(delim); html("ofs="); @@ -272,6 +283,9 @@ void cgit_object_link(struct object *obj) } else if (obj->type == OBJ_TREE) { page = "tree"; arg = "id"; + } else if (obj->type == OBJ_TAG) { + page = "tag"; + arg = "id"; } else { page = "blob"; arg = "id"; @@ -338,13 +352,13 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) void cgit_print_docstart(char *title, struct cacheitem *item) { - html("Content-Type: text/html; charset=utf-8\n"); + html("Content-Type: text/html; charset=" PAGE_ENCODING "\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("\n"); + html("\n"); html("\n"); html(""); html_txt(title); @@ -359,72 +373,156 @@ void cgit_print_docstart(char *title, struct cacheitem *item) void cgit_print_docend() { - html("</td></tr></table>"); - html("</body>\n</html>\n"); + html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); +} + +int print_branch_option(const char *refname, const unsigned char *sha1, + int flags, void *cb_data) +{ + char *name = (char *)refname; + html_option(name, name, cgit_query_head); + return 0; +} + +int print_archive_ref(const char *refname, const unsigned char *sha1, + int flags, void *cb_data) +{ + struct tag *tag; + struct taginfo *info; + struct object *obj; + char buf[256], *url; + unsigned char fileid[20]; + int *header = (int *)cb_data; + + if (prefixcmp(refname, "refs/archives")) + return 0; + strncpy(buf, refname+14, sizeof(buf)); + obj = parse_object(sha1); + if (!obj) + return 1; + if (obj->type == OBJ_TAG) { + tag = lookup_tag(sha1); + if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) + return 0; + hashcpy(fileid, tag->tagged->sha1); + } else if (obj->type != OBJ_BLOB) { + return 0; + } else { + hashcpy(fileid, sha1); + } + if (!*header) { + html("<p><h1>download</h1>"); + *header = 1; + } + url = cgit_pageurl(cgit_query_repo, "blob", + fmt("id=%s&path=%s", sha1_to_hex(fileid), + buf)); + html_link_open(url, NULL, "menu"); + html_txt(strlpart(buf, 20)); + html_link_close(); + return 0; +} + +void add_hidden_formfields(int incl_head, int incl_search, char *page) +{ + char *url; + + if (!cgit_virtual_root) { + url = fmt("%s/%s", cgit_query_repo, page); + if (cgit_query_path) + url = fmt("%s/%s", url, cgit_query_path); + html_hidden("url", url); + } + + if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) + 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); + + if (incl_search) { + if (cgit_query_grep) + html_hidden("qt", cgit_query_grep); + if (cgit_query_search) + html_hidden("q", cgit_query_search); + } } void cgit_print_pageheader(char *title, int show_search) { - html("<table id='layout'>"); - html("<tr><td id='header'><a href='"); + static const char *default_info = "This is cgit, a fast webinterface for git repositories"; + int header = 0; + + html("<div id='sidebar'>\n"); + html("<div id='logo'><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'>"); + htmlf("'><img src='%s' alt='cgit'/></a></div>\n", + cgit_logo); + html("<div class='infobox'>"); if (cgit_query_repo) { - html_txt(cgit_repo->name); - html(" ("); - html_txt(cgit_query_head); - html(") :  "); - reporevlink(NULL, "summary", NULL, NULL, cgit_query_head, + html("<h1 class='first'>"); + html_txt(strrpart(cgit_repo->name, 20)); + html("</h1>\n"); + html_txt(cgit_repo->desc); + if (cgit_repo->owner) { + html("<h1>owner</h1>\n"); + html_txt(cgit_repo->owner); + } + html("<h1>navigate</h1>\n"); + reporevlink(NULL, "summary", NULL, "menu", 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_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, + 0, NULL, NULL); + cgit_tree_link("tree", NULL, "menu", cgit_query_head, cgit_query_sha1, NULL); - html(" "); - cgit_commit_link("commit", NULL, NULL, cgit_query_head, + cgit_commit_link("commit", NULL, "menu", 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) { + cgit_diff_link("diff", NULL, "menu", cgit_query_head, + cgit_query_sha1, cgit_query_sha2, NULL); + + for_each_ref(print_archive_ref, &header); + + html("<h1>branch</h1>\n"); + html("<form method='get' action=''>\n"); + add_hidden_formfields(0, 1, cgit_query_page); + html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); + html("<select name='h' onchange='this.form.submit();'>\n"); + for_each_branch_ref(print_branch_option, cgit_query_head); + html("</select>\n"); + html("</td><td>"); + html("<noscript><input type='submit' id='switch-btn' value='..'/></noscript>\n"); + html("</td></tr></table>"); + html("</form>\n"); + + html("<h1>search</h1>\n"); 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='"); + if (cgit_virtual_root) + html_attr(cgit_fileurl(cgit_query_repo, "log", + cgit_query_path, NULL)); + html("'>\n"); + add_hidden_formfields(1, 0, "log"); + html("<select name='qt'>\n"); + html_option("grep", "log msg", cgit_query_grep); + html_option("author", "author", cgit_query_grep); + html_option("committer", "committer", cgit_query_grep); + html("</select>\n"); + html("<input class='txt' type='text' name='q' value='"); html_attr(cgit_query_search); - html("'/></form>"); + html("'/>\n"); + html("</form>\n"); + } else { + if (!cgit_index_info || html_include(cgit_index_info)) + html(default_info); } - html("</td></tr>"); - html("<tr><td id='content' colspan='2'>"); + + html("</div>\n"); + + html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n"); } + void cgit_print_snapshot_start(const char *mimetype, const char *filename, struct cacheitem *item) {