mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-09 10:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-blame: Make each column into a single table cell

Browse Source 
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
Jeff Smith 2017-10-17 23:17:34 -05:00 committed by Jason A. Donenfeld
parent 2b95c9d49c
commit aafc42d808
2 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cgit.css
View File

@ -330,11 +330,26 @@ div#cgit table.ssdiff td.lineno a:hover {
color: black; color: black;
} }
div#cgit table.blame tr:nth-child(even) { div#cgit table.blame td.hashes,
div#cgit table.blame td.lines,
div#cgit table.blame td.linenumbers {
padding: 0;
}
div#cgit table.blame td.hashes div.alt,
div#cgit table.blame td.lines div.alt {
padding: 0 0.5em 0 0.5em;
}
div#cgit table.blame td.linenumbers div.alt {
padding: 0 0.5em 0 0;
}
div#cgit table.blame div.alt:nth-child(even) {
background: #eee; background: #eee;
} }
div#cgit table.blame tr:nth-child(odd) { div#cgit table.blame div.alt:nth-child(odd) {
background: white; background: white;
} }

58
ui-blame.c
View File

@ -45,11 +45,17 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
{ {
struct blame_origin *suspect = ent->suspect; struct blame_origin *suspect = ent->suspect;
struct object_id *oid = &suspect->commit->object.oid; struct object_id *oid = &suspect->commit->object.oid;
unsigned long line = 0;
char *detail = emit_suspect_detail(suspect); char *detail = emit_suspect_detail(suspect);
html("<span class='sha1'>");
cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail, cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail,
NULL, ctx.qry.head, oid_to_hex(oid), suspect->path); NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
html("</span>");
free(detail); free(detail);
while (line++ < ent->num_lines)
html("\n");
} }
static void emit_blame_entry_linenumber(struct blame_entry *ent) static void emit_blame_entry_linenumber(struct blame_entry *ent)
@ -72,24 +78,6 @@ static void emit_blame_entry_line(struct blame_scoreboard *sb,
html_ntxt(cp, cpend - cp); html_ntxt(cp, cpend - cp);
} }
static void emit_blame_entry(struct blame_scoreboard *sb,
struct blame_entry *ent)
{
html("<tr><td class='sha1 hashes'>");
emit_blame_entry_hash(ent);
html("</td>\n");
if (ctx.cfg.enable_tree_linenumbers) {
html("<td class='linenumbers'><pre>");
emit_blame_entry_linenumber(ent);
html("</pre></td>\n");
}
html("<td class='lines'><pre><code>");
emit_blame_entry_line(sb, ent);
html("</code></pre></td></tr>\n");
}
struct walk_tree_context { struct walk_tree_context {
char *curr_rev; char *curr_rev;
int match_baselen; int match_baselen;
@ -147,16 +135,44 @@ static void print_object(const unsigned char *sha1, const char *path,
return; return;
} }
html("<table class='blame blob'>"); html("<table class='blame blob'>\n<tr>\n");
/* Commit hashes */
html("<td class='hashes'>");
for (ent = sb.ent; ent; ent = ent->next) {
html("<div class='alt'><pre>");
emit_blame_entry_hash(ent);
html("</pre></div>");
}
html("</td>\n");
/* Line numbers */
if (ctx.cfg.enable_tree_linenumbers) {
html("<td class='linenumbers'>");
for (ent = sb.ent; ent; ent = ent->next) {
html("<div class='alt'><pre>");
emit_blame_entry_linenumber(ent);
html("</pre></div>");
}
html("</td>\n");
}
/* Lines */
html("<td class='lines'>");
for (ent = sb.ent; ent; ) { for (ent = sb.ent; ent; ) {
struct blame_entry *e = ent->next; struct blame_entry *e = ent->next;
emit_blame_entry(&sb, ent); html("<div class='alt'><pre><code>");
emit_blame_entry_line(&sb, ent);
html("</code></pre></div>");
free(ent); free(ent);
ent = e; ent = e;
} }
html("</table>\n"); html("</td>\n");
free((void *)sb.final_buf); free((void *)sb.final_buf);
html("</tr>\n</table>\n");
cgit_print_layout_end(); cgit_print_layout_end();
} }