From 1b3e2b1b9c7ea3d2b04ebd30ce1a740b874a2eb2 Mon Sep 17 00:00:00 2001 From: Philippe Bourdin Date: Thu, 17 Aug 2017 01:25:17 +0200 Subject: [PATCH 1/4] Added 'Blame' button in commit overview. --- themes/bootstrap3/twig/commit.twig | 1 + themes/default/twig/commit.twig | 1 + 2 files changed, 2 insertions(+) diff --git a/themes/bootstrap3/twig/commit.twig b/themes/bootstrap3/twig/commit.twig index 7a9863ee..69c23daa 100644 --- a/themes/bootstrap3/twig/commit.twig +++ b/themes/bootstrap3/twig/commit.twig @@ -41,6 +41,7 @@
History + Blame View file @ {{ commit.shortHash }}
diff --git a/themes/default/twig/commit.twig b/themes/default/twig/commit.twig index c80a05fb..0b1ef980 100644 --- a/themes/default/twig/commit.twig +++ b/themes/default/twig/commit.twig @@ -40,6 +40,7 @@
History + Blame View file @ {{ commit.shortHash }}
From 83c59fac63e62ae8106e8a2cfaf5f9086cb87114 Mon Sep 17 00:00:00 2001 From: Philippe Bourdin Date: Thu, 17 Aug 2017 01:26:36 +0200 Subject: [PATCH 2/4] Added 'Patch Log' button to commits overview. --- themes/bootstrap3/twig/commit.twig | 1 + themes/default/twig/commit.twig | 1 + 2 files changed, 2 insertions(+) diff --git a/themes/bootstrap3/twig/commit.twig b/themes/bootstrap3/twig/commit.twig index 69c23daa..b070b17f 100644 --- a/themes/bootstrap3/twig/commit.twig +++ b/themes/bootstrap3/twig/commit.twig @@ -41,6 +41,7 @@
History + Patch Log Blame View file @ {{ commit.shortHash }}
diff --git a/themes/default/twig/commit.twig b/themes/default/twig/commit.twig index 0b1ef980..3cd5266a 100644 --- a/themes/default/twig/commit.twig +++ b/themes/default/twig/commit.twig @@ -40,6 +40,7 @@
History + Patch Log Blame View file @ {{ commit.shortHash }}
From c3aced6791010a6f0dd38f13a1bd09b26fb4341f Mon Sep 17 00:00:00 2001 From: Philippe Bourdin Date: Thu, 17 Aug 2017 01:28:17 +0200 Subject: [PATCH 3/4] Sorted buttons in the same way as displayed in the commit overview (which links to this page). --- themes/bootstrap3/twig/file.twig | 6 +++--- themes/default/twig/file.twig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/bootstrap3/twig/file.twig b/themes/bootstrap3/twig/file.twig index 53b65377..ba6ccc46 100644 --- a/themes/bootstrap3/twig/file.twig +++ b/themes/bootstrap3/twig/file.twig @@ -12,10 +12,10 @@
- Raw - Blame - Patch Log History + Patch Log + Blame + Raw
{% if fileType == 'image' %} diff --git a/themes/default/twig/file.twig b/themes/default/twig/file.twig index 34ea1807..319bb79f 100644 --- a/themes/default/twig/file.twig +++ b/themes/default/twig/file.twig @@ -12,10 +12,10 @@
- Raw - Blame - Patch Log History + Patch Log + Blame + Raw
{% if fileType == 'image' %} From 2d6314fbba5400da5550dcf2ed8cb45253e39307 Mon Sep 17 00:00:00 2001 From: Philippe Bourdin Date: Thu, 17 Aug 2017 01:36:48 +0200 Subject: [PATCH 4/4] Need to adjust the case test to the last commit. --- tests/InterfaceTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php index 92440e7f..3022043d 100644 --- a/tests/InterfaceTest.php +++ b/tests/InterfaceTest.php @@ -221,13 +221,13 @@ public function testBlobPage() $this->assertTrue($client->getResponse()->isOk()); $this->assertCount(1, $crawler->filter('.breadcrumb .active:contains("test.php")')); - $this->assertEquals('/GitTest/raw/master/test.php', + $this->assertEquals('/GitTest/commits/master/test.php', $crawler->filter('.source-header .btn-group a')->eq(0)->attr('href')); - $this->assertEquals('/GitTest/blame/master/test.php', - $crawler->filter('.source-header .btn-group a')->eq(1)->attr('href')); $this->assertEquals('/GitTest/logpatch/master/test.php', - $crawler->filter('.source-header .btn-group a')->eq(2)->attr('href')); - $this->assertEquals('/GitTest/commits/master/test.php', + $crawler->filter('.source-header .btn-group a')->eq(1)->attr('href')); + $this->assertEquals('/GitTest/blame/master/test.php', + $crawler->filter('.source-header .btn-group a')->eq(2)->attr('href')); + $this->assertEquals('/GitTest/raw/master/test.php', $crawler->filter('.source-header .btn-group a')->eq(3)->attr('href')); }