Skip to content

Commit 686b963

Browse files
ExplodingDragonExplodingDragon
committed
fix Packages tmpl
1 parent f633723 commit 686b963

File tree

4 files changed

+147
-114
lines changed

4 files changed

+147
-114
lines changed

‎routers/web/user/package.go‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ func ListPackages(ctx *context.Context) {
109109
ctx.Data["Total"] = total
110110
ctx.Data["RepositoryAccessMap"] = repositoryAccessMap
111111

112+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
113+
ctx.ServerError("RenderUserOrgHeader", err)
114+
return
115+
}
116+
112117
// TODO: context/org -> HandleOrgAssignment() can not be used
113118
if ctx.ContextUser.IsOrganization() {
114119
org := org_model.OrgFromUser(ctx.ContextUser)
@@ -123,11 +128,9 @@ func ListPackages(ctx *context.Context) {
123128
ctx.Data["IsOrganizationOwner"] = false
124129
}
125130
}
126-
127131
pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5)
128132
pager.AddParamFromRequest(ctx.Req)
129133
ctx.Data["Page"] = pager
130-
131134
ctx.HTML(http.StatusOK, tplPackagesList)
132135
}
133136

@@ -161,12 +164,12 @@ func RedirectToLastVersion(ctx *context.Context) {
161164
ctx.ServerError("GetPackageDescriptor", err)
162165
return
163166
}
164-
165167
ctx.Redirect(pd.VersionWebLink())
166168
}
167169

168170
// ViewPackageVersion displays a single package version
169171
func ViewPackageVersion(ctx *context.Context) {
172+
shared_user.PrepareContextForProfileBigAvatar(ctx)
170173
pd := ctx.Package.Descriptor
171174

172175
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
@@ -302,6 +305,11 @@ func ViewPackageVersion(ctx *context.Context) {
302305
}
303306
ctx.Data["HasRepositoryAccess"] = hasRepositoryAccess
304307

308+
err = shared_user.LoadHeaderCount(ctx)
309+
if err != nil {
310+
ctx.ServerError("LoadHeaderCount", err)
311+
return
312+
}
305313
ctx.HTML(http.StatusOK, tplPackagesView)
306314
}
307315

@@ -390,6 +398,12 @@ func ListPackageVersions(ctx *context.Context) {
390398

391399
ctx.Data["Total"] = total
392400

401+
err = shared_user.LoadHeaderCount(ctx)
402+
if err != nil {
403+
ctx.ServerError("LoadHeaderCount", err)
404+
return
405+
}
406+
393407
pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5)
394408
pager.AddParamFromRequest(ctx.Req)
395409
ctx.Data["Page"] = pager
@@ -417,6 +431,11 @@ func PackageSettings(ctx *context.Context) {
417431
ctx.Data["Repos"] = repos
418432
ctx.Data["CanWritePackages"] = ctx.Package.AccessMode >= perm.AccessModeWrite || ctx.IsUserSiteAdmin()
419433

434+
err := shared_user.LoadHeaderCount(ctx)
435+
if err != nil {
436+
ctx.ServerError("LoadHeaderCount", err)
437+
return
438+
}
420439
ctx.HTML(http.StatusOK, tplPackagesSettings)
421440
}
422441

