List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [PATCH 2/2] ui-shared: emit root-desc-html and repo.desc-html after their text counterparts
Date: Sat, 23 Jun 2018 11:28:38 +0100	[thread overview]
Message-ID: <20180623102838.GD6584@john.keeping.me.uk> (raw)
In-Reply-To: <152956360719.741.17537017810992910496.stgit@mail.warmcat.com>

On Thu, Jun 21, 2018 at 02:46:47PM +0800, Andy Green wrote:
> Where root-desc and repo.desc are used in the header region, also
> emit their html counterparts afterwards if they are defined.
> 
> Where root-desc are repo.desc are used outside the header,
> eg in the repo list, leave it as it is without adding any
> related html.
> 
> Signed-off-by: Andy Green <andy at warmcat.com>
> ---

I think this should be squashed with the previous patch since it makes
it easier to see what's going on.

When I read your initial email on this, I thought we could introduce a
new HTML version of the description and use that *instead of* the plain
text one if the HTML variant is available.

Having looked at the current implementation of repo->desc, I think
that's desirable because the reason we don't have a null-check for that
in the context below is that it will be set to "[no description]" if no
other value is provided.  If a user has set repo->desc_html, I don't
think we want to print "[no description]" before showing the HTML
description!

>  ui-shared.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/ui-shared.c b/ui-shared.c
> index c8f4d8f..a9ec430 100644
> --- a/ui-shared.c
> +++ b/ui-shared.c
> @@ -1013,11 +1013,15 @@ static void print_header(void)
>  	html("<tr><td class='sub'>");
>  	if (ctx.repo) {
>  		html_txt(ctx.repo->desc);
> +		if (ctx.repo->desc_html)
> +			html(ctx.repo->desc_html);
>  		html("</td><td class='sub right'>");
>  		html_txt(ctx.repo->owner);
>  	} else {
>  		if (ctx.cfg.root_desc)
>  			html_txt(ctx.cfg.root_desc);
> +		if (ctx.cfg.root_desc_html)
> +			html(ctx.cfg.root_desc_html);
>  	}
>  	html("</td></tr></table>\n");
>  }


  reply	other threads:[~2018-06-23 10:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-20  9:04 repo.desc as raw html? andy
2018-06-20 13:17 ` [PATCH] noheader: place branch combo on tabs if no header andy
2018-06-23 10:50   ` john
2018-06-21  6:46 ` [PATCH 1/2] config: add root-desc-html and repo.desc-html andy
2018-06-21  6:46 ` [PATCH 2/2] ui-shared: emit root-desc-html and repo.desc-html after their text counterparts andy
2018-06-23 10:28   ` john [this message]
2018-06-23 10:33     ` andy
2018-06-23 10:53       ` john
2018-06-23 11:08         ` andy
2018-06-23 16:33           ` john

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=20180623102838.GD6584@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).