about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-01-17 01:10:39 +0100
committerLars Hjemli2007-01-17 01:10:39 +0100
commit23734c5a2b607dca2d634cafdc63202a687f26d3 (patch)
treea8c240e9299936ffad6dbab335175af51372f32c
parentAdd function cgit_parse_tag() (diff)
downloadcgit-23734c5a2b607dca2d634cafdc63202a687f26d3.tar.gz
cgit-23734c5a2b607dca2d634cafdc63202a687f26d3.zip
Extend repo summary with tag list
Show all tags in the repo below the branch list.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.css8
-rw-r--r--ui-summary.c74
2 files changed, 72 insertions, 10 deletions
diff --git a/cgit.css b/cgit.css index 9112bfe..d94b1b7 100644 --- a/cgit.css +++ b/cgit.css
@@ -8,9 +8,9 @@ body {
8 8
9 9
10h2 { 10h2 {
11 font-size: 100%; 11 font-size: 120%;
12 font-weight: bold; 12 font-weight: bold;
13 margin-bottom: 0.1em; 13 margin-bottom: 0.5em;
14} 14}
15 15
16a { 16a {
@@ -33,9 +33,13 @@ table.list tr {
33table.list tr:hover { 33table.list tr:hover {
34 background: #eeb; 34 background: #eeb;
35} 35}
36table.list tr.nohover:hover {
37 background: white;
38}
36table.list th { 39table.list th {
37 font-weight: normal; 40 font-weight: normal;
38 background: #ddd; 41 background: #ddd;
42 border-top: solid 1px #aaa;
39 border-bottom: solid 1px #aaa; 43 border-bottom: solid 1px #aaa;
40 padding: 0.1em 0.5em 0.1em 0.5em; 44 padding: 0.1em 0.5em 0.1em 0.5em;
41 vertical-align: baseline; 45 vertical-align: baseline;
diff --git a/ui-summary.c b/ui-summary.c index de95053..1591632 100644 --- a/ui-summary.c +++ b/ui-summary.c
@@ -15,6 +15,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
15 struct commitinfo *info; 15 struct commitinfo *info;
16 char buf[256], *url; 16 char buf[256], *url;
17 17
18 strncpy(buf, refname, sizeof(buf));
18 commit = lookup_commit(sha1); 19 commit = lookup_commit(sha1);
19 if (commit && !parse_commit(commit)){ 20 if (commit && !parse_commit(commit)){
20 info = cgit_parse_commit(commit); 21 info = cgit_parse_commit(commit);
@@ -22,26 +23,72 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
22 url = cgit_pageurl(cgit_query_repo, "log", 23 url = cgit_pageurl(cgit_query_repo, "log",
23 fmt("h=%s", refname)); 24 fmt("h=%s", refname));
24 html_link_open(url, NULL, NULL); 25 html_link_open(url, NULL, NULL);
25 strncpy(buf, refname, sizeof(buf));
26 html_txt(buf); 26 html_txt(buf);
27 html_link_close(); 27 html_link_close();
28 html("</td><td>"); 28 html("</td><td>");
29 cgit_print_date(commit->date); 29 cgit_print_date(commit->date);
30 html("</td><td>"); 30 html("</td><td>");
31 html_txt(info->author);
32 html("</td><td>");
31 url = cgit_pageurl(cgit_query_repo, "commit", 33 url = cgit_pageurl(cgit_query_repo, "commit",
32 fmt("id=%s", sha1_to_hex(sha1))); 34 fmt("id=%s", sha1_to_hex(sha1)));
33 html_link_open(url, NULL, NULL); 35 html_link_open(url, NULL, NULL);
34 html_ntxt(80, info->subject); 36 html_ntxt(80, info->subject);
35 html_link_close(); 37 html_link_close();
36 html("</td><td>");
37 html_txt(info->author);
38 html("</td></tr>\n"); 38 html("</td></tr>\n");
39 cgit_free_commitinfo(info); 39 cgit_free_commitinfo(info);
40 } else { 40 } else {
41 html("<tr><td>"); 41 html("<tr><td>");
42 html_txt(buf); 42 html_txt(buf);
43 html("</td><td colspan='3'>");
44 htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
45 html("</td></tr>\n");
46 }
47 return 0;
48}
49
50static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
51 int flags, void *cb_data)
52{
53 struct tag *tag;
54 struct taginfo *info;
55 char buf[256], *page, *url;
56
57 strncpy(buf, refname, sizeof(buf));
58 tag = lookup_tag(sha1);
59 if (tag && !parse_tag(tag) && (info = cgit_parse_tag(tag))){
60 html("<tr><td>");
61 url = cgit_pageurl(cgit_query_repo, "view",
62 fmt("id=%s", sha1_to_hex(sha1)));
63 html_link_open(url, NULL, NULL);
64 html_txt(buf);
65 html_link_close();
66 html("</td><td>");
67 if (info->tagger_date > 0)
68 cgit_print_date(info->tagger_date);
43 html("</td><td>"); 69 html("</td><td>");
44 htmlf("*** bad ref %s", sha1_to_hex(sha1)); 70 if (info->tagger)
71 html(info->tagger);
72 html("</td><td>");
73 if (tag->tagged->type == OBJ_COMMIT)
74 page = "commit";
75 else if (tag->tagged->type == OBJ_TREE)
76 page = "tree";
77 else
78 page = "view";
79
80 url = cgit_pageurl(cgit_query_repo, page,
81 fmt("id=%s", sha1_to_hex(tag->tagged->sha1)));
82 html_link_open(url, NULL, NULL);
83 htmlf("%s %s", type_names[tag->tagged->type],
84 sha1_to_hex(tag->tagged->sha1));
85 html_link_close();
86 html("</td></tr>\n");
87 } else {
88 html("<tr><td>");
89 html_txt(buf);
90 html("</td><td colspan='3'>");
91 htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
45 html("</td></tr>\n"); 92 html("</td></tr>\n");
46 } 93 }
47 return 0; 94 return 0;
@@ -49,13 +96,20 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
49 96
50static void cgit_print_branches() 97static void cgit_print_branches()
51{ 98{
52 html("<table class='list nowrap'>");
53 html("<tr><th class='left'>Branch</th>" 99 html("<tr><th class='left'>Branch</th>"
54 "<th class='left'>Updated</th>" 100 "<th class='left'>Updated</th>"
55 "<th class='left'>Commit subject</th>" 101 "<th class='left'>Author</th>"
56 "<th class='left'>Author</th></tr>\n"); 102 "<th class='left'>Head commit</th></tr>\n");
57 for_each_branch_ref(cgit_print_branch_cb, NULL); 103 for_each_branch_ref(cgit_print_branch_cb, NULL);
58 html("</table>"); 104}
105
106static void cgit_print_tags()
107{
108 html("<tr><th class='left'>Tag</th>"
109 "<th class='left'>Created</th>"
110 "<th class='left'>Author</th>"
111 "<th class='left'>Reference</th></tr>\n");
112 for_each_tag_ref(cgit_print_tag_cb, NULL);
59} 113}
60 114
61void cgit_print_summary() 115void cgit_print_summary()
@@ -63,5 +117,9 @@ void cgit_print_summary()
63 html("<h2>"); 117 html("<h2>");
64 html_txt("Repo summary page"); 118 html_txt("Repo summary page");
65 html("</h2>"); 119 html("</h2>");
120 html("<table class='list nowrap'>");
66 cgit_print_branches(); 121 cgit_print_branches();
122 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
123 cgit_print_tags();
124 html("</table>");
67} 125}