‎routers/web/user/setting/oauth2_common.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ func (oa *OAuth2CommonHandlers) renderEditPage(ctx *context.Context) {
2727
app := ctx.Data["App"].(*auth.OAuth2Application)
2828
ctx.Data["FormActionPath"] = fmt.Sprintf("%s/%d", oa.BasePathEditPrefix, app.ID)
2929

30-
if ctx.ContextUser != nil && ctx.ContextUser.IsOrganization() {
31-
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
32-
ctx.ServerError("RenderUserOrgHeader", err)
33-
return
34-
}
30+
if err := shared_user.RenderUserOrgHeader(ctx); err != nil {
31+
ctx.ServerError("RenderUserOrgHeader", err)
32+
return
3533
}
3634

3735
ctx.HTML(http.StatusOK, oa.TplAppEdit)

‎templates/package/shared/view.tmpl‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<div class="issue-title-header">
2+
<h1>{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})</h1>
3+
<div>
4+
{{$timeStr := DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}
5+
{{if .HasRepositoryAccess}}
6+
{{ctx.Locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink .PackageDescriptor.Creator.GetDisplayName .PackageDescriptor.Repository.Link .PackageDescriptor.Repository.FullName}}
7+
{{else}}
8+
{{ctx.Locale.Tr "packages.published_by" $timeStr .PackageDescriptor.Creator.HomeLink .PackageDescriptor.Creator.GetDisplayName}}
9+
{{end}}
10+
</div>
11+
</div>
12+
<div class="issue-content">
13+
<div class="issue-content-left">
14+
{{template "package/content/alpine" .}}
15+
{{template "package/content/arch" .}}
16+
{{template "package/content/cargo" .}}
17+
{{template "package/content/chef" .}}
18+
{{template "package/content/composer" .}}
19+
{{template "package/content/conan" .}}
20+
{{template "package/content/conda" .}}
21+
{{template "package/content/container" .}}
22+
{{template "package/content/cran" .}}
23+
{{template "package/content/debian" .}}
24+
{{template "package/content/generic" .}}
25+
{{template "package/content/go" .}}
26+
{{template "package/content/helm" .}}
27+
{{template "package/content/maven" .}}
28+
{{template "package/content/npm" .}}
29+
{{template "package/content/nuget" .}}
30+
{{template "package/content/pub" .}}
31+
{{template "package/content/pypi" .}}
32+
{{template "package/content/rpm" .}}
33+
{{template "package/content/rubygems" .}}
34+
{{template "package/content/swift" .}}
35+
{{template "package/content/vagrant" .}}
36+
</div>
37+
<div class="issue-content-right ui segment">
38+
<strong>{{ctx.Locale.Tr "packages.details"}}</strong>
39+
<div class="ui relaxed list flex-items-block">
40+
<div class="item">{{svg .PackageDescriptor.Package.Type.SVGName}} {{.PackageDescriptor.Package.Type.Name}}</div>
41+
{{if .HasRepositoryAccess}}
42+
<div class="item">{{svg "octicon-repo"}} <a href="{{.PackageDescriptor.Repository.Link}}">{{.PackageDescriptor.Repository.FullName}}</a></div>
43+
{{end}}
44+
<div class="item">{{svg "octicon-calendar"}} {{DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}</div>
45+
<div class="item">{{svg "octicon-download"}} {{.PackageDescriptor.Version.DownloadCount}}</div>
46+
{{template "package/metadata/alpine" .}}
47+
{{template "package/metadata/arch" .}}
48+
{{template "package/metadata/cargo" .}}
49+
{{template "package/metadata/chef" .}}
50+
{{template "package/metadata/composer" .}}
51+
{{template "package/metadata/conan" .}}
52+
{{template "package/metadata/conda" .}}
53+
{{template "package/metadata/container" .}}
54+
{{template "package/metadata/cran" .}}
55+
{{template "package/metadata/debian" .}}
56+
{{template "package/metadata/generic" .}}
57+
{{template "package/metadata/helm" .}}
58+
{{template "package/metadata/maven" .}}
59+
{{template "package/metadata/npm" .}}
60+
{{template "package/metadata/nuget" .}}
61+
{{template "package/metadata/pub" .}}
62+
{{template "package/metadata/pypi" .}}
63+
{{template "package/metadata/rpm" .}}
64+
{{template "package/metadata/rubygems" .}}
65+
{{template "package/metadata/swift" .}}
66+
{{template "package/metadata/vagrant" .}}
67+
{{if not (and (eq .PackageDescriptor.Package.Type "container") .PackageDescriptor.Metadata.Manifests)}}
68+
<div class="item">{{svg "octicon-database"}} {{FileSize .PackageDescriptor.CalculateBlobSize}}</div>
69+
{{end}}
70+
</div>
71+
{{if not (eq .PackageDescriptor.Package.Type "container")}}
72+
<div class="divider"></div>
73+
<strong>{{ctx.Locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})</strong>
74+
<div class="ui relaxed list">
75+
{{range .PackageDescriptor.Files}}
76+
<div class="item">
77+
<a href="{{$.Link}}/files/{{.File.ID}}">{{.File.Name}}</a>
78+
<span class="text small file-size">{{FileSize .Blob.Size}}</span>
79+
</div>
80+
{{end}}
81+
</div>
82+
{{end}}
83+
<div class="divider"></div>
84+
<strong>{{ctx.Locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
85+
<a class="tw-float-right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{ctx.Locale.Tr "packages.versions.view_all"}}</a>
86+
<div class="ui relaxed list">
87+
{{range .LatestVersions}}
88+
<div class="item tw-flex">
89+
<a class="tw-flex-1 gt-ellipsis" title="{{.Version}}" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
90+
<span class="text small">{{DateUtils.AbsoluteShort .CreatedUnix}}</span>
91+
</div>
92+
{{end}}
93+
</div>
94+
{{if or .CanWritePackages .HasRepositoryAccess}}
95+
<div class="divider"></div>
96+
<div class="ui relaxed list flex-items-block">
97+
{{if .HasRepositoryAccess}}
98+
<div class="item">{{svg "octicon-issue-opened"}} <a href="{{.PackageDescriptor.Repository.Link}}/issues">{{ctx.Locale.Tr "repo.issues"}}</a></div>
99+
{{end}}
100+
{{if .CanWritePackages}}
101+
<div class="item">{{svg "octicon-tools"}} <a href="{{.Link}}/settings">{{ctx.Locale.Tr "repo.settings"}}</a></div>
102+
{{end}}
103+
</div>
104+
{{end}}
105+
</div>
106+
</div>

‎templates/package/view.tmpl‎

Lines changed: 16 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,24 @@
11
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
3-
{{template "shared/user/org_profile_avatar" .}}
2+
{{if .ContextUser.IsOrganization}}
3+
<div role="main" aria-label="{{.Title}}" class="page-content organization packages">
4+
{{template "org/header" .}}
45
<div class="ui container">
5-
{{template "user/overview/header" .}}
6-
<div class="issue-title-header">
7-
<h1>{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})</h1>
8-
<div>
9-
{{$timeStr := DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}
10-
{{if .HasRepositoryAccess}}
11-
{{ctx.Locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink .PackageDescriptor.Creator.GetDisplayName .PackageDescriptor.Repository.Link .PackageDescriptor.Repository.FullName}}
12-
{{else}}
13-
{{ctx.Locale.Tr "packages.published_by" $timeStr .PackageDescriptor.Creator.HomeLink .PackageDescriptor.Creator.GetDisplayName}}
14-
{{end}}
15-
</div>
16-
</div>
17-
<div class="issue-content">
18-
<div class="issue-content-left">
19-
{{template "package/content/alpine" .}}
20-
{{template "package/content/arch" .}}
21-
{{template "package/content/cargo" .}}
22-
{{template "package/content/chef" .}}
23-
{{template "package/content/composer" .}}
24-
{{template "package/content/conan" .}}
25-
{{template "package/content/conda" .}}
26-
{{template "package/content/container" .}}
27-
{{template "package/content/cran" .}}
28-
{{template "package/content/debian" .}}
29-
{{template "package/content/generic" .}}
30-
{{template "package/content/go" .}}
31-
{{template "package/content/helm" .}}
32-
{{template "package/content/maven" .}}
33-
{{template "package/content/npm" .}}
34-
{{template "package/content/nuget" .}}
35-
{{template "package/content/pub" .}}
36-
{{template "package/content/pypi" .}}
37-
{{template "package/content/rpm" .}}
38-
{{template "package/content/rubygems" .}}
39-
{{template "package/content/swift" .}}
40-
{{template "package/content/vagrant" .}}
6+
{{template "package/shared/view" .}}
7+
</div>
8+
</div>
9+
{{else}}
10+
<div role="main" aria-label="{{.Title}}" class="page-content user profile packages">
11+
<div class="ui container">
12+
<div class="ui stackable grid">
13+
<div class="ui four wide column">
14+
{{template "shared/user/profile_big_avatar" .}}
4115
</div>
42-
<div class="issue-content-right ui segment">
43-
<strong>{{ctx.Locale.Tr "packages.details"}}</strong>
44-
<div class="ui relaxed list flex-items-block">
45-
<div class="item">{{svg .PackageDescriptor.Package.Type.SVGName}} {{.PackageDescriptor.Package.Type.Name}}</div>
46-
{{if .HasRepositoryAccess}}
47-
<div class="item">{{svg "octicon-repo"}} <a href="{{.PackageDescriptor.Repository.Link}}">{{.PackageDescriptor.Repository.FullName}}</a></div>
48-
{{end}}
49-
<div class="item">{{svg "octicon-calendar"}} {{DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}</div>
50-
<div class="item">{{svg "octicon-download"}} {{.PackageDescriptor.Version.DownloadCount}}</div>
51-
{{template "package/metadata/alpine" .}}
52-
{{template "package/metadata/arch" .}}
53-
{{template "package/metadata/cargo" .}}
54-
{{template "package/metadata/chef" .}}
55-
{{template "package/metadata/composer" .}}
56-
{{template "package/metadata/conan" .}}
57-
{{template "package/metadata/conda" .}}
58-
{{template "package/metadata/container" .}}
59-
{{template "package/metadata/cran" .}}
60-
{{template "package/metadata/debian" .}}
61-
{{template "package/metadata/generic" .}}
62-
{{template "package/metadata/helm" .}}
63-
{{template "package/metadata/maven" .}}
64-
{{template "package/metadata/npm" .}}
65-
{{template "package/metadata/nuget" .}}
66-
{{template "package/metadata/pub" .}}
67-
{{template "package/metadata/pypi" .}}
68-
{{template "package/metadata/rpm" .}}
69-
{{template "package/metadata/rubygems" .}}
70-
{{template "package/metadata/swift" .}}
71-
{{template "package/metadata/vagrant" .}}
72-
{{if not (and (eq .PackageDescriptor.Package.Type "container") .PackageDescriptor.Metadata.Manifests)}}
73-
<div class="item">{{svg "octicon-database"}} {{FileSize .PackageDescriptor.CalculateBlobSize}}</div>
74-
{{end}}
75-
</div>
76-
{{if not (eq .PackageDescriptor.Package.Type "container")}}
77-
<div class="divider"></div>
78-
<strong>{{ctx.Locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})</strong>
79-
<div class="ui relaxed list">
80-
{{range .PackageDescriptor.Files}}
81-
<div class="item">
82-
<a href="{{$.Link}}/files/{{.File.ID}}">{{.File.Name}}</a>
83-
<span class="text small file-size">{{FileSize .Blob.Size}}</span>
84-
</div>
85-
{{end}}
86-
</div>
87-
{{end}}
88-
<div class="divider"></div>
89-
<strong>{{ctx.Locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
90-
<a class="tw-float-right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{ctx.Locale.Tr "packages.versions.view_all"}}</a>
91-
<div class="ui relaxed list">
92-
{{range .LatestVersions}}
93-
<div class="item tw-flex">
94-
<a class="tw-flex-1 gt-ellipsis" title="{{.Version}}" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
95-
<span class="text small">{{DateUtils.AbsoluteShort .CreatedUnix}}</span>
96-
</div>
97-
{{end}}
98-
</div>
99-
{{if or .CanWritePackages .HasRepositoryAccess}}
100-
<div class="divider"></div>
101-
<div class="ui relaxed list flex-items-block">
102-
{{if .HasRepositoryAccess}}
103-
<div class="item">{{svg "octicon-issue-opened"}} <a href="{{.PackageDescriptor.Repository.Link}}/issues">{{ctx.Locale.Tr "repo.issues"}}</a></div>
104-
{{end}}
105-
{{if .CanWritePackages}}
106-
<div class="item">{{svg "octicon-tools"}} <a href="{{.Link}}/settings">{{ctx.Locale.Tr "repo.settings"}}</a></div>
107-
{{end}}
108-
</div>
109-
{{end}}
16+
<div class="ui twelve wide column tw-mb-4">
17+
{{template "user/overview/header" .}}
18+
{{template "package/shared/view" .}}
11019
</div>
11120
</div>
11221
</div>
11322
</div>
23+
{{end}}
11424
{{template "base/footer" .}}

0 commit comments

Comments
 (0)