-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
@@ -153,8 +153,10 @@ static void querystring_cb(const char *name, const char *value) | |||
153 | } else if (!strcmp(name, "name")) { | 153 | } else if (!strcmp(name, "name")) { |
154 | ctx.qry.name = xstrdup(value); | 154 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { | 155 | } else if (!strcmp(name, "mimetype")) { |
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 | } |
158 | } | 160 | } |
159 | 161 | ||
160 | static void prepare_context(struct cgit_context *ctx) | 162 | static void prepare_context(struct cgit_context *ctx) |
@@ -120,8 +120,9 @@ struct cgit_query { | |||
120 | char *mimetype; | 120 | char *mimetype; |
121 | char *url; | 121 | char *url; |
122 | int ofs; | 122 | int ofs; |
123 | int nohead; | 123 | int nohead; |
124 | int showmsg; | ||
124 | }; | 125 | }; |
125 | 126 | ||
126 | struct cgit_config { | 127 | struct cgit_config { |
127 | char *agefile; | 128 | char *agefile; |
@@ -43,10 +43,14 @@ void print_commit(struct commit *commit) | |||
43 | html_link_open(tmp, NULL, NULL); | 43 | html_link_open(tmp, NULL, NULL); |
44 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 44 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
45 | html_link_close(); | 45 | html_link_close(); |
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>"); |
50 | html_txt(info->author); | 54 | html_txt(info->author); |
51 | if (ctx.repo->enable_log_filecount) { | 55 | if (ctx.repo->enable_log_filecount) { |
52 | files = 0; | 56 | files = 0; |
@@ -60,8 +64,19 @@ void print_commit(struct commit *commit) | |||
60 | htmlf("-%d/+%d", rem_lines, add_lines); | 64 | htmlf("-%d/+%d", rem_lines, add_lines); |
61 | } | 65 | } |
62 | } | 66 | } |
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); |
65 | } | 80 | } |
66 | 81 | ||
67 | 82 | ||
@@ -99,10 +114,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
99 | if (pager) | 114 | if (pager) |
100 | html("<table class='list nowrap'>"); | 115 | html("<table class='list nowrap'>"); |
101 | 116 | ||
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) { |
106 | html("<th class='left'>Files</th>"); | 128 | html("<th class='left'>Files</th>"); |
107 | columns++; | 129 | columns++; |
108 | if (ctx.repo->enable_log_linecount) { | 130 | if (ctx.repo->enable_log_linecount) { |
@@ -135,21 +157,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
135 | if (ofs > 0) { | 157 | if (ofs > 0) { |
136 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 158 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
137 | ctx.qry.sha1, ctx.qry.path, | 159 | ctx.qry.sha1, ctx.qry.path, |
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(" "); |
141 | } | 163 | } |
142 | if ((commit = get_revision(&rev)) != NULL) { | 164 | if ((commit = get_revision(&rev)) != NULL) { |
143 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 165 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
144 | ctx.qry.sha1, ctx.qry.path, | 166 | ctx.qry.sha1, ctx.qry.path, |
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 | } |
148 | html("</div>"); | 170 | html("</div>"); |
149 | } else if ((commit = get_revision(&rev)) != NULL) { | 171 | } else if ((commit = get_revision(&rev)) != NULL) { |
150 | html("<tr class='nohover'><td colspan='3'>"); | 172 | html("<tr class='nohover'><td colspan='3'>"); |
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"); |
154 | } | 176 | } |
155 | } | 177 | } |
@@ -57,9 +57,10 @@ static int print_branch(struct refinfo *ref) | |||
57 | 57 | ||
58 | if (!info) | 58 | if (!info) |
59 | return 1; | 59 | return 1; |
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>"); |
63 | 64 | ||
64 | if (ref->object->type == OBJ_COMMIT) { | 65 | if (ref->object->type == OBJ_COMMIT) { |
65 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); | 66 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); |
diff --git a/ui-repolist.c b/ui-repolist.c index c23232c..5833140 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -145,9 +145,9 @@ void cgit_print_repolist() | |||
145 | if (ctx.cfg.enable_index_links) { | 145 | if (ctx.cfg.enable_index_links) { |
146 | html("<td>"); | 146 | html("<td>"); |
147 | cgit_summary_link("summary", NULL, "button", NULL); | 147 | cgit_summary_link("summary", NULL, "button", NULL); |
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); |
151 | html("</td>"); | 151 | html("</td>"); |
152 | } | 152 | } |
153 | html("</tr>\n"); | 153 | html("</tr>\n"); |
diff --git a/ui-shared.c b/ui-shared.c index 224e5f3..dc39e64 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -280,9 +280,10 @@ void cgit_plain_link(char *name, char *title, char *class, char *head, | |||
280 | reporevlink("plain", name, title, class, head, rev, path); | 280 | reporevlink("plain", name, title, class, head, rev, path); |
281 | } | 281 | } |
282 | 282 | ||
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 | { |
286 | char *delim; | 287 | char *delim; |
287 | 288 | ||
288 | delim = repolink(title, class, "log", head, path); | 289 | delim = repolink(title, class, "log", head, path); |
@@ -304,8 +305,13 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
304 | if (ofs > 0) { | 305 | if (ofs > 0) { |
305 | html(delim); | 306 | html(delim); |
306 | html("ofs="); | 307 | html("ofs="); |
307 | htmlf("%d", ofs); | 308 | htmlf("%d", ofs); |
309 | delim = "&"; | ||
310 | } | ||
311 | if (showmsg) { | ||
312 | html(delim); | ||
313 | html("showmsg=1"); | ||
308 | } | 314 | } |
309 | html("'>"); | 315 | html("'>"); |
310 | html_txt(name); | 316 | html_txt(name); |
311 | html("</a>"); | 317 | html("</a>"); |
@@ -567,8 +573,10 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
567 | if (ctx.qry.sha1) | 573 | if (ctx.qry.sha1) |
568 | html_hidden("id", ctx.qry.sha1); | 574 | html_hidden("id", ctx.qry.sha1); |
569 | if (ctx.qry.sha2) | 575 | if (ctx.qry.sha2) |
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 | ||
572 | if (incl_search) { | 580 | if (incl_search) { |
573 | if (ctx.qry.grep) | 581 | if (ctx.qry.grep) |
574 | html_hidden("qt", ctx.qry.grep); | 582 | html_hidden("qt", ctx.qry.grep); |
@@ -633,9 +641,9 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
633 | ctx->qry.head); | 641 | ctx->qry.head); |
634 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 642 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
635 | ctx->qry.sha1, NULL); | 643 | ctx->qry.sha1, NULL); |
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, |
639 | ctx->qry.sha1, NULL); | 647 | ctx->qry.sha1, NULL); |
640 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 648 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
641 | ctx->qry.head, ctx->qry.sha1); | 649 | ctx->qry.head, ctx->qry.sha1); |
diff --git a/ui-shared.h b/ui-shared.h index 3c8a6d0..2ab53ae 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -18,9 +18,9 @@ extern void cgit_tree_link(char *name, char *title, char *class, char *head, | |||
18 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, | 18 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, |
19 | char *rev, char *path); | 19 | char *rev, char *path); |
20 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 20 | 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, |
24 | char *rev); | 24 | char *rev); |
25 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, | 25 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, |
26 | char *rev); | 26 | char *rev); |
@@ -105,9 +105,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
105 | htmlf("</td><td class='ls-size'>%li</td>", size); | 105 | htmlf("</td><td class='ls-size'>%li</td>", size); |
106 | 106 | ||
107 | html("<td>"); | 107 | html("<td>"); |
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"); |
111 | free(name); | 111 | free(name); |
112 | return 0; | 112 | return 0; |
113 | } | 113 | } |