From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 3/4] ui-blame: Make each column into a single table cell
Date: Sat, 21 Oct 2017 15:34:54 +0100 [thread overview]
Message-ID: <20171021143454.GE2393@john.keeping.me.uk> (raw)
In-Reply-To: <20171018041735.31592-4-whydoubt@gmail.com>
On Tue, Oct 17, 2017 at 11:17:34PM -0500, Jeff Smith wrote:
> Signed-off-by: Jeff Smith <whydoubt at gmail.com>
Reviewed-by: John Keeping <john at keeping.me.uk>
> ---
> cgit.css | 19 +++++++++++++++++--
> ui-blame.c | 58 +++++++++++++++++++++++++++++++++++++---------------------
> 2 files changed, 54 insertions(+), 23 deletions(-)
>
> diff --git a/cgit.css b/cgit.css
> index 893ebeb..20b7e86 100644
> --- a/cgit.css
> +++ b/cgit.css
> @@ -330,11 +330,26 @@ div#cgit table.ssdiff td.lineno a:hover {
> 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;
> }
>
> -div#cgit table.blame tr:nth-child(odd) {
> +div#cgit table.blame div.alt:nth-child(odd) {
> background: white;
> }
>
> diff --git a/ui-blame.c b/ui-blame.c
> index 9b84147..f506616 100644
> --- a/ui-blame.c
> +++ b/ui-blame.c
> @@ -45,11 +45,17 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
> {
> struct blame_origin *suspect = ent->suspect;
> struct object_id *oid = &suspect->commit->object.oid;
> + unsigned long line = 0;
>
> char *detail = emit_suspect_detail(suspect);
> + html("<span class='sha1'>");
> cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail,
> NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
> + html("</span>");
> free(detail);
> +
> + while (line++ < ent->num_lines)
> + html("\n");
> }
>
> 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);
> }
>
> -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 {
> char *curr_rev;
> int match_baselen;
> @@ -147,16 +135,44 @@ static void print_object(const unsigned char *sha1, const char *path,
> 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; ) {
> 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);
> ent = e;
> }
> - html("</table>\n");
> + html("</td>\n");
> +
> free((void *)sb.final_buf);
>
> + html("</tr>\n</table>\n");
> +
> cgit_print_layout_end();
> }
>
next prev parent reply other threads:[~2017-10-21 14:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 4:17 [PATCH 0/4] Add ui-blame syntax highlighting whydoubt
2017-10-18 4:17 ` [PATCH 1/4] ui-blame: Distinguish hashes column from lines column whydoubt
2017-10-21 14:33 ` john
2017-10-18 4:17 ` [PATCH 2/4] ui-blame: Break out emit_blame_entry into component methods whydoubt
2017-10-21 14:33 ` john
2017-10-18 4:17 ` [PATCH 3/4] ui-blame: Make each column into a single table cell whydoubt
2017-10-21 14:34 ` john [this message]
2017-10-18 4:17 ` [PATCH 4/4] ui-blame: Allow syntax highlighting whydoubt
2017-10-21 14:43 ` john
2017-10-21 21:53 ` whydoubt
2017-10-24 14:30 ` Jason
2017-10-29 2:23 ` [PATCH 4/4 v2] " whydoubt
2017-10-29 2:26 ` whydoubt
2017-10-29 2:43 ` [PATCH 4/4 v3] " whydoubt
2017-10-29 22:23 ` Jason
2017-11-05 12:36 ` john
2018-01-19 10:41 ` [PATCH 0/4] Add ui-blame " Jason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171021143454.GE2393@john.keeping.me.uk \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).