author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
commit | 979c460e7f71d153ae79da67b8b21c3412f0fe02 (patch) (unidiff) | |
tree | 6da9ffb66ed0a68205e6644cb7e2b4652d6684be /ui-ssdiff.c | |
parent | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (diff) | |
parent | 0141b9f889bbaa1fe474f9a98dd377138ac73054 (diff) | |
download | cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.zip cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.gz cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.bz2 |
Merge branch 'br/misc'
* br/misc:
Use transparent background for the cgit logo
ssdiff: anchors for ssdiff
implement repo.logo and repo.logo-link
-rw-r--r-- | ui-ssdiff.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 408e620..2481585 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c | |||
@@ -2,4 +2,5 @@ | |||
2 | #include "html.h" | 2 | #include "html.h" |
3 | #include "ui-shared.h" | 3 | #include "ui-shared.h" |
4 | #include "ui-diff.h" | ||
4 | 5 | ||
5 | extern int use_ssdiff; | 6 | extern int use_ssdiff; |
@@ -192,4 +193,5 @@ static void print_ssdiff_line(char *class, | |||
192 | { | 193 | { |
193 | char *lcs = NULL; | 194 | char *lcs = NULL; |
195 | |||
194 | if (old_line) | 196 | if (old_line) |
195 | old_line = replace_tabs(old_line + 1); | 197 | old_line = replace_tabs(old_line + 1); |
@@ -198,9 +200,15 @@ static void print_ssdiff_line(char *class, | |||
198 | if (individual_chars && old_line && new_line) | 200 | if (individual_chars && old_line && new_line) |
199 | lcs = longest_common_subsequence(old_line, new_line); | 201 | lcs = longest_common_subsequence(old_line, new_line); |
200 | html("<tr>"); | 202 | html("<tr>\n"); |
201 | if (old_line_no > 0) | 203 | if (old_line_no > 0) { |
202 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | 204 | struct diff_filespec *old_file = cgit_get_current_old_file(); |
203 | old_line_no, class); | 205 | char *lineno_str = fmt("n%d", old_line_no); |
204 | else if (old_line) | 206 | char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); |
207 | html("<td class='lineno'><a class='no' href='"); | ||
208 | html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str)); | ||
209 | htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); | ||
210 | html("</td>"); | ||
211 | htmlf("<td class='%s'>", class); | ||
212 | } else if (old_line) | ||
205 | htmlf("<td class='lineno'></td><td class='%s'>", class); | 213 | htmlf("<td class='lineno'></td><td class='%s'>", class); |
206 | else | 214 | else |
@@ -213,9 +221,15 @@ static void print_ssdiff_line(char *class, | |||
213 | } | 221 | } |
214 | 222 | ||
215 | html("</td>"); | 223 | html("</td>\n"); |
216 | if (new_line_no > 0) | 224 | if (new_line_no > 0) { |
217 | htmlf("<td class='lineno'>%d</td><td class='%s'>", | 225 | struct diff_filespec *new_file = cgit_get_current_new_file(); |
218 | new_line_no, class); | 226 | char *lineno_str = fmt("n%d", new_line_no); |
219 | else if (new_line) | 227 | char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); |
228 | html("<td class='lineno'><a class='no' href='"); | ||
229 | html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str)); | ||
230 | htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); | ||
231 | html("</td>"); | ||
232 | htmlf("<td class='%s'>", class); | ||
233 | } else if (new_line) | ||
220 | htmlf("<td class='lineno'></td><td class='%s'>", class); | 234 | htmlf("<td class='lineno'></td><td class='%s'>", class); |
221 | else | 235 | else |