diff --git a/src/main/twirl/gitbucket/core/error.scala.html b/src/main/twirl/gitbucket/core/error.scala.html index 48e5507..795f673 100644 --- a/src/main/twirl/gitbucket/core/error.scala.html +++ b/src/main/twirl/gitbucket/core/error.scala.html @@ -1,4 +1,4 @@ @(title: String)(implicit context: gitbucket.core.controller.Context) -@main("Error"){ +@gitbucket.core.html.main("Error"){

@title

} \ No newline at end of file diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html index 4840c17..05aa2ed 100644 --- a/src/main/twirl/gitbucket/core/index.scala.html +++ b/src/main/twirl/gitbucket/core/index.scala.html @@ -1,22 +1,21 @@ @(activities: List[gitbucket.core.model.Activity], recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo], userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context) -@import context._ -@import gitbucket.core.view.helpers._ -@main("GitBucket"){ - @dashboard.html.sidebar(recentRepositories, userRepositories){ - @settings.information.map { information => +@import gitbucket.core.view.helpers +@gitbucket.core.html.main("GitBucket"){ + @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){ + @context.settings.information.map { information =>
@Html(information)
} - @dashboard.html.tab() + @gitbucket.core.dashboard.html.tab()
- activities + activities
- @helper.html.activities(activities) + @gitbucket.core.helper.html.activities(activities)
} } diff --git a/src/main/twirl/gitbucket/core/main.scala.html b/src/main/twirl/gitbucket/core/main.scala.html index f265d19..3b67172 100644 --- a/src/main/twirl/gitbucket/core/main.scala.html +++ b/src/main/twirl/gitbucket/core/main.scala.html @@ -1,57 +1,56 @@ @(title: String, repository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo] = None)(body: Html)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.plugin.PluginRegistry -@import context._ -@import gitbucket.core.view.helpers._ +@import gitbucket.core.view.helpers @title - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @repository.map { repository => @if(!repository.repository.isPrivate){ } } - +
-