-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-log.c | 32 | ||||
-rw-r--r-- | ui-refs.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 12 | ||||
-rw-r--r-- | ui-shared.h | 2 | ||||
-rw-r--r-- | ui-tree.c | 2 |
8 files changed, 45 insertions, 11 deletions
@@ -156,2 +156,4 @@ static void querystring_cb(const char *name, const char *value) | |||
156 | ctx.qry.mimetype = xstrdup(value); | 156 | ctx.qry.mimetype = xstrdup(value); |
157 | } else if (!strcmp(name, "showmsg")) { | ||
158 | ctx.qry.showmsg = atoi(value); | ||
157 | } | 159 | } |
@@ -123,2 +123,3 @@ struct cgit_query { | |||
123 | int nohead; | 123 | int nohead; |
124 | int showmsg; | ||
124 | }; | 125 | }; |
@@ -46,4 +46,8 @@ void print_commit(struct commit *commit) | |||
46 | html("</td><td>"); | 46 | html("</td><td>"); |
47 | if (ctx.qry.showmsg) | ||
48 | html("<u>"); | ||
47 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 49 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
48 | sha1_to_hex(commit->object.sha1)); | 50 | sha1_to_hex(commit->object.sha1)); |
51 | if (ctx.qry.showmsg) | ||
52 | html("</u>"); | ||
49 | html("</td><td>"); | 53 | html("</td><td>"); |
@@ -63,2 +67,13 @@ void print_commit(struct commit *commit) | |||
63 | html("</td></tr>\n"); | 67 | html("</td></tr>\n"); |
68 | if (ctx.qry.showmsg) { | ||
69 | html("<tr class='nohover'><td></td><td><div class='commit-msg'>"); | ||
70 | html_txt(info->msg); | ||
71 | html("</div><br/></td><td></td>"); | ||
72 | if (ctx.repo->enable_log_filecount) { | ||
73 | html("<td></td>"); | ||
74 | if (ctx.repo->enable_log_linecount) | ||
75 | html("<td></td>"); | ||
76 | } | ||
77 | html("</tr>\n"); | ||
78 | } | ||
64 | cgit_free_commitinfo(info); | 79 | cgit_free_commitinfo(info); |
@@ -102,4 +117,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
102 | html("<tr class='nohover'><th class='left'>Age</th>" | 117 | html("<tr class='nohover'><th class='left'>Age</th>" |
103 | "<th class='left'>Commit message</th>" | 118 | "<th class='left'>Commit message"); |
104 | "<th class='left'>Author</th>"); | 119 | if (pager) { |
120 | html(" ("); | ||
121 | cgit_log_link("toggle", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | ||
122 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, | ||
123 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | ||
124 | html(")"); | ||
125 | } | ||
126 | html("</th><th class='left'>Author</th>"); | ||
105 | if (ctx.repo->enable_log_filecount) { | 127 | if (ctx.repo->enable_log_filecount) { |
@@ -138,3 +160,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
138 | ofs - cnt, ctx.qry.grep, | 160 | ofs - cnt, ctx.qry.grep, |
139 | ctx.qry.search); | 161 | ctx.qry.search, ctx.qry.showmsg); |
140 | html(" "); | 162 | html(" "); |
@@ -145,3 +167,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
145 | ofs + cnt, ctx.qry.grep, | 167 | ofs + cnt, ctx.qry.grep, |
146 | ctx.qry.search); | 168 | ctx.qry.search, ctx.qry.showmsg); |
147 | } | 169 | } |
@@ -151,3 +173,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
151 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, | 173 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, |
152 | NULL, NULL); | 174 | NULL, NULL, ctx.qry.showmsg); |
153 | html("</td></tr>\n"); | 175 | html("</td></tr>\n"); |
@@ -60,3 +60,4 @@ static int print_branch(struct refinfo *ref) | |||
60 | html("<tr><td>"); | 60 | html("<tr><td>"); |
61 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL); | 61 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, |
62 | ctx.qry.showmsg); | ||
62 | html("</td><td>"); | 63 | html("</td><td>"); |
diff --git a/ui-repolist.c b/ui-repolist.c index c23232c..5833140 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -148,3 +148,3 @@ void cgit_print_repolist() | |||
148 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, | 148 | cgit_log_link("log", NULL, "button", NULL, NULL, NULL, |
149 | 0, NULL, NULL); | 149 | 0, NULL, NULL, ctx.qry.showmsg); |
150 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); | 150 | cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); |
diff --git a/ui-shared.c b/ui-shared.c index 224e5f3..dc39e64 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, | |||
283 | void cgit_log_link(char *name, char *title, char *class, char *head, | 283 | void cgit_log_link(char *name, char *title, char *class, char *head, |
284 | char *rev, char *path, int ofs, char *grep, char *pattern) | 284 | char *rev, char *path, int ofs, char *grep, char *pattern, |
285 | int showmsg) | ||
285 | { | 286 | { |
@@ -307,2 +308,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
307 | htmlf("%d", ofs); | 308 | htmlf("%d", ofs); |
309 | delim = "&"; | ||
310 | } | ||
311 | if (showmsg) { | ||
312 | html(delim); | ||
313 | html("showmsg=1"); | ||
308 | } | 314 | } |
@@ -570,2 +576,4 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
570 | html_hidden("id2", ctx.qry.sha2); | 576 | html_hidden("id2", ctx.qry.sha2); |
577 | if (ctx.qry.showmsg) | ||
578 | html_hidden("showmsg", "1"); | ||
571 | 579 | ||
@@ -636,3 +644,3 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
636 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 644 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
637 | NULL, NULL, 0, NULL, NULL); | 645 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
638 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 646 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
diff --git a/ui-shared.h b/ui-shared.h index 3c8a6d0..2ab53ae 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -21,3 +21,3 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, | |||
21 | char *rev, char *path, int ofs, char *grep, | 21 | char *rev, char *path, int ofs, char *grep, |
22 | char *pattern); | 22 | char *pattern, int showmsg); |
23 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 23 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
@@ -108,3 +108,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
108 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, | 108 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
109 | fullpath, 0, NULL, NULL); | 109 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
110 | html("</td></tr>\n"); | 110 | html("</td></tr>\n"); |