author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:37:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:37:37 (UTC) |
commit | 3c32fe07717f27fc891b66ccd06057fb810d03ad (patch) (unidiff) | |
tree | 04897b3eac6432c43284e7da79161e47856d078b /ui-tree.c | |
parent | 9c8be943f72b6f1bda5a31ce401899c3dd734e98 (diff) | |
parent | ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3 (diff) | |
download | cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.zip cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.gz cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.bz2 |
Merge branch 'full-log'
Conflicts:
cgit.c
cgit.h
-rw-r--r-- | ui-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -85,49 +85,49 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
85 | } | 85 | } |
86 | 86 | ||
87 | html("<tr><td class='ls-mode'>"); | 87 | html("<tr><td class='ls-mode'>"); |
88 | cgit_print_filemode(mode); | 88 | cgit_print_filemode(mode); |
89 | html("</td><td>"); | 89 | html("</td><td>"); |
90 | if (S_ISGITLINK(mode)) { | 90 | if (S_ISGITLINK(mode)) { |
91 | htmlf("<a class='ls-mod' href='"); | 91 | htmlf("<a class='ls-mod' href='"); |
92 | html_attr(fmt(ctx.repo->module_link, | 92 | html_attr(fmt(ctx.repo->module_link, |
93 | name, | 93 | name, |
94 | sha1_to_hex(sha1))); | 94 | sha1_to_hex(sha1))); |
95 | html("'>"); | 95 | html("'>"); |
96 | html_txt(name); | 96 | html_txt(name); |
97 | html("</a>"); | 97 | html("</a>"); |
98 | } else if (S_ISDIR(mode)) { | 98 | } else if (S_ISDIR(mode)) { |
99 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, | 99 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
100 | curr_rev, fullpath); | 100 | curr_rev, fullpath); |
101 | } else { | 101 | } else { |
102 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, | 102 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
103 | curr_rev, fullpath); | 103 | curr_rev, fullpath); |
104 | } | 104 | } |
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 | } |
114 | 114 | ||
115 | static void ls_head() | 115 | static void ls_head() |
116 | { | 116 | { |
117 | html("<table summary='tree listing' class='list'>\n"); | 117 | html("<table summary='tree listing' class='list'>\n"); |
118 | html("<tr class='nohover'>"); | 118 | html("<tr class='nohover'>"); |
119 | html("<th class='left'>Mode</th>"); | 119 | html("<th class='left'>Mode</th>"); |
120 | html("<th class='left'>Name</th>"); | 120 | html("<th class='left'>Name</th>"); |
121 | html("<th class='right'>Size</th>"); | 121 | html("<th class='right'>Size</th>"); |
122 | html("<th/>"); | 122 | html("<th/>"); |
123 | html("</tr>\n"); | 123 | html("</tr>\n"); |
124 | header = 1; | 124 | header = 1; |
125 | } | 125 | } |
126 | 126 | ||
127 | static void ls_tail() | 127 | static void ls_tail() |
128 | { | 128 | { |
129 | if (!header) | 129 | if (!header) |
130 | return; | 130 | return; |
131 | html("</table>\n"); | 131 | html("</table>\n"); |
132 | header = 0; | 132 | header = 0; |
133 | } | 133 | } |