-
+@main(account, groupNames, "activity"){
+ @helper.html.activities(activities)
}
diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
index 2eeb22a..8d8ca9a 100644
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -13,34 +13,43 @@
-
-
-
-
-
- @avatar(account.userName, 200)
- @account.userName
-
-
-
- Joined on @date(account.registeredDate)
-
- @tab(account, "activity")
- @helper.html.activities(activities)
-
-
@if(account.isEmpty){
}
+ @if(account.map(_.password.nonEmpty).getOrElse(true)){
+
+ }
+
+}
diff --git a/src/main/twirl/account/members.scala.html b/src/main/twirl/account/members.scala.html
new file mode 100644
index 0000000..14d7c77
--- /dev/null
+++ b/src/main/twirl/account/members.scala.html
@@ -0,0 +1,16 @@
+@(account: model.Account, members: List[String])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@main(account, Nil, "members"){
+ @if(members.isEmpty){
+ No members
+ } else {
+ @members.map { userName =>
+
+
+
+
+
+
+ @avatar(account.userName, 200)
+ @account.fullName
+ @account.userName
+
+ @if(account.url.isDefined){
+
+ }
+
+ @if(groupNames.nonEmpty){
+ Joined on @date(account.registeredDate)
+
+
+ }
+
+ Groups
+ @groupNames.map { groupName =>
+ @avatar(groupName, 36, tooltip = true)
+ }
+
+
+ @body
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/twirl/account/repositories.scala.html b/src/main/twirl/account/repositories.scala.html
index 9a2ce34..f9037f5 100644
--- a/src/main/twirl/account/repositories.scala.html
+++ b/src/main/twirl/account/repositories.scala.html
@@ -1,42 +1,26 @@
-@(account: model.Account, repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
+@(account: model.Account, groupNames: List[String], repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
@import context._
@import view.helpers._
-@html.main(account.userName){
-
+ @avatar(userName, 20) @userName
+
+
-
System Settings
+
+ H2 Console
+
diff --git a/src/main/twirl/admin/system.scala.html b/src/main/twirl/admin/system.scala.html
index 75a07b6..361138d 100644
--- a/src/main/twirl/admin/system.scala.html
+++ b/src/main/twirl/admin/system.scala.html
@@ -8,17 +8,151 @@
-
+ }
+ }
}
diff --git a/src/main/twirl/account/tab.scala.html b/src/main/twirl/account/tab.scala.html
deleted file mode 100644
index 2a12a0c..0000000
--- a/src/main/twirl/account/tab.scala.html
+++ /dev/null
@@ -1,14 +0,0 @@
-@(account: model.Account, active: String)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
diff --git a/src/main/twirl/admin/menu.scala.html b/src/main/twirl/admin/menu.scala.html
index d9c7969..8e366a7 100644
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -10,6 +10,9 @@
-
-
-
- @avatar(account.userName, 200)
- @account.userName
-
-
-
- Joined on @date(account.registeredDate)
-
- @tab(account, "repositories")
- @if(repositories.isEmpty){
- No repositories
- } else {
- @repositories.map { repository =>
-
-
-
+@main(account, groupNames, "repositories"){
+ @if(repositories.isEmpty){
+ No repositories
+ } else {
+ @repositories.map { repository =>
+
- @repository.owner
- /
- @repository.name
- @if(repository.repository.isPrivate){
-
- }
-
- @if(repository.repository.description.isDefined){
- @repository.repository.description
- }
- Last updated: @datetime(repository.repository.lastActivityDate)
-
+
-
+ @repository.name
+ @if(repository.repository.isPrivate){
+
}
+
+ @if(repository.repository.originUserName.isDefined){
+
}
+ @if(repository.repository.description.isDefined){
+ @repository.repository.description
+ }
+ Last updated: @datetime(repository.repository.lastActivityDate)
System Settings
-
+
+
+
+
+
+
+
+
+ + + + + +
+ + +
+ + +
+ + + + + +
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
@avatar(account.userName, 20)
@account.userName
- @if(account.isAdmin){
- (Administrator)
+ @if(account.isGroupAccount){
+ (Group)
} else {
- (Normal)
+ @if(account.isAdmin){
+ (Administrator)
+ } else {
+ (Normal)
+ }
+ }
+ @if(account.isGroupAccount){
+ @members(account.userName).map { userName =>
+ @avatar(userName, 20, tooltip = true)
+ }
}
- @account.mailAddress + @if(!account.isGroupAccount){ + @account.mailAddress + } @account.url.map { url => @url } @@ -32,7 +48,9 @@
Registered: @datetime(account.registeredDate)
Updated: @datetime(account.updatedDate)
- Last Login: @account.lastLoginDate.map(datetime)
+ @if(!account.isGroupAccount){
+ Last Login: @account.lastLoginDate.map(datetime)
+ }
|
| Issues + @if(repository.issueCount > 0){ + @repository.issueCount + } + | ++ Pull Requests + @if(repository.pullCount > 0){ + @repository.pullCount + } | Wiki | ++ Network + | @if(loginAccount.isDefined && (loginAccount.get.isAdmin || loginAccount.get.userName == repository.owner)){Settings | } - +
|---|
-
}
}
+
+@detailActivity(activity: model.Activity, image: String) = {
+ @datetime(activity.activityDate)
-
- @avatar(activity.activityUserName, 16)
- @activityMessage(activity.message)
-
- @activity.additionalInfo.map { additionalInfo =>
- @(activity.activityType match {
- case "create_wiki" => {
-
- }
- case "edit_wiki" => {
-
- }
- case "push" => {
-
+ }
+ 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) =>
+
}
- case _ => {
-
- }
- })
- }
+ }
+ })
+
+}
+
+@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
+ @datetime(activity.activityDate)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+
+ @activity.additionalInfo.map { additionalInfo =>
+
+ }
+
+
+}
+
+@simpleActivity(activity: model.Activity, image: String) = {
+ @datetime(activity.activityDate)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+
+ @additionalInfo
+
+
+}
+
diff --git a/src/main/twirl/helper/copy.scala.html b/src/main/twirl/helper/copy.scala.html
new file mode 100644
index 0000000..1cba6e6
--- /dev/null
+++ b/src/main/twirl/helper/copy.scala.html
@@ -0,0 +1,36 @@
+@(id: String, value: String)(html: Html)
+
+ @avatar(activity.activityUserName, 16)
+ @activityMessage(activity.message)
+ @datetime(activity.activityDate)
+
+
+ @html
+
+
+
\ 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 0360230..9e517ab 100644
--- a/src/main/twirl/helper/diff.scala.html
+++ b/src/main/twirl/helper/diff.scala.html
@@ -1,7 +1,39 @@
-@(diffs: Seq[util.JGitUtil.DiffInfo], repository: service.RepositoryService.RepositoryInfo, commitId: Option[String])(implicit context: app.Context)
+@(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){
+
+
+
+}
@diffs.zipWithIndex.map { case (diff, i) =>
+
+
+ Showing @diffs.size changed @plural(diffs.size, "file")
+ 
@diff.oldPath -> @diff.newPath
+ }
+ @if(diff.changeType == ChangeType.ADD){
+ 
@diff.newPath
+ }
+ @if(diff.changeType == ChangeType.MODIFY){
+ 
@diff.newPath
+ }
+ @if(diff.changeType == ChangeType.DELETE){
+ 
@diff.oldPath
+ }
+ | @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){ @diff.oldPath -> @diff.newPath + @if(newCommitId.isDefined){ + + } } @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){ @diff.newPath + @if(newCommitId.isDefined){ + + } } @if(diff.changeType == ChangeType.DELETE){ @diff.oldPath - } - @if(commitId.isDefined){ - + @if(oldCommitId.isDefined){ + + } } | @@ -90,6 +132,17 @@ } $(function(){ + @if(showIndex){ + $('#toggle-file-list').click(function(){ + $('#commit-file-list').toggle(); + if($(this).val() == 'Show file list'){ + $(this).val('Hide file list'); + } else { + $(this).val('Show file list'); + } + }); + } + @diffs.zipWithIndex.map { case (diff, i) => @if(diff.newContent != None || diff.oldContent != None){ if($('#oldText-@i').length > 0){ diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html index 6c86e96..f7479a8 100644 --- a/src/main/twirl/helper/dropdown.scala.html +++ b/src/main/twirl/helper/dropdown.scala.html @@ -1,10 +1,13 @@ -@(buttonValue: String = "")(body: Html) -
|---|