diff --git a/modules/setting/service.go b/modules/setting/service.go index a5360ca801..7a907023c4 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -87,7 +87,6 @@ var Service = struct { ValidSiteURLSchemes []string UsernameCooldownPeriod int64 MaxUserRedirects int64 - LandingPageInfoEnabled bool // OpenID settings EnableOpenIDSignIn bool @@ -216,7 +215,6 @@ func loadServiceFrom(rootCfg ConfigProvider) { if Service.EnableTimetracking { Service.DefaultEnableTimetracking = sec.Key("DEFAULT_ENABLE_TIMETRACKING").MustBool(true) } - Service.LandingPageInfoEnabled = sec.Key("ENABLE_LANDING_PAGE_INFO").MustBool(true) Service.DefaultEnableDependencies = sec.Key("DEFAULT_ENABLE_DEPENDENCIES").MustBool(true) Service.AllowCrossRepositoryDependencies = sec.Key("ALLOW_CROSS_REPOSITORY_DEPENDENCIES").MustBool(true) Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true) diff --git a/routers/web/home.go b/routers/web/home.go index afde80075f..4ea961c055 100644 --- a/routers/web/home.go +++ b/routers/web/home.go @@ -58,7 +58,7 @@ func Home(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/login") return } - ctx.Data["LandingPageInfoEnabled"] = setting.Service.LandingPageInfoEnabled + ctx.Data["PageIsHome"] = true ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled diff --git a/templates/home.tmpl b/templates/home.tmpl index 3185dc5a5e..54edf0db37 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -11,8 +11,6 @@ - {{if .LandingPageInfoEnabled}} - {{template "info/landing-page-info" .}} - {{end}} + {{template "landing-page/landing-page" .}} {{template "base/footer" .}} diff --git a/templates/info/landing-page-info.tmpl b/templates/landing-page/landing-page.tmpl similarity index 100% rename from templates/info/landing-page-info.tmpl rename to templates/landing-page/landing-page.tmpl