| -rw-r--r-- | ui-shared.c | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/ui-shared.c b/ui-shared.c index 1bb30c2..4f28512 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -283,3 +283,4 @@ void cgit_plain_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 *grep, char *pattern) + char *rev, char *path, int ofs, char *grep, char *pattern, + int showmsg) { @@ -307,2 +308,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head, htmlf("%d", ofs); + delim = "&"; + } + if (showmsg) { + html(delim); + html("showmsg=1"); } @@ -373,7 +379,10 @@ void cgit_object_link(struct object *obj) { - char *page, *rev, *name; + char *page, *shortrev, *fullrev, *name; + fullrev = sha1_to_hex(obj->sha1); + shortrev = xstrdup(fullrev); + shortrev[10] = '\0'; if (obj->type == OBJ_COMMIT) { - cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, - ctx.qry.head, sha1_to_hex(obj->sha1)); + cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, + ctx.qry.head, fullrev); return; @@ -385,5 +394,4 @@ void cgit_object_link(struct object *obj) page = "blob"; - rev = sha1_to_hex(obj->sha1); - name = fmt("%s %s", typename(obj->type), rev); - reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); + name = fmt("%s %s...", typename(obj->type), shortrev); + reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); } @@ -576,2 +584,4 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) html_hidden("id2", ctx.qry.sha2); + if (ctx.qry.showmsg) + html_hidden("showmsg", "1"); @@ -585,5 +595,7 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) +const char *fallback_cmd = "repolist"; + char *hc(struct cgit_cmd *cmd, const char *page) { - return (strcmp(cmd->name, page) ? NULL : "active"); + return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); } @@ -594,2 +606,5 @@ void cgit_print_pageheader(struct cgit_context *ctx) + if (!cmd && ctx->repo) + fallback_cmd = "summary"; + html("<table id='header'>\n"); @@ -642,3 +657,3 @@ void cgit_print_pageheader(struct cgit_context *ctx) cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, - NULL, NULL, 0, NULL, NULL); + NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, @@ -718,4 +733,3 @@ void cgit_print_snapshot_links(const char *repo, const char *head, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, (char *)head, - (char *)hex, filename); + cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); html("<br/>"); |