Skip to content

Commit 256a1ee

Browse files
silverwindGiteaBotwxiaoguang
authored
Add <overflow-menu>, rename webcomponents (#29400)
1. Add `<overflow-menu>` web component 2. Rename `<gitea-origin-url>` to `<origin-url>` and make filenames match. <img width="439" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/2fbe4ca4-110b-4ad2-8e17-c1e116ccbd74"> <img width="444" alt="Screenshot 2024-03-02 at 21 36 52" src="https://github.com/go-gitea/gitea/assets/115237/aa8f786e-dc8c-4030-b12d-7cfb74bdfd6e"> <img width="537" alt="Screenshot 2024-03-03 at 03 05 06" src="https://github.com/go-gitea/gitea/assets/115237/fddd50aa-adf1-4b4b-bd7f-caf30c7b2245"> ![image](https://github.com/go-gitea/gitea/assets/115237/0f43770c-834c-4a05-8e3d-d30eb8653786) ![image](https://github.com/go-gitea/gitea/assets/115237/4b4c6bd7-843f-4f49-808f-6b3aed5e9f9a) TODO: - [x] Check if removal of `requestAnimationFrame` is possible to avoid flash of content. Likely needs a `MutationObserver`. - [x] Hide tippy when button is removed from DOM. - [x] ~~Implement right-aligned items (#28976. Not going to do it. - [x] Clean up CSS so base element has no background and add background via tailwind instead. - [x] Use it for org and user page. --------- Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent 4a377c0 commit 256a1ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+458
-287
lines changed

‎modules/timeutil/datetime.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func DateTime(format string, datetime any, extraAttrs ...string) template.HTML {
5656
switch format {
5757
case "short", "long": // date only
5858
attrs = append(attrs, `month="`+format+`"`, `day="numeric"`)
59-
return template.HTML(fmt.Sprintf(`<gitea-absolute-date %s date="%s">%s</gitea-absolute-date>`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))
59+
return template.HTML(fmt.Sprintf(`<absolute-date %s date="%s">%s</absolute-date>`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))
6060
case "full": // full date including time
6161
attrs = append(attrs, `format="datetime"`, `month="short"`, `day="numeric"`, `hour="numeric"`, `minute="numeric"`, `second="numeric"`, `data-tooltip-content`, `data-tooltip-interactive="true"`)
6262
return template.HTML(fmt.Sprintf(`<relative-time %s datetime="%s">%s</relative-time>`, strings.Join(attrs, " "), datetimeEscaped, textEscaped))

‎modules/timeutil/datetime_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ func TestDateTime(t *testing.T) {
2828
assert.EqualValues(t, "-", DateTime("short", TimeStamp(0)))
2929

3030
actual := DateTime("short", "invalid")
31-
assert.EqualValues(t, `<gitea-absolute-date weekday="" year="numeric" month="short" day="numeric" date="invalid">invalid</gitea-absolute-date>`, actual)
31+
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="invalid">invalid</absolute-date>`, actual)
3232

3333
actual = DateTime("short", refTimeStr)
34-
assert.EqualValues(t, `<gitea-absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01T00:00:00Z</gitea-absolute-date>`, actual)
34+
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01T00:00:00Z</absolute-date>`, actual)
3535

3636
actual = DateTime("short", refTime)
37-
assert.EqualValues(t, `<gitea-absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01</gitea-absolute-date>`, actual)
37+
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01T00:00:00Z">2018-01-01</absolute-date>`, actual)
3838

3939
actual = DateTime("short", refDateStr)
40-
assert.EqualValues(t, `<gitea-absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01">2018-01-01</gitea-absolute-date>`, actual)
40+
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2018-01-01">2018-01-01</absolute-date>`, actual)
4141

4242
actual = DateTime("short", refTimeStamp)
43-
assert.EqualValues(t, `<gitea-absolute-date weekday="" year="numeric" month="short" day="numeric" date="2017-12-31T19:00:00-05:00">2017-12-31</gitea-absolute-date>`, actual)
43+
assert.EqualValues(t, `<absolute-date weekday="" year="numeric" month="short" day="numeric" date="2017-12-31T19:00:00-05:00">2017-12-31</absolute-date>`, actual)
4444

4545
actual = DateTime("full", refTimeStamp)
4646
assert.EqualValues(t, `<relative-time weekday="" year="numeric" format="datetime" month="short" day="numeric" hour="numeric" minute="numeric" second="numeric" data-tooltip-content data-tooltip-interactive="true" datetime="2017-12-31T19:00:00-05:00">2017-12-31 19:00:00 -05:00</relative-time>`, actual)

‎options/locale/locale_en-US.ini

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ enable_javascript = This website requires JavaScript.
2525
toc = Table of Contents
2626
licenses = Licenses
2727
return_to_gitea = Return to Gitea
28+
more_items = More items
2829

2930
username = Username
3031
email = Email Address

‎package-lock.json

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"@github/text-expander-element": "2.6.1",
1515
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
1616
"@primer/octicons": "19.8.0",
17-
"@webcomponents/custom-elements": "1.6.0",
1817
"add-asset-webpack-plugin": "2.0.1",
1918
"ansi_up": "6.0.2",
2019
"asciinema-player": "3.7.0",

‎templates/base/head_script.tmpl

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
4141
remove_label_str: {{ctx.Locale.Tr "remove_label_str"}},
4242
modal_confirm: {{ctx.Locale.Tr "modal.confirm"}},
4343
modal_cancel: {{ctx.Locale.Tr "modal.cancel"}},
44+
more_items: {{ctx.Locale.Tr "more_items"}},
4445
},
4546
};
4647
{{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}}

‎templates/devtest/gitea-ui.tmpl

+35-8
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,45 @@
105105
</div>
106106

107107
<div>
108-
<h1>GiteaOriginUrl</h1>
109-
<div><gitea-origin-url data-url="test/url"></gitea-origin-url></div>
110-
<div><gitea-origin-url data-url="/test/url"></gitea-origin-url></div>
108+
<h1>&lt;origin-url&gt;</h1>
109+
<div><origin-url data-url="test/url"></origin-url></div>
110+
<div><origin-url data-url="/test/url"></origin-url></div>
111+
</div>
112+
113+
<div>
114+
<h1>&lt;overflow-menu&gt;</h1>
115+
<overflow-menu class="ui secondary pointing tabular borderless menu">
116+
<div class="overflow-menu-items">
117+
<a class="active item">item</a>
118+
<a class="item">item 1</a>
119+
<a class="item">item 2</a>
120+
<a class="item">item 3</a>
121+
<a class="item">item 4</a>
122+
<a class="item">item 5</a>
123+
<a class="item">item 6</a>
124+
<a class="item">item 7</a>
125+
<a class="item">item 8</a>
126+
<a class="item">item 9</a>
127+
<a class="item">item 10</a>
128+
<a class="item">item 11</a>
129+
<a class="item">item 12</a>
130+
<a class="item">item 13</a>
131+
<a class="item">item 14</a>
132+
<a class="item">item 15</a>
133+
<a class="item">item 16</a>
134+
<a class="item">item 17</a>
135+
<a class="item">item 18</a>
136+
</div>
137+
</overflow-menu>
111138
</div>
112139

113140
<div>
114141
<h1>GiteaAbsoluteDate</h1>
115-
<div><gitea-absolute-date date="2024-03-11" year="numeric" day="numeric" month="short"></gitea-absolute-date></div>
116-
<div><gitea-absolute-date date="2024-03-11" year="numeric" day="numeric" month="long"></gitea-absolute-date></div>
117-
<div><gitea-absolute-date date="2024-03-11" year="" day="numeric" month="numeric"></gitea-absolute-date></div>
118-
<div><gitea-absolute-date date="2024-03-11" year="" day="numeric" month="numeric" weekday="long"></gitea-absolute-date></div>
119-
<div><gitea-absolute-date date="2024-03-11T19:00:00-05:00" year="" day="numeric" month="numeric" weekday="long"></gitea-absolute-date></div>
142+
<div><absolute-date date="2024-03-11" year="numeric" day="numeric" month="short"></absolute-date></div>
143+
<div><absolute-date date="2024-03-11" year="numeric" day="numeric" month="long"></absolute-date></div>
144+
<div><absolute-date date="2024-03-11" year="" day="numeric" month="numeric"></absolute-date></div>
145+
<div><absolute-date date="2024-03-11" year="" day="numeric" month="numeric" weekday="long"></absolute-date></div>
146+
<div><absolute-date date="2024-03-11T19:00:00-05:00" year="" day="numeric" month="numeric" weekday="long"></absolute-date></div>
120147
<div class="tw-text-text-light-2">relative-time: <relative-time format="datetime" datetime="2024-03-11" year="" day="numeric" month="numeric"></relative-time></div>
121148
</div>
122149

‎templates/explore/navbar.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
2-
<div class="new-menu-inner">
1+
<overflow-menu class="ui secondary pointing tabular top attached borderless menu navbar">
2+
<div class="overflow-menu-items tw-justify-center">
33
<a class="{{if .PageIsExploreRepositories}}active {{end}}item" href="{{AppSubUrl}}/explore/repos">
44
{{svg "octicon-repo"}} {{ctx.Locale.Tr "explore.repos"}}
55
</a>
@@ -17,4 +17,4 @@
1717
</a>
1818
{{end}}
1919
</div>
20-
</div>
20+
</overflow-menu>

‎templates/org/menu.tmpl

+35-36
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,49 @@
11
<div class="ui container">
2-
<div class="ui secondary stackable pointing menu">
3-
<a class="{{if .PageIsViewRepositories}}active {{end}}item" href="{{$.Org.HomeLink}}">
4-
{{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}}
5-
{{if .RepoCount}}
6-
<div class="ui small label">{{.RepoCount}}</div>
2+
<overflow-menu class="ui secondary pointing tabular borderless menu">
3+
<div class="overflow-menu-items">
4+
<a class="{{if .PageIsViewRepositories}}active {{end}}item" href="{{$.Org.HomeLink}}">
5+
{{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}}
6+
{{if .RepoCount}}
7+
<div class="ui small label">{{.RepoCount}}</div>
8+
{{end}}
9+
</a>
10+
{{if .CanReadProjects}}
11+
<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">
12+
{{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}}
13+
{{if .ProjectCount}}
14+
<div class="ui small label">{{.ProjectCount}}</div>
15+
{{end}}
16+
</a>
717
{{end}}
8-
</a>
9-
{{if .CanReadProjects}}
10-
<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">
11-
{{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}}
12-
{{if .ProjectCount}}
13-
<div class="ui small label">{{.ProjectCount}}</div>
18+
{{if and .IsPackageEnabled .CanReadPackages}}
19+
<a class="{{if .IsPackagesPage}}active {{end}}item" href="{{$.Org.HomeLink}}/-/packages">
20+
{{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}}
21+
</a>
1422
{{end}}
15-
</a>
16-
{{end}}
17-
{{if and .IsPackageEnabled .CanReadPackages}}
18-
<a class="{{if .IsPackagesPage}}active {{end}}item" href="{{$.Org.HomeLink}}/-/packages">
19-
{{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}}
20-
</a>
21-
{{end}}
22-
{{if and .IsRepoIndexerEnabled .CanReadCode}}
23-
<a class="{{if .IsCodePage}}active {{end}}item" href="{{$.Org.HomeLink}}/-/code">
24-
{{svg "octicon-code"}} {{ctx.Locale.Tr "org.code"}}
25-
</a>
26-
{{end}}
27-
{{if .NumMembers}}
23+
{{if and .IsRepoIndexerEnabled .CanReadCode}}
24+
<a class="{{if .IsCodePage}}active {{end}}item" href="{{$.Org.HomeLink}}/-/code">
25+
{{svg "octicon-code"}} {{ctx.Locale.Tr "org.code"}}
26+
</a>
27+
{{end}}
28+
{{if .NumMembers}}
2829
<a class="{{if $.PageIsOrgMembers}}active {{end}}item" href="{{$.OrgLink}}/members">
2930
{{svg "octicon-person"}} {{ctx.Locale.Tr "org.members"}}
3031
<div class="ui small label">{{.NumMembers}}</div>
3132
</a>
32-
{{end}}
33-
{{if .IsOrganizationMember}}
33+
{{end}}
34+
{{if .IsOrganizationMember}}
3435
<a class="{{if $.PageIsOrgTeams}}active {{end}}item" href="{{$.OrgLink}}/teams">
3536
{{svg "octicon-people"}} {{ctx.Locale.Tr "org.teams"}}
3637
{{if .NumTeams}}
3738
<div class="ui small label">{{.NumTeams}}</div>
3839
{{end}}
3940
</a>
40-
{{end}}
41-
42-
{{if .IsOrganizationOwner}}
43-
<div class="right menu">
44-
<a class="{{if .PageIsOrgSettings}}active {{end}}item" href="{{.OrgLink}}/settings">
45-
{{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}}
46-
</a>
47-
</div>
48-
{{end}}
49-
</div>
41+
{{end}}
42+
{{if .IsOrganizationOwner}}
43+
<a class="{{if .PageIsOrgSettings}}active {{end}}item" href="{{.OrgLink}}/settings">
44+
{{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}}
45+
</a>
46+
{{end}}
47+
</div>
48+
</overflow-menu>
5049
</div>

‎templates/package/content/alpine.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-code"}} {{ctx.Locale.Tr "packages.alpine.registry"}}</label>
7-
<div class="markup"><pre class="code-block"><code><gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/alpine"></gitea-origin-url>/$branch/$repository</code></pre></div>
7+
<div class="markup"><pre class="code-block"><code><origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/alpine"></origin-url>/$branch/$repository</code></pre></div>
88
<p>{{ctx.Locale.Tr "packages.alpine.registry.info"}}</p>
99
</div>
1010
<div class="field">
1111
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.alpine.registry.key"}}</label>
12-
<div class="markup"><pre class="code-block"><code>curl -JO <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/alpine/key"></gitea-origin-url></code></pre></div>
12+
<div class="markup"><pre class="code-block"><code>curl -JO <origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/alpine/key"></origin-url></code></pre></div>
1313
</div>
1414
<div class="field">
1515
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.alpine.install"}}</label>

‎templates/package/content/cargo.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
default = "gitea"
99

1010
[registries.gitea]
11-
index = "sparse+<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/cargo/"></gitea-origin-url>" # Sparse index
12-
# index = "<gitea-origin-url data-url="{{AppSubUrl}}/{{.PackageDescriptor.Owner.Name}}/_cargo-index.git"></gitea-origin-url>" # Git
11+
index = "sparse+<origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/cargo/"></origin-url>" # Sparse index
12+
# index = "<origin-url data-url="{{AppSubUrl}}/{{.PackageDescriptor.Owner.Name}}/_cargo-index.git"></origin-url>" # Git
1313

1414
[net]
1515
git-fetch-with-cli = true</code></pre></div>

‎templates/package/content/chef.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-code"}} {{ctx.Locale.Tr "packages.chef.registry"}}</label>
7-
<div class="markup"><pre class="code-block"><code>knife[:supermarket_site] = '<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/chef"></gitea-origin-url>'</code></pre></div>
7+
<div class="markup"><pre class="code-block"><code>knife[:supermarket_site] = '<origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/chef"></origin-url>'</code></pre></div>
88
</div>
99
<div class="field">
1010
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.chef.install"}}</label>

‎templates/package/content/composer.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="markup"><pre class="code-block"><code>{
88
"repositories": [{
99
"type": "composer",
10-
"url": "<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/composer"></gitea-origin-url>"
10+
"url": "<origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/composer"></origin-url>"
1111
}
1212
]
1313
}</code></pre></div>

‎templates/package/content/conan.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.conan.registry"}}</label>
7-
<div class="markup"><pre class="code-block"><code>conan remote add gitea <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conan"></gitea-origin-url></code></pre></div>
7+
<div class="markup"><pre class="code-block"><code>conan remote add gitea <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conan"></origin-url></code></pre></div>
88
</div>
99
<div class="field">
1010
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.conan.install"}}</label>

‎templates/package/content/conda.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-code"}} {{ctx.Locale.Tr "packages.conda.registry"}}</label>
7-
<div class="markup"><pre class="code-block"><code>channel_alias: <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conda"></gitea-origin-url>
7+
<div class="markup"><pre class="code-block"><code>channel_alias: <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conda"></origin-url>
88
channels:
9-
&#32;&#32;- <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conda"></gitea-origin-url>
9+
&#32;&#32;- <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conda"></origin-url>
1010
default_channels:
11-
&#32;&#32;- <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conda"></gitea-origin-url></code></pre></div>
11+
&#32;&#32;- <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/conda"></origin-url></code></pre></div>
1212
</div>
1313
<div class="field">
1414
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.conda.install"}}</label>

‎templates/package/content/cran.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-code"}} {{ctx.Locale.Tr "packages.cran.registry"}}</label>
7-
<div class="markup"><pre class="code-block"><code>options("repos" = c(getOption("repos"), c(gitea="<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/cran"></gitea-origin-url>")))</code></pre></div>
7+
<div class="markup"><pre class="code-block"><code>options("repos" = c(getOption("repos"), c(gitea="<origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/cran"></origin-url>")))</code></pre></div>
88
</div>
99
<div class="field">
1010
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.cran.install"}}</label>

‎templates/package/content/debian.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.debian.registry"}}</label>
7-
<div class="markup"><pre class="code-block"><code>sudo curl <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian/repository.key"></gitea-origin-url> -o /etc/apt/keyrings/gitea-{{$.PackageDescriptor.Owner.Name}}.asc
8-
echo "deb [signed-by=/etc/apt/keyrings/gitea-{{$.PackageDescriptor.Owner.Name}}.asc] <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian"></gitea-origin-url> $distribution $component" | sudo tee -a /etc/apt/sources.list.d/gitea.list
7+
<div class="markup"><pre class="code-block"><code>sudo curl <origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian/repository.key"></origin-url> -o /etc/apt/keyrings/gitea-{{$.PackageDescriptor.Owner.Name}}.asc
8+
echo "deb [signed-by=/etc/apt/keyrings/gitea-{{$.PackageDescriptor.Owner.Name}}.asc] <origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/debian"></origin-url> $distribution $component" | sudo tee -a /etc/apt/sources.list.d/gitea.list
99
sudo apt update</code></pre></div>
1010
<p>{{ctx.Locale.Tr "packages.debian.registry.info"}}</p>
1111
</div>

‎templates/package/content/generic.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.generic.download"}}</label>
77
<div class="markup"><pre class="code-block"><code>
88
{{- range .PackageDescriptor.Files -}}
9-
curl -OJ <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/generic/{{$.PackageDescriptor.Package.Name}}/{{$.PackageDescriptor.Version.Version}}/{{.File.Name}}"></gitea-origin-url>
9+
curl -OJ <origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/generic/{{$.PackageDescriptor.Package.Name}}/{{$.PackageDescriptor.Version.Version}}/{{.File.Name}}"></origin-url>
1010
{{end -}}
1111
</code></pre></div>
1212
</div>

‎templates/package/content/go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui form">
55
<div class="field">
66
<label>{{svg "octicon-terminal"}} {{ctx.Locale.Tr "packages.go.install"}}</label>
7-
<div class="markup"><pre class="code-block"><code>GOPROXY=<gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/go"></gitea-origin-url> go install {{$.PackageDescriptor.Package.Name}}@{{$.PackageDescriptor.Version.Version}}</code></pre></div>
7+
<div class="markup"><pre class="code-block"><code>GOPROXY=<origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/go"></origin-url> go install {{$.PackageDescriptor.Package.Name}}@{{$.PackageDescriptor.Version.Version}}</code></pre></div>
88
</div>
99
<div class="field">
1010
<label>{{ctx.Locale.Tr "packages.registry.documentation" "Go" "https://docs.gitea.com/usage/packages/go"}}</label>

0 commit comments

Comments
 (0)