Skip to content

Use flex classes in package settings #26314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 8, 2023
Merged

Use flex classes in package settings #26314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48912a6
Use flex classes.
KN4CK3R Aug 3, 2023
747378b
Merge branch 'main' of https://github.com/go-gitea/gitea into fix-26130
KN4CK3R Aug 6, 2023
dbaa94b
Additional style error.
KN4CK3R Aug 6, 2023
52baec5
Merge branch 'main' into fix-26130
GiteaBot Aug 8, 2023
6cb178e
Merge branch 'main' into fix-26130
GiteaBot Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions templates/org/team/members.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,23 @@
</div>
{{if and .Invites $.IsOrganizationOwner}}
<h4 class="ui top attached header">{{$.locale.Tr "org.teams.invite_team_member.list"}}</h4>
<div class="ui bottom attached table segment members">
{{range .Invites}}
<div class="item gt-df gt-ac gt-fw">
<span class="gt-f1">{{.Email}}</span>
<form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post">
{{$.CsrfTokenHtml}}
<input type="hidden" name="iid" value="{{.ID}}">
<button class="ui red button">{{$.locale.Tr "org.members.remove"}}</button>
</form>
</div>
{{end}}
<div class="ui attached segment">
<div class="flex-list">
{{range .Invites}}
<div class="flex-item flex-item-center">
<div class="flex-item-main">
{{.Email}}
</div>
<div class="flex-item-trailing">
<form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post">
{{$.CsrfTokenHtml}}
<input type="hidden" name="iid" value="{{.ID}}">
<button class="ui red button">{{$.locale.Tr "org.members.remove"}}</button>
</form>
</div>
</div>
{{end}}
</div>
</div>
{{end}}
</div>
Expand Down
42 changes: 22 additions & 20 deletions templates/package/settings.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,30 @@
<h4 class="ui top attached error header">
{{.locale.Tr "repo.settings.danger_zone"}}
</h4>
<div class="ui attached error table danger segment">
<div class="item">
<div class="ui right">
<button class="ui basic red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
</div>
<div>
<h5>{{.locale.Tr "packages.settings.delete"}}</h5>
<p>{{.locale.Tr "packages.settings.delete.description"}}</p>
</div>
<div class="ui tiny modal" id="delete-package-modal">
<div class="header">
{{.locale.Tr "packages.settings.delete"}}
<div class="ui attached error danger segment">
<div class="flex-list">
<div class="flex-item">
<div class="flex-item-main">
<div class="flex-item-title">{{.locale.Tr "packages.settings.delete"}}</div>
<div class="flex-item-body">{{.locale.Tr "packages.settings.delete.description"}}</div>
</div>
<div class="content">
<div class="ui warning message gt-word-break">
{{.locale.Tr "packages.settings.delete.notice" .PackageDescriptor.Package.Name .PackageDescriptor.Version.Version}}
<div class="flex-item-trailing">
<button class="ui basic red show-modal button" data-modal="#delete-package-modal">{{.locale.Tr "packages.settings.delete"}}</button>
</div>
<div class="ui tiny modal" id="delete-package-modal">
<div class="header">
{{.locale.Tr "packages.settings.delete"}}
</div>
<div class="content">
<div class="ui warning message gt-word-break">
{{.locale.Tr "packages.settings.delete.notice" .PackageDescriptor.Package.Name .PackageDescriptor.Version.Version}}
</div>
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<input type="hidden" name="action" value="delete">
{{template "base/modal_actions_confirm" .}}
</form>
</div>
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<input type="hidden" name="action" value="delete">
{{template "base/modal_actions_confirm" .}}
</form>
</div>
</div>
</div>
Expand Down