mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-05-29 05:38:11 +00:00
b1f3069a22
- Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421) (cherry picked from commit37b4e6ef9b) (cherry picked from commitc17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c) (cherry picked from commit4743eaa6a0) (cherry picked from commiteff5b43d2e) Conflicts: https://codeberg.org/forgejo/forgejo/pulls/1014 routers/web/user/profile.go (cherry picked from commit9d359be5ed)
61 lines
1.8 KiB
Handlebars
61 lines
1.8 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content user profile">
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<div class="ui stackable grid">
|
|
<div class="ui four wide column">
|
|
{{template "shared/user/profile_big_avatar" .}}
|
|
</div>
|
|
<div class="ui twelve wide column">
|
|
<div class="gt-mb-4">
|
|
{{template "user/overview/header" .}}
|
|
</div>
|
|
|
|
{{if eq .TabName "activity"}}
|
|
{{if .ContextUser.KeepActivityPrivate}}
|
|
<div class="ui info message">
|
|
<p>{{.locale.Tr "user.disabled_public_activity"}}</p>
|
|
</div>
|
|
{{end}}
|
|
{{template "user/heatmap" .}}
|
|
<div class="feeds">
|
|
{{template "user/dashboard/feeds" .}}
|
|
</div>
|
|
{{else if eq .TabName "stars"}}
|
|
<div class="stars">
|
|
{{template "explore/repo_search" .}}
|
|
{{template "explore/repo_list" .}}
|
|
{{template "base/paginate" .}}
|
|
</div>
|
|
{{else if eq .TabName "following"}}
|
|
{{template "repo/user_cards" .}}
|
|
{{else if eq .TabName "followers"}}
|
|
{{template "repo/user_cards" .}}
|
|
{{else if eq .TabName "overview"}}
|
|
<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
|
|
{{else}}
|
|
{{template "explore/repo_search" .}}
|
|
{{template "explore/repo_list" .}}
|
|
{{template "base/paginate" .}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="ui small basic delete modal" id="block-user">
|
|
<div class="ui icon header">
|
|
{{svg "octicon-blocked" 16 "blocked inside"}}
|
|
{{$.locale.Tr "user.block_user"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{$.locale.Tr "user.block_user.detail"}}</p>
|
|
<ul>
|
|
<li>{{$.locale.Tr "user.block_user.detail_1"}}</li>
|
|
<li>{{$.locale.Tr "user.block_user.detail_2"}}</li>
|
|
</ul>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|
|
|
|
{{template "base/footer" .}}
|