mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 09:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request '[v7.0/forgejo] [FEAT] Visual separation between types of attachments' (#3029) from bp-v7.0/forgejo-20a3597 into v7.0/forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3029
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-04-04 16:43:39 +00:00
commit fbaebbd644
4 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
options/locale/locale_en-US.ini
View file

@ -2635,11 +2635,12 @@ release.tag_name_invalid = The tag name is not valid.
release.tag_name_protected = The tag name is protected. release.tag_name_protected = The tag name is protected.
release.tag_already_exist = This tag name already exists. release.tag_already_exist = This tag name already exists.
release.downloads = Downloads release.downloads = Downloads
release.download_count = Downloads: %s release.download_count = %s downloads
release.add_tag_msg = Use the title and content of release as tag message. release.add_tag_msg = Use the title and content of release as tag message.
release.add_tag = Create Tag Only release.add_tag = Create Tag Only
release.releases_for = Releases for %s release.releases_for = Releases for %s
release.tags_for = Tags for %s release.tags_for = Tags for %s
release.system_generated = This attachment is automatically generated.
branch.name = Branch name branch.name = Branch name
branch.already_exists = A branch named "%s" already exists. branch.already_exists = A branch named "%s" already exists.

15
templates/repo/release/list.tmpl
View file

@ -67,13 +67,21 @@
{{ctx.Locale.Tr "repo.release.downloads"}} {{ctx.Locale.Tr "repo.release.downloads"}}
</summary> </summary>
<ul class="list"> <ul class="list">
{{$hasReleaseAttachment := gt (len $release.Attachments) 0}}
{{if and (not $.DisableDownloadSourceArchives) (not $release.IsDraft) ($.Permission.CanRead $.UnitTypeCode)}} {{if and (not $.DisableDownloadSourceArchives) (not $release.IsDraft) ($.Permission.CanRead $.UnitTypeCode)}}
<li> <li>
<a class="archive-link" href="{{$.RepoLink}}/archive/{{$release.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (ZIP)</strong></a> <a class="archive-link" href="{{$.RepoLink}}/archive/{{$release.TagName | PathEscapeSegments}}.zip" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (ZIP)</strong></a>
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.system_generated"}}">
{{svg "octicon-info"}}
</span>
</li> </li>
<li> <li class="{{if $hasReleaseAttachment}}start-gap{{end}}">
<a class="archive-link" href="{{$.RepoLink}}/archive/{{$release.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (TAR.GZ)</strong></a> <a class="archive-link" href="{{$.RepoLink}}/archive/{{$release.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow"><strong>{{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (TAR.GZ)</strong></a>
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.system_generated"}}">
{{svg "octicon-info"}}
</span>
</li> </li>
{{if $hasReleaseAttachment}}<hr>{{end}}
{{end}} {{end}}
{{range $release.Attachments}} {{range $release.Attachments}}
<li> <li>
@ -81,10 +89,7 @@
<strong>{{svg "octicon-package" 16 "tw-mr-1"}}{{.Name}}</strong> <strong>{{svg "octicon-package" 16 "tw-mr-1"}}{{.Name}}</strong>
</a> </a>
<div> <div>
<span class="text grey">{{.Size | ctx.Locale.TrSize}}</span> <span class="text grey">{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}} · {{.Size | ctx.Locale.TrSize}}</span>
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}}">
{{svg "octicon-info"}}
</span>
</div> </div>
</li> </li>
{{end}} {{end}}

5
templates/repo/release/new.tmpl
View file

@ -64,10 +64,7 @@
<div class="flex-text-inline tw-flex-1"> <div class="flex-text-inline tw-flex-1">
<input name="attachment-edit-{{.UUID}}" class="attachment_edit" required value="{{.Name}}"> <input name="attachment-edit-{{.UUID}}" class="attachment_edit" required value="{{.Name}}">
<input name="attachment-del-{{.UUID}}" type="hidden" value="false"> <input name="attachment-del-{{.UUID}}" type="hidden" value="false">
<span class="ui text grey tw-whitespace-nowrap">{{.Size | ctx.Locale.TrSize}}</span> <span class="ui text grey tw-whitespace-nowrap">{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}} · {{.Size | ctx.Locale.TrSize}}</span>
<span data-tooltip-content="{{ctx.Locale.Tr "repo.release.download_count" (ctx.Locale.PrettyNumber .DownloadCount)}}">
{{svg "octicon-info"}}
</span>
</div> </div>
<a class="ui mini compact red button remove-rel-attach" data-id="{{.ID}}" data-uuid="{{.UUID}}"> <a class="ui mini compact red button remove-rel-attach" data-id="{{.ID}}" data-uuid="{{.UUID}}">
{{ctx.Locale.Tr "remove"}} {{ctx.Locale.Tr "remove"}}

24
web_src/css/repo/release-tag.css
View file

@ -33,20 +33,32 @@
.repository.releases #release-list > li .detail .download .list { .repository.releases #release-list > li .detail .download .list {
padding-left: 0; padding-left: 0;
border: 1px solid var(--color-secondary);
border-radius: var(--border-radius);
background: var(--color-light);
} }
.repository.releases #release-list > li .detail .download .list li { .repository.releases #release-list > li .detail .download .list li {
background: var(--color-light);
border: 1px solid var(--color-secondary);
border-top: none;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 8px; padding: 8px;
border-bottom: 1px solid var(--color-secondary);
} }
.repository.releases #release-list > li .detail .download .list li:last-child { .repository.releases #release-list > li .detail .download .list :is(li:first-child, .start-gap + hr + li) {
border-bottom: none; border-top: 1px solid var(--color-secondary);
border-top-left-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
}
.repository.releases #release-list > li .detail .download .list :is(li:last-child, .start-gap) {
border-bottom: 1px solid var(--color-secondary);
border-bottom-left-radius: var(--border-radius);
border-bottom-right-radius: var(--border-radius);
}
.repository.releases #release-list > li .detail .download .list hr {
height: 8px;
margin: 0;
} }
.repository.releases #release-list > li .detail .dot { .repository.releases #release-list > li .detail .dot {