Improved the list of forked repositories presentation.

This commit is contained in:
takezoe
2013-08-10 04:21:31 +09:00
parent f3a1815bc5
commit 03e903eef9
5 changed files with 30 additions and 4 deletions

View File

@@ -184,6 +184,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
get("/:owner/:repository/network/members")(referrersOnly { repository =>
repo.html.forked(
getRepository(
repository.repository.originUserName.getOrElse(repository.owner),
repository.repository.originRepositoryName.getOrElse(repository.name),
baseUrl),
getForkedRepositories(
repository.repository.originUserName.getOrElse(repository.owner),
repository.repository.originRepositoryName.getOrElse(repository.name)),

View File

@@ -97,7 +97,7 @@ object RepositorySearchService {
val lineNumber = content.substring(0, indices.min).split("\n").size - 1
val highlightText = StringUtil.escapeHtml(content.split("\n").drop(lineNumber).take(5).mkString("\n"))
.replaceAll("(?i)(" + keywords.map("\\Q" + _ + "\\E").mkString("|") + ")",
"<span style=\"background-color: #ffff88;;\">$1</span>")
"<span class=\"highlight\">$1</span>")
(highlightText, lineNumber + 1)
} else {
(content.split("\n").take(5).mkString("\n"), 1)

View File

@@ -205,7 +205,7 @@ trait RepositoryService { self: AccountService =>
Query(Repositories).filter { t =>
(t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
}
.sortBy(_.lastActivityDate desc).map(_.userName).list
.sortBy(_.userName asc).map(_.userName).list
}

View File

@@ -1,4 +1,5 @@
@(members: List[String],
@(originRepository: Option[service.RepositoryService.RepositoryInfo],
members: List[String],
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@import context._
@import view.helpers._
@@ -8,9 +9,26 @@
<li class="active"><a href="@url(repository)/network/members">Members</a></li>
</ul>
<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 =>
<div class="block">
@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>
}
}

View File

@@ -303,6 +303,10 @@ ul.dropdown-menu :last-child {
border-bottom: none;
}
span.highlight {
background-color: #ffff88;
}
/****************************************************************************/
/* Sign-in form */
/****************************************************************************/