From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Nieder Subject: Re: [PATCH 2/3] gitweb: decorate a bit more remotes Date: Mon, 20 Dec 2010 14:02:03 -0600 Message-ID: <20101220200203.GA24163@burratino> References: <1292871681-4818-1-git-send-email-sylvain@abstraction.fr> <1292871681-4818-3-git-send-email-sylvain@abstraction.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org, Jakub Narebski , John 'Warthog9' Hawley To: Sylvain Rabot X-From: git-owner@vger.kernel.org Mon Dec 20 21:02:26 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PUlwA-0002Df-8D for gcvg-git-2@lo.gmane.org; Mon, 20 Dec 2010 21:02:26 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933112Ab0LTUCV (ORCPT ); Mon, 20 Dec 2010 15:02:21 -0500 Received: from mail-fx0-f43.google.com ([209.85.161.43]:51450 "EHLO mail-fx0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933104Ab0LTUCU (ORCPT ); Mon, 20 Dec 2010 15:02:20 -0500 Received: by fxm18 with SMTP id 18so3489836fxm.2 for ; Mon, 20 Dec 2010 12:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=Etl1F5ZJbrkvC4Plm200Iw90sGDu2KJ7ga41Ewqw8Fk=; b=ijOpzGWQtrxcgkSj8qP1J8ppu+2OQFqs55eLQukblww+d3hl/ixGC/78J7ASyHpMgF 2yLel1wIhp1ywtNgwwbwI2kofledh0IgEWIYAjBwlAb3D/yosmy52t6XX3HDUw7ANpmh DgYchOEmLV4aO/PIn5+PwMRCsQAkO6wyHGF0Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=jwJq9LmSskvteunlIduhzLn1PmHxOr2xqLT6fzbPPQHSDt+GKY5VVND80rGjafyLkx 5KISMhicb1ZOMJioE556tm3Gxi/QxsaNFsDemjauD0rgALwrsDdV4qerYsYDTaMHULl0 0hOkkdg5X7rblrVwdMphkvl5w9vtp2HCuVLtg= Received: by 10.223.86.194 with SMTP id t2mr590117fal.40.1292875338898; Mon, 20 Dec 2010 12:02:18 -0800 (PST) Received: from burratino (c-76-126-174-171.hsd1.ca.comcast.net [76.126.174.171]) by mx.google.com with ESMTPS id n1sm1083203fam.40.2010.12.20.12.02.15 (version=SSLv3 cipher=RC4-MD5); Mon, 20 Dec 2010 12:02:17 -0800 (PST) Content-Disposition: inline In-Reply-To: <1292871681-4818-3-git-send-email-sylvain@abstraction.fr> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Sylvain Rabot wrote: > --- a/gitweb/gitweb.perl > +++ b/gitweb/gitweb.perl > @@ -5127,13 +5127,13 @@ sub git_remote_block { > > if (defined $fetch) { > if ($fetch eq $push) { > - $urls_table .= format_repo_url("URL", $fetch); > + $urls_table .= format_repo_url("URL:", $fetch); > } else { > - $urls_table .= format_repo_url("Fetch URL", $fetch); > - $urls_table .= format_repo_url("Push URL", $push) if defined $push; > + $urls_table .= format_repo_url("Fetch URL:", $fetch); > + $urls_table .= format_repo_url("Push URL:", $push) if defined $push; This makes the formatting of the remote URLs table inconsistent with the other projects_list table (namely the description ... homepage URL ... repository URL ... owner ... last change ... table on a repository's summary page). Is that the right thing to do? If so, maybe something like the following would make sense. -- 8< -- From: Sylvain Rabot Date: Mon, 20 Dec 2010 20:01:20 +0100 Subject: gitweb: decorate a bit more remotes Put the text "URL" introducing a remote's url in bold and follow it with a colon. This makes the url list easier to visually scan. Signed-off-by: Sylvain Rabot Signed-off-by: Jonathan Nieder --- The justification above is totally made up; I have not checked to see whether it makes the table easier or harder to read. Also: untested. Maybe the $url part should be esc_url($url)? gitweb/gitweb.perl | 16 ++++++++++------ gitweb/static/gitweb.css | 13 +++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index d521c93..b870b56 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3862,7 +3862,11 @@ sub git_print_header_div { sub format_repo_url { my ($name, $url) = @_; - return "$name$url\n"; + my $row = ""; + $row .= ($name eq "" ? "" : "$name"); + $row .= "$url"; + $row .= "\n"; + return $row; } # Group output by placing it in a DIV element and adding a header. @@ -5122,7 +5126,7 @@ sub git_remote_block { my $fetch = $rdata->{'fetch'}; my $push = $rdata->{'push'}; - my $urls_table = "\n" ; + my $urls_table = "
\n" ; if (defined $fetch) { if ($fetch eq $push) { @@ -5368,10 +5372,10 @@ sub git_summary { print "
 
\n"; print "
\n" . - "\n" . - "\n"; + "\n" . + "\n"; if (defined $cd{'rfc2822'}) { - print "\n"; + print "\n"; } # use per project git URL list in $projectroot/$project/cloneurl @@ -5390,7 +5394,7 @@ sub git_summary { if ($show_ctags) { my $ctags = git_get_project_ctags($project); my $cloud = git_populate_project_tagcloud($ctags); - print "\n\n
description" . esc_html($descr) . "
owner" . esc_html($owner) . "
description" . esc_html($descr) . "
owner" . esc_html($owner) . "
last change$cd{'rfc2822'}
last change$cd{'rfc2822'}
Content tags:
"; + print "
Content tags:
"; print "		" unless %$ctags; print "
Add:
"; print "		" if %$ctags; diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css index 79d7eeb..feb09e5 100644 --- a/gitweb/static/gitweb.css +++ b/gitweb/static/gitweb.css @@ -579,6 +579,19 @@ div.remote { display: inline-block; } +/* + * URL: http://www.example.com/ + * Fetch URL: http://www.example.com/ + * Push URL: http://www.example.com/ + */ +table.remote_urls tr.metadata_url td.metadata_tag:after { + content: ":" +} + +table.remote_urls tr.metadata_url td.metadata_tag { + font-weight: bold; +} + /* Style definition generated by highlight 2.4.5, http://www.andre-simon.de/ */ /* Highlighting theme definition: */ -- 1.7.2.3.554.gc9b5c.dirty