- @(activity.activityType match {
- case "open_issue" => detailActivity(activity, "activity-issue.png")
- case "comment_issue" => detailActivity(activity, "activity-comment.png")
- case "close_issue" => detailActivity(activity, "activity-issue-close.png")
- case "reopen_issue" => detailActivity(activity, "activity-issue-reopen.png")
- case "open_pullreq" => detailActivity(activity, "activity-merge.png")
- case "merge_pullreq" => detailActivity(activity, "activity-merge.png")
- case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
- case "create_branch" => simpleActivity(activity, "activity-branch.png")
- case "delete_branch" => simpleActivity(activity, "activity-delete.png")
- case "create_tag" => simpleActivity(activity, "activity-tag.png")
- case "delete_tag" => simpleActivity(activity, "activity-delete.png")
- case "fork" => simpleActivity(activity, "activity-fork.png")
- case "push" => customActivity(activity, "activity-commit.png"){
-
- {activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
- if(i == 3){
-
...
- } else {
- if(commit.nonEmpty){
-
- }
- }
- }}
-
- }
- case "create_wiki" => customActivity(activity, "activity-wiki.png"){
-
- }
- case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
- activity.additionalInfo.get.split(":") match {
- case Array(pageName, commitId) =>
-
- case Array(pageName) =>
-
- }
- }
- })
-
- }
-}
-
-@detailActivity(activity: model.Activity, image: String) = {
-
-
@datetime(activity.activityDate)
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
-
- @activity.additionalInfo.map { additionalInfo =>
-
@additionalInfo
- }
-
-}
-
-@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
-
-
@datetime(activity.activityDate)
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
-
- @additionalInfo
-
-}
-
-@simpleActivity(activity: model.Activity, image: String) = {
-
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
- @datetime(activity.activityDate)
-
-
-}
-
+@(activities: List[model.Activity])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+
+@if(activities.isEmpty){
+ No activity
+} else {
+ @activities.map { activity =>
+
+ @(activity.activityType match {
+ case "open_issue" => detailActivity(activity, "activity-issue.png")
+ case "comment_issue" => detailActivity(activity, "activity-comment.png")
+ case "close_issue" => detailActivity(activity, "activity-issue-close.png")
+ case "reopen_issue" => detailActivity(activity, "activity-issue-reopen.png")
+ case "open_pullreq" => detailActivity(activity, "activity-merge.png")
+ case "merge_pullreq" => detailActivity(activity, "activity-merge.png")
+ case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
+ case "create_branch" => simpleActivity(activity, "activity-branch.png")
+ case "delete_branch" => simpleActivity(activity, "activity-delete.png")
+ case "create_tag" => simpleActivity(activity, "activity-tag.png")
+ case "delete_tag" => simpleActivity(activity, "activity-delete.png")
+ case "fork" => simpleActivity(activity, "activity-fork.png")
+ case "push" => customActivity(activity, "activity-commit.png"){
+
+ {activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
+ if(i == 3){
+
...
+ } else {
+ if(commit.nonEmpty){
+
+ }
+ }
+ }}
+
+ }
+ case "create_wiki" => customActivity(activity, "activity-wiki.png"){
+
+ }
+ case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+ activity.additionalInfo.get.split(":") match {
+ case Array(pageName, commitId) =>
+
+ case Array(pageName) =>
+
+ }
+ }
+ })
+
+ }
+}
+
+@detailActivity(activity: model.Activity, image: String) = {
+
+
@datetime(activity.activityDate)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+
+ @activity.additionalInfo.map { additionalInfo =>
+
@additionalInfo
+ }
+
+}
+
+@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
+
+
@datetime(activity.activityDate)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+
+ @additionalInfo
+
+}
+
+@simpleActivity(activity: model.Activity, image: String) = {
+
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+ @datetime(activity.activityDate)
+
+
+}
+
diff --git a/src/main/twirl/helper/diff.scala.html b/src/main/twirl/helper/diff.scala.html
index 551e3fa..e1ab2d7 100644
--- a/src/main/twirl/helper/diff.scala.html
+++ b/src/main/twirl/helper/diff.scala.html
@@ -1,105 +1,105 @@
-@(diffs: Seq[util.JGitUtil.DiffInfo],
- repository: service.RepositoryService.RepositoryInfo,
- newCommitId: Option[String],
- oldCommitId: Option[String],
- showIndex: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@if(showIndex){
-