mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-06 05:25:50 +01:00
(refs #8)Add Members tab to account information page for group account.
This commit is contained in:
@@ -46,6 +46,8 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
|
|||||||
params.getOrElse("tab", "repositories") match {
|
params.getOrElse("tab", "repositories") match {
|
||||||
// Public Activity
|
// Public Activity
|
||||||
case "activity" => account.html.activity(x, getActivitiesByUser(userName, true))
|
case "activity" => account.html.activity(x, getActivitiesByUser(userName, true))
|
||||||
|
// Members
|
||||||
|
case "members" if(x.isGroupAccount) => account.html.members(x, getGroupMembers(x.userName))
|
||||||
// Repositories
|
// Repositories
|
||||||
case _ => account.html.repositories(x, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
|
case _ => account.html.repositories(x, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
|
||||||
}
|
}
|
||||||
|
|||||||
33
src/main/twirl/account/members.scala.html
Normal file
33
src/main/twirl/account/members.scala.html
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
@(account: model.Account, members: List[String])(implicit context: app.Context)
|
||||||
|
@import context._
|
||||||
|
@import view.helpers._
|
||||||
|
@html.main(account.userName){
|
||||||
|
<div class="container-fluid">
|
||||||
|
<div class="row-fluid">
|
||||||
|
<div class="span4">
|
||||||
|
<div class="block">
|
||||||
|
<div class="account-image">@avatar(account.userName, 200)</div>
|
||||||
|
<div class="block-header">@account.userName</div>
|
||||||
|
</div>
|
||||||
|
<div class="block">
|
||||||
|
<div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
|
||||||
|
<div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="span8">
|
||||||
|
@tab(account, "members")
|
||||||
|
@if(members.isEmpty){
|
||||||
|
No members
|
||||||
|
} else {
|
||||||
|
@members.map { userName =>
|
||||||
|
<div class="block">
|
||||||
|
<div class="block-header">
|
||||||
|
@avatar(userName, 20) <a href="@url(userName)">@userName</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -3,7 +3,11 @@
|
|||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
|
<li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
|
||||||
<li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
|
@if(account.isGroupAccount){
|
||||||
|
<li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
|
||||||
|
} else {
|
||||||
|
<li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
|
||||||
|
}
|
||||||
@if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
|
@if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
|
||||||
<li class="pull-right">
|
<li class="pull-right">
|
||||||
<div class="button-group">
|
<div class="button-group">
|
||||||
|
|||||||
Reference in New Issue
Block a user