diff options
-rw-r--r-- | cgit.css | 6 | ||||
-rwxr-xr-x | tests/t0105-commit.sh | 2 | ||||
-rw-r--r-- | ui-commit.c | 4 | ||||
-rw-r--r-- | ui-log.h | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/cgit.css b/cgit.css index f844efa..957d5aa 100644 --- a/cgit.css +++ b/cgit.css | |||
@@ -500,6 +500,12 @@ a.deco { | |||
500 | background-color: #ff8888; | 500 | background-color: #ff8888; |
501 | border: solid 1px #770000; | 501 | border: solid 1px #770000; |
502 | } | 502 | } |
503 | |||
504 | div.commit-subject a { | ||
505 | margin-left: 1em; | ||
506 | font-size: 75%; | ||
507 | } | ||
508 | |||
503 | table.stats { | 509 | table.stats { |
504 | border: solid 1px black; | 510 | border: solid 1px black; |
505 | border-collapse: collapse; | 511 | border-collapse: collapse; |
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh index a864612..ae794c8 100755 --- a/tests/t0105-commit.sh +++ b/tests/t0105-commit.sh | |||
@@ -9,7 +9,7 @@ run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' | |||
9 | run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' | 9 | run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' |
10 | 10 | ||
11 | run_test 'find commit subject' ' | 11 | run_test 'find commit subject' ' |
12 | grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp | 12 | grep -e "<div class=.commit-subject.>commit 5<" trash/tmp |
13 | ' | 13 | ' |
14 | 14 | ||
15 | run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' | 15 | run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' |
diff --git a/ui-commit.c b/ui-commit.c index a6a85a4..41ce70e 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | #include "ui-diff.h" | 12 | #include "ui-diff.h" |
13 | #include "ui-log.h" | ||
13 | 14 | ||
14 | void cgit_print_commit(char *hex) | 15 | void cgit_print_commit(char *hex) |
15 | { | 16 | { |
@@ -34,6 +35,8 @@ void cgit_print_commit(char *hex) | |||
34 | } | 35 | } |
35 | info = cgit_parse_commit(commit); | 36 | info = cgit_parse_commit(commit); |
36 | 37 | ||
38 | load_ref_decorations(); | ||
39 | |||
37 | html("<table summary='commit info' class='commit-info'>\n"); | 40 | html("<table summary='commit info' class='commit-info'>\n"); |
38 | html("<tr><th>author</th><td>"); | 41 | html("<tr><th>author</th><td>"); |
39 | html_txt(info->author); | 42 | html_txt(info->author); |
@@ -87,6 +90,7 @@ void cgit_print_commit(char *hex) | |||
87 | html("</table>\n"); | 90 | html("</table>\n"); |
88 | html("<div class='commit-subject'>"); | 91 | html("<div class='commit-subject'>"); |
89 | html_txt(info->subject); | 92 | html_txt(info->subject); |
93 | show_commit_decorations(commit); | ||
90 | html("</div>"); | 94 | html("</div>"); |
91 | html("<div class='commit-msg'>"); | 95 | html("<div class='commit-msg'>"); |
92 | html_txt(info->msg); | 96 | html_txt(info->msg); |
diff --git a/ui-log.h b/ui-log.h index 877e40e..6034055 100644 --- a/ui-log.h +++ b/ui-log.h | |||
@@ -3,5 +3,6 @@ | |||
3 | 3 | ||
4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, | 4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, |
5 | char *pattern, char *path, int pager); | 5 | char *pattern, char *path, int pager); |
6 | extern void show_commit_decorations(struct commit *commit); | ||
6 | 7 | ||
7 | #endif /* UI_LOG_H */ | 8 | #endif /* UI_LOG_H */ |