diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html
index 37369aa..8b7672d 100644
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -59,7 +59,7 @@
});
$('#addMember').click(function(){
- $('#error-memberName').text('');
+ $('#error-members').text('');
var userName = $('#memberName').val();
// check empty
@@ -72,18 +72,18 @@
return $(this).data('name') == userName;
}).length > 0;
if(exists){
- $('#error-memberName').text('User has been already added.');
+ $('#error-members').text('User has been already added.');
return false;
}
// check existence
- $.post('@path/admin/users/_usercheck', {
+ $.post('@path/_user/existence', {
'userName': userName
}, function(data, status){
if(data == 'true'){
addMemberHTML(userName, false);
} else {
- $('#error-memberName').text('User does not exist.');
+ $('#error-members').text('User does not exist.');
}
});
});
diff --git a/src/main/twirl/admin/users/list.scala.html b/src/main/twirl/admin/users/list.scala.html
index 942f6ee..3b2029c 100644
--- a/src/main/twirl/admin/users/list.scala.html
+++ b/src/main/twirl/admin/users/list.scala.html
@@ -1,71 +1,71 @@
-@(users: List[model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Manage Users"){
- @admin.html.menu("users"){
-
-
-
- Include removed users
-
-
- @users.map { account =>
-
-
-
- @if(account.isGroupAccount){
-
Edit
- } else {
-
Edit
- }
-
-
- @avatar(account.userName, 20)
-
@account.userName
- @if(account.isGroupAccount){
- (Group)
- } else {
- @if(account.isAdmin){
- (Administrator)
- } else {
- (Normal)
- }
- }
- @if(account.isGroupAccount){
- @members(account.userName).map { userName =>
- @avatar(userName, 20, tooltip = true)
- }
- }
-
-
-
- @if(!account.isGroupAccount){
- @account.mailAddress
- }
- @account.url.map { url =>
- @url
- }
-
-
- Registered: @datetime(account.registeredDate)
- Updated: @datetime(account.updatedDate)
- @if(!account.isGroupAccount){
- Last Login: @account.lastLoginDate.map(datetime)
- }
-
-
-
- }
-
- }
-}
-
\ No newline at end of file
diff --git a/src/main/twirl/admin/users/user.scala.html b/src/main/twirl/admin/users/user.scala.html
index 3a2430c..fb022c0 100644
--- a/src/main/twirl/admin/users/user.scala.html
+++ b/src/main/twirl/admin/users/user.scala.html
@@ -1,80 +1,80 @@
-@(account: Option[model.Account])(implicit context: app.Context)
-@import context._
-@html.main(if(account.isEmpty) "New User" else "Update User"){
- @admin.html.menu("users"){
-
- }
-}
+@(account: Option[model.Account])(implicit context: app.Context)
+@import context._
+@html.main(if(account.isEmpty) "New User" else "Update User"){
+ @admin.html.menu("users"){
+
+ }
+}
diff --git a/src/main/twirl/dashboard/issues.scala.html b/src/main/twirl/dashboard/issues.scala.html
index 0329e46..f6f9bbb 100644
--- a/src/main/twirl/dashboard/issues.scala.html
+++ b/src/main/twirl/dashboard/issues.scala.html
@@ -1,4 +1,4 @@
-@(listparts: twirl.api.Html,
+@(listparts: play.twirl.api.Html,
allCount: Int,
assignedCount: Int,
createdByCount: Int,
diff --git a/src/main/twirl/dashboard/pulls.scala.html b/src/main/twirl/dashboard/pulls.scala.html
index b6c75f9..25caafe 100644
--- a/src/main/twirl/dashboard/pulls.scala.html
+++ b/src/main/twirl/dashboard/pulls.scala.html
@@ -1,4 +1,4 @@
-@(listparts: twirl.api.Html,
+@(listparts: play.twirl.api.Html,
counts: List[service.PullRequestService.PullRequestCount],
repositories: List[(String, String, Int)],
condition: service.IssuesService.IssueSearchCondition,
diff --git a/src/main/twirl/helper/activities.scala.html b/src/main/twirl/helper/activities.scala.html
index 6e7f324..980eaf5 100644
--- a/src/main/twirl/helper/activities.scala.html
+++ b/src/main/twirl/helper/activities.scala.html
@@ -1,98 +1,98 @@
-@(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)
-
-
-}
-
+@(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/copy.scala.html b/src/main/twirl/helper/copy.scala.html
index e950791..7a09a52 100644
--- a/src/main/twirl/helper/copy.scala.html
+++ b/src/main/twirl/helper/copy.scala.html
@@ -6,6 +6,24 @@
\ No newline at end of file
+
diff --git a/src/main/twirl/helper/diff.scala.html b/src/main/twirl/helper/diff.scala.html
index 551e3fa..598841c 100644
--- a/src/main/twirl/helper/diff.scala.html
+++ b/src/main/twirl/helper/diff.scala.html
@@ -1,105 +1,123 @@
-@(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){
-
-
-
-
- Showing @diffs.size changed @plural(diffs.size, "file")
-
-
-}
-@diffs.zipWithIndex.map { case (diff, i) =>
-
-
-
-
-
-
-
- @if(diff.newContent != None || diff.oldContent != None){
-
-
-
- } else {
- Not supported
- }
-
-
-
-}
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/main/twirl/helper/preview.scala.html b/src/main/twirl/helper/preview.scala.html
index 993f78b..2b04c89 100644
--- a/src/main/twirl/helper/preview.scala.html
+++ b/src/main/twirl/helper/preview.scala.html
@@ -25,8 +25,8 @@