diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 62980a4..c94ac5a 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -184,6 +184,10 @@ 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)), diff --git a/src/main/scala/service/RepositorySearchService.scala b/src/main/scala/service/RepositorySearchService.scala index 4807421..1fe1e7a 100644 --- a/src/main/scala/service/RepositorySearchService.scala +++ b/src/main/scala/service/RepositorySearchService.scala @@ -97,7 +97,7 @@ 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("|") + ")", - "$1") + "$1") (highlightText, lineNumber + 1) } else { (content.split("\n").take(5).mkString("\n"), 1) diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala index 26563a8..518165c 100644 --- a/src/main/scala/service/RepositoryService.scala +++ b/src/main/scala/service/RepositoryService.scala @@ -205,7 +205,7 @@ 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 } diff --git a/src/main/twirl/repo/forked.scala.html b/src/main/twirl/repo/forked.scala.html index 2ca51e5..bd2a302 100644 --- a/src/main/twirl/repo/forked.scala.html +++ b/src/main/twirl/repo/forked.scala.html @@ -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 @@
  • Members
  • Members of the @repository.name Network

    +
    + @if(originRepository.isDefined){ + @avatar(originRepository.get.owner, 20) + + @originRepository.get.owner / @originRepository.get.name + + } else { + @avatar(repository.repository.originUserName.get, 20) + + @repository.repository.originUserName / @repository.repository.originRepositoryName + + } + (origin) +
    @members.map { owner =>
    - @owner / @repository.name + @avatar(owner, 20) + + @owner / @repository.name +
    } } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index ae5302b..1a2ce7c 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -303,6 +303,10 @@ border-bottom: none; } +span.highlight { + background-color: #ffff88; +} + /****************************************************************************/ /* Sign-in form */ /****************************************************************************/