diff --git a/src/main/twirl/diff.scala.html b/src/main/twirl/diff.scala.html index 0753d29..018cd4e 100644 --- a/src/main/twirl/diff.scala.html +++ b/src/main/twirl/diff.scala.html @@ -2,6 +2,7 @@ @import context._ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @diffs.zipWithIndex.map { case (diff, i) => +
@@ -27,7 +28,7 @@ @if(diffs.size > 10 && diff.changeType != ChangeType.MODIFY){ @diff.changeType } else { -
+
} @@ -95,7 +96,7 @@ @diffs.zipWithIndex.map { case (diff, i) => @if(diff.newContent != None || diff.oldContent != None){ if($('#oldText-@i').length > 0){ - diffUsingJS('oldText-@i', 'newText-@i', 'diff-@i'); + diffUsingJS('oldText-@i', 'newText-@i', 'diffText-@i'); } } } diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html index 5a70f9b..49b0157 100644 --- a/src/main/twirl/repo/commit.scala.html +++ b/src/main/twirl/repo/commit.scala.html @@ -46,5 +46,59 @@
+
+
+ +
+ @if(diffs.size == 1){ + Showing 1 changed files + } else { + Showing @diffs.size changed files + } +
+ @html.diff(diffs, repository, Some(commit.id)) } + + diff --git a/src/main/webapp/assets/common/images/page_add.png b/src/main/webapp/assets/common/images/page_add.png new file mode 100644 index 0000000..d5bfa07 --- /dev/null +++ b/src/main/webapp/assets/common/images/page_add.png Binary files differ diff --git a/src/main/webapp/assets/common/images/page_delete.png b/src/main/webapp/assets/common/images/page_delete.png new file mode 100644 index 0000000..3141467 --- /dev/null +++ b/src/main/webapp/assets/common/images/page_delete.png Binary files differ diff --git a/src/main/webapp/assets/common/images/page_edit.png b/src/main/webapp/assets/common/images/page_edit.png new file mode 100644 index 0000000..046811e --- /dev/null +++ b/src/main/webapp/assets/common/images/page_edit.png Binary files differ