Templates and go file formatting

routers/web/user/code.go

@@ -4,14 +4,14 @@
 package user
 
 import (
- shared_user "code.gitea.io/gitea/routers/web/shared/user"
  "net/http"
 
  repo_model "code.gitea.io/gitea/models/repo"
  "code.gitea.io/gitea/modules/base"
  "code.gitea.io/gitea/modules/context"
  code_indexer "code.gitea.io/gitea/modules/indexer/code"
  "code.gitea.io/gitea/modules/setting"
+ shared_user "code.gitea.io/gitea/routers/web/shared/user"
 )
 
 const (

routers/web/user/package.go

@@ -37,9 +37,6 @@ const (
 // ListPackages displays a list of all packages of the context user
 func ListPackages(ctx *context.Context) {
  shared_user.PrepareContextForProfileBigAvatar(ctx)
- if ctx.ContextUser.IsOrganization() {
- ctx.Data["pageStyleClasses"] = "container"
- }
  page := ctx.FormInt("page")
  if page <= 1 {
  page = 1
@@ -105,6 +102,7 @@ func ListPackages(ctx *context.Context) {
 
  // TODO: context/org -> HandleOrgAssignment() can not be used
  if ctx.ContextUser.IsOrganization() {
+ ctx.Data["pageStyleClasses"] = "container"
  org := org_model.OrgFromUser(ctx.ContextUser)
  ctx.Data["Org"] = org
  ctx.Data["OrgLink"] = ctx.ContextUser.OrganisationLink()

templates/org/projects/list.tmpl

@@ -1,10 +1,10 @@
 {{template "base/head" .}}
 {{if .ContextUser.IsOrganization}}
- <div role="main" aria-label="{{.Title}}" class="page-content repository packages">
- {{template "shared/user/org_profile_avatar" .}}
- {{template "user/overview/header" .}}
- {{template "projects/list" .}}
- </div>
+ <div role="main" aria-label="{{.Title}}" class="page-content repository packages">
+  {{template "shared/user/org_profile_avatar" .}}
+  {{template "user/overview/header" .}}
+  {{template "projects/list" .}}
+ </div>
 {{else}}
  <div role="main" aria-label="{{.Title}}" class="page-content user profile">
  <div class="ui container">

templates/user/overview/package_versions.tmpl

@@ -1,10 +1,10 @@
 {{template "base/head" .}}
 {{if .ContextUser.IsOrganization}}
- <div role="main" aria-label="{{.Title}}" class="page-content repository packages">
- {{template "shared/user/org_profile_avatar" .}}
- {{template "user/overview/header" .}}
- {{template "package/shared/versionlist" .}}
- </div>
+ <div role="main" aria-label="{{.Title}}" class="page-content repository packages">
+  {{template "shared/user/org_profile_avatar" .}}
+  {{template "user/overview/header" .}}
+  {{template "package/shared/versionlist" .}}
+ </div>
 {{else}}
  <div role="main" aria-label="{{.Title}}" class="page-content user profile packages">
  <div class="ui container">