mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-25 07:43:36 +01:00
4a722c9a45
- Remove various horizontal dividers on repo pages that didn't provide visual benefit - Remove label/milestone pills on single issue/pr page - Remove issue-related pill buttons on projects page - Increase contrast of color-secondary on arc-green - Improve notifications icon, make circle bigger - Remove some inline styles - Fix focus in issue/pr title edit and select all text on button click ### Issue and PR before and after <img width="1249" alt="Screenshot 2023-05-01 at 11 44 22" src="https://user-images.githubusercontent.com/115237/235436662-a708288e-84fb-4b2e-a5a2-3a1c17d28f6c.png"> <img width="1248" alt="Screenshot 2023-05-01 at 11 58 51" src="https://user-images.githubusercontent.com/115237/235437992-f863e483-f3cc-4cc1-8204-fd223647a0c9.png"> ### Projects before and after <img width="1255" alt="Screenshot 2023-05-01 at 11 41 02" src="https://user-images.githubusercontent.com/115237/235436433-0deb85d6-4e7d-4e74-847f-254cc70a0cf9.png"> <img width="1267" alt="Screenshot 2023-05-01 at 11 40 03" src="https://user-images.githubusercontent.com/115237/235436431-715b13cb-f78c-4d86-b27a-9229f9738c5b.png"> ### Releases before and after <img width="1243" alt="Screenshot 2023-05-01 at 11 41 12" src="https://user-images.githubusercontent.com/115237/235436457-b655ee6f-03b8-4595-8d8c-b15ea469e988.png"> <img width="1240" alt="Screenshot 2023-05-01 at 11 40 10" src="https://user-images.githubusercontent.com/115237/235436456-05a2a0dd-7cbb-4f26-b0d3-4f667df4bb95.png"> ### Misc <img width="58" alt="Screenshot 2023-05-01 at 10 49 13" src="https://user-images.githubusercontent.com/115237/235432494-936ce995-6e22-47bc-ab2d-c9e93d31987d.png"> <img width="57" alt="Screenshot 2023-05-01 at 18 57 08" src="https://user-images.githubusercontent.com/115237/235492430-1d32cfe0-0f2c-467c-b2fa-925b27e30e0e.png"> Issue title edit and wrap: <img width="1238" alt="Screenshot 2023-05-01 at 12 34 40" src="https://user-images.githubusercontent.com/115237/235441407-d5067a57-e586-4865-a652-282e5944abb4.png"> <img width="1232" alt="Screenshot 2023-05-01 at 12 06 24" src="https://user-images.githubusercontent.com/115237/235438710-1a543dda-220f-4d87-8f93-f1710c0695f0.png"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
103 lines
3.9 KiB
Handlebars
103 lines
3.9 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content organization members">
|
|
{{template "org/header" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
|
|
<div class="list">
|
|
{{range .Members}}
|
|
<div class="item ui grid">
|
|
<div class="ui four wide column gt-df">
|
|
<a href="{{.HomeLink}}">{{avatar $.Context . 48}}</a>
|
|
<div>
|
|
<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
|
|
<div class="meta">{{.FullName}}</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui four wide column center">
|
|
<div class="meta">
|
|
{{$.locale.Tr "org.members.membership_visibility"}}
|
|
</div>
|
|
<div class="meta">
|
|
{{$isPublic := index $.MembersIsPublicMember .ID}}
|
|
{{if $isPublic}}
|
|
<strong>{{$.locale.Tr "org.members.public"}}</strong>
|
|
{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.locale.Tr "org.members.public_helper"}}</a>){{end}}
|
|
{{else}}
|
|
<strong>{{$.locale.Tr "org.members.private"}}</strong>
|
|
{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.locale.Tr "org.members.private_helper"}}</a>){{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{if not $.PublicOnly}}
|
|
<div class="ui three wide column center">
|
|
<div class="meta">
|
|
{{$.locale.Tr "org.members.member_role"}}
|
|
</div>
|
|
<div class="meta">
|
|
<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}</strong>
|
|
</div>
|
|
</div>
|
|
<div class="ui two wide column center">
|
|
{{if $.IsOrganizationOwner}}
|
|
<div class="meta">
|
|
{{$.locale.Tr "admin.users.2fa"}}
|
|
</div>
|
|
<div class="meta">
|
|
<strong>
|
|
{{if index $.MembersTwoFaStatus .ID}}
|
|
<span class="text green">{{svg "octicon-check"}}</span>
|
|
{{else}}
|
|
{{svg "octicon-x"}}
|
|
{{end}}
|
|
</strong>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
<div class="ui three wide column gt-df gt-ac gt-je">
|
|
<div class="text right">
|
|
{{if eq $.SignedUser.ID .ID}}
|
|
<form>
|
|
<button class="ui red small button delete-button" data-modal-id="leave-organization"
|
|
data-url="{{$.OrgLink}}/members/action/leave" data-datauid="{{.ID}}"
|
|
data-name="{{.DisplayName}}"
|
|
data-data-organization-name="{{$.Org.DisplayName}}">{{$.locale.Tr "org.members.leave"}}</button>
|
|
</form>
|
|
{{else if $.IsOrganizationOwner}}
|
|
<form>
|
|
<button class="ui red small button delete-button" data-modal-id="remove-organization-member"
|
|
data-url="{{$.OrgLink}}/members/action/remove" data-datauid="{{.ID}}"
|
|
data-name="{{.DisplayName}}"
|
|
data-data-organization-name="{{$.Org.DisplayName}}">{{$.locale.Tr "org.members.remove"}}</button>
|
|
</form>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
|
|
{{template "base/paginate" .}}
|
|
</div>
|
|
</div>
|
|
<div class="ui g-modal-confirm delete modal" id="leave-organization">
|
|
<div class="header">
|
|
{{$.locale.Tr "org.members.leave"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
<div class="ui g-modal-confirm delete modal" id="remove-organization-member">
|
|
<div class="header">
|
|
{{$.locale.Tr "org.members.remove"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|