All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stephen Boyd <bebarino@gmail.com>,
	git@vger.kernel.org, Martin Koegler <mkoegler@auto.tuwien.ac.at>
Subject: [PATCH 2/2] gitweb: Add link to other blame implementation in blame views
Date: Tue, 1 Dec 2009 17:54:26 +0100	[thread overview]
Message-ID: <200912011754.27455.jnareb@gmail.com> (raw)
In-Reply-To: <200912011751.12172.jnareb@gmail.com>

Add link to 'blame_incremental' action (which requires JavaScript) in
'blame' view, and add link to 'blame' action in 'blame_incremental'
view.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
 gitweb/gitweb.perl |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index bb2d29c..ca36761 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -5006,6 +5006,17 @@ sub git_blame_common {
 	my $formats_nav =
 		$cgi->a({-href => href(action=>"blob", -replay=>1)},
 		        "blob") .
+		" | ";
+	if ($format eq 'incremental') {
+		$formats_nav .=
+			$cgi->a({-href => href(action=>"blame", javascript=>0, -replay=>1)},
+			        "blame") . " (non-incremental)";
+	} else {
+		$formats_nav .=
+			$cgi->a({-href => href(action=>"blame_incremental", -replay=>1)},
+			        "blame") . " (incremental)";
+	}
+	$formats_nav .=
 		" | " .
 		$cgi->a({-href => href(action=>"history", -replay=>1)},
 		        "history") .
-- 
1.6.5.3

  parent reply	other threads:[~2009-12-01 16:59 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-19 19:44 [PATCH 0/2] jn/gitweb-blame fixes Stephen Boyd
2009-11-19 19:44 ` [PATCH 1/2] gitweb.js: fix null object exception in initials calculation Stephen Boyd
2009-11-19 21:40   ` Jakub Narebski
2009-11-19 22:48     ` Stephen Boyd
2009-11-19 19:44 ` [PATCH 2/2] gitweb.js: use unicode encoding for nbsp instead of html entity Stephen Boyd
2009-11-19 23:00   ` Jakub Narebski
2009-11-20  1:00     ` Stephen Boyd
2009-11-25  3:51   ` [PATCHv2 2/2] gitweb.js: fix padLeftStr() and its usage Stephen Boyd
2009-11-19 23:05 ` [PATCH 0/2] jn/gitweb-blame fixes Jakub Narebski
2009-11-20  1:00   ` Stephen Boyd
2009-11-20  4:05     ` Stephen Boyd
2009-11-21  0:32       ` Jakub Narebski
2009-11-21 14:56         ` Jakub Narebski
2009-11-25  0:45           ` [PATCH] gitweb.js: Harden setting blamed commit info in incremental blame Jakub Narebski
2009-11-25  1:01             ` Nanako Shiraishi
2009-11-25  1:13               ` Jakub Narebski
2009-11-25  4:01             ` Stephen Boyd
2009-11-25 14:36               ` Jakub Narebski
2009-11-25 20:55                 ` Jakub Narebski
2009-11-25 21:39                   ` Junio C Hamano
2009-11-25 23:28                     ` Jakub Narebski
2009-11-26  0:34                       ` Junio C Hamano
2009-11-26  0:59                         ` Jakub Narebski
2009-11-26 20:12                           ` [RFC/PATCH] gitweb: Make linking to actions requiring JavaScript a feature Jakub Narebski
2009-11-26 20:34                             ` Junio C Hamano
2009-11-26 21:24                               ` Jakub Narebski
2009-11-27  2:39                                 ` Junio C Hamano
2009-11-27 15:41                                   ` Jakub Narebski
2009-11-27 18:29                                     ` Junio C Hamano
2009-12-01  1:18                                       ` Junio C Hamano
2009-12-01 16:51                                         ` Jakub Narebski
2009-12-01 16:52                                           ` [PATCH 1/2] " Jakub Narebski
2009-12-01 16:54                                           ` Jakub Narebski [this message]
2009-12-07  1:04                 ` [PATCH] gitweb.js: Harden setting blamed commit info in incremental blame Stephen Boyd
2009-12-07  1:19                   ` Stephen Boyd
2009-12-08 16:29                     ` PATCH/RFC] gitweb.js: Workaround for IE8 bug Jakub Narebski
2009-12-08 21:56                       ` Stephen Boyd
2009-12-08 22:24                         ` Jakub Narebski
2009-12-08 22:32                         ` Jakub Narebski
2009-12-09  0:08                           ` Stephen Boyd
2009-11-23  4:52         ` [PATCH 0/2] jn/gitweb-blame fixes Stephen Boyd

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=200912011754.27455.jnareb@gmail.com \
    --to=jnareb@gmail.com \
    --cc=bebarino@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mkoegler@auto.tuwien.ac.at \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.