mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-06 21:45:50 +01:00
Improved the list of forked repositories presentation.
This commit is contained in:
@@ -184,6 +184,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
|
|||||||
|
|
||||||
get("/:owner/:repository/network/members")(referrersOnly { repository =>
|
get("/:owner/:repository/network/members")(referrersOnly { repository =>
|
||||||
repo.html.forked(
|
repo.html.forked(
|
||||||
|
getRepository(
|
||||||
|
repository.repository.originUserName.getOrElse(repository.owner),
|
||||||
|
repository.repository.originRepositoryName.getOrElse(repository.name),
|
||||||
|
baseUrl),
|
||||||
getForkedRepositories(
|
getForkedRepositories(
|
||||||
repository.repository.originUserName.getOrElse(repository.owner),
|
repository.repository.originUserName.getOrElse(repository.owner),
|
||||||
repository.repository.originRepositoryName.getOrElse(repository.name)),
|
repository.repository.originRepositoryName.getOrElse(repository.name)),
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ object RepositorySearchService {
|
|||||||
val lineNumber = content.substring(0, indices.min).split("\n").size - 1
|
val lineNumber = content.substring(0, indices.min).split("\n").size - 1
|
||||||
val highlightText = StringUtil.escapeHtml(content.split("\n").drop(lineNumber).take(5).mkString("\n"))
|
val highlightText = StringUtil.escapeHtml(content.split("\n").drop(lineNumber).take(5).mkString("\n"))
|
||||||
.replaceAll("(?i)(" + keywords.map("\\Q" + _ + "\\E").mkString("|") + ")",
|
.replaceAll("(?i)(" + keywords.map("\\Q" + _ + "\\E").mkString("|") + ")",
|
||||||
"<span style=\"background-color: #ffff88;;\">$1</span>")
|
"<span class=\"highlight\">$1</span>")
|
||||||
(highlightText, lineNumber + 1)
|
(highlightText, lineNumber + 1)
|
||||||
} else {
|
} else {
|
||||||
(content.split("\n").take(5).mkString("\n"), 1)
|
(content.split("\n").take(5).mkString("\n"), 1)
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ trait RepositoryService { self: AccountService =>
|
|||||||
Query(Repositories).filter { t =>
|
Query(Repositories).filter { t =>
|
||||||
(t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
|
(t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
|
||||||
}
|
}
|
||||||
.sortBy(_.lastActivityDate desc).map(_.userName).list
|
.sortBy(_.userName asc).map(_.userName).list
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
@(members: List[String],
|
@(originRepository: Option[service.RepositoryService.RepositoryInfo],
|
||||||
|
members: List[String],
|
||||||
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
|
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
|
||||||
@import context._
|
@import context._
|
||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
@@ -8,9 +9,26 @@
|
|||||||
<li class="active"><a href="@url(repository)/network/members">Members</a></li>
|
<li class="active"><a href="@url(repository)/network/members">Members</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<h3>Members of the @repository.name Network</h3>
|
<h3>Members of the @repository.name Network</h3>
|
||||||
|
<div class="block">
|
||||||
|
@if(originRepository.isDefined){
|
||||||
|
@avatar(originRepository.get.owner, 20)
|
||||||
|
<span@if(repository.owner == originRepository.get.owner){ class="highlight"}>
|
||||||
|
<a href="@url(originRepository.get)">@originRepository.get.owner</a> / <a href="@path/@originRepository.get.owner/@originRepository.get.name">@originRepository.get.name</a>
|
||||||
|
</span>
|
||||||
|
} else {
|
||||||
|
@avatar(repository.repository.originUserName.get, 20)
|
||||||
|
<span@if(repository.owner == repository.repository.originUserName){ class="highlight"}>
|
||||||
|
@repository.repository.originUserName / @repository.repository.originRepositoryName
|
||||||
|
</span>
|
||||||
|
}
|
||||||
|
(origin)
|
||||||
|
</div>
|
||||||
@members.map { owner =>
|
@members.map { owner =>
|
||||||
<div class="block">
|
<div class="block">
|
||||||
<a href="@url(owner)">@owner</a> / <a href="@path/@owner/@repository.name">@repository.name</a>
|
@avatar(owner, 20)
|
||||||
|
<span@if(repository.owner == owner){ class="highlight"}>
|
||||||
|
<a href="@url(owner)">@owner</a> / <a href="@path/@owner/@repository.name">@repository.name</a>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -303,6 +303,10 @@ ul.dropdown-menu :last-child {
|
|||||||
border-bottom: none;
|
border-bottom: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
span.highlight {
|
||||||
|
background-color: #ffff88;
|
||||||
|
}
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* Sign-in form */
|
/* Sign-in form */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|||||||
Reference in New Issue
Block a user