Skip to content

Commit f89e8a2

Browse files
silverwindsilverwind
committed
Merge remote-tracking branch 'origin/main' into rmstyle
* origin/main: Hide 'Mirror Settings' when unneeded, improve hints (#24433) Consolidate the two review boxes into one (#24738)
2 parents 8070934 + 35ce7ca commit f89e8a2

File tree

12 files changed

+877
-933
lines changed

12 files changed

+877
-933
lines changed

‎options/locale/locale_en-US.ini

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1908,7 +1908,16 @@ settings.hooks = Webhooks
19081908
settings.githooks = Git Hooks
19091909
settings.basic_settings = Basic Settings
19101910
settings.mirror_settings = Mirror Settings
1911-
settings.mirror_settings.docs = Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically. <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/repo-mirror/">How do I mirror repositories?</a>
1911+
settings.mirror_settings.docs = Set up your repository to automatically synchronize commits, tags and branches with another repository.
1912+
settings.mirror_settings.docs.disabled_pull_mirror.instructions = Set up your project to automatically push commits, tags and branches to another repository. Pull mirrors have been disabled by your site administrator.
1913+
settings.mirror_settings.docs.disabled_push_mirror.instructions = Set up your project to automatically pull commits, tags and branches from another repository.
1914+
settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Right now, this can only be done in the "New Migration" menu. For more information, please consult:
1915+
settings.mirror_settings.docs.disabled_push_mirror.info = Push mirrors have been disabled by your site administrator.
1916+
settings.mirror_settings.docs.no_new_mirrors = Your repository is mirroring changes to or from another repository. Please keep in mind that you can't create any new mirrors at this time.
1917+
settings.mirror_settings.docs.can_still_use = Although you can't modify existing mirrors or create new ones, you may still use your existing mirror.
1918+
settings.mirror_settings.docs.pull_mirror_instructions = To set up a pull mirror, please consult:
1919+
settings.mirror_settings.docs.doc_link_title = How do I mirror repositories?
1920+
settings.mirror_settings.docs.pulling_remote_title = Pulling from a remote repository
19121921
settings.mirror_settings.mirrored_repository = Mirrored repository
19131922
settings.mirror_settings.direction = Direction
19141923
settings.mirror_settings.direction.pull = Pull

‎routers/web/repo/setting.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func SettingsCtxData(ctx *context.Context) {
6464
ctx.Data["PageIsSettingsOptions"] = true
6565
ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate
6666
ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled
67+
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
6768
ctx.Data["DisableNewPushMirrors"] = setting.Mirror.DisableNewPush
6869
ctx.Data["DefaultMirrorInterval"] = setting.Mirror.DefaultInterval
6970
ctx.Data["MinimumMirrorInterval"] = setting.Mirror.MinInterval
@@ -108,6 +109,7 @@ func SettingsPost(ctx *context.Context) {
108109

109110
ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate
110111
ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled
112+
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
111113
ctx.Data["DisableNewPushMirrors"] = setting.Mirror.DisableNewPush
112114
ctx.Data["DefaultMirrorInterval"] = setting.Mirror.DefaultInterval
113115
ctx.Data["MinimumMirrorInterval"] = setting.Mirror.MinInterval

‎templates/explore/repo_list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{{end}}
3939
</div>
4040
</div>
41-
<div class="metas gt-df gt-ac text grey">
41+
<div class="gt-font-13 gt-df gt-ac text grey">
4242
{{if .PrimaryLanguage}}
4343
<a class="muted" href="{{$.Link}}?q={{$.Keyword}}&sort={{$.SortType}}&language={{.PrimaryLanguage.Language}}">
4444
<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span>

‎templates/package/view.tmpl

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

0 commit comments

Comments
 (0)