476a043a5f
Co-Author: @wxiaoguang
This PR is to fix
https://github.com/go-gitea/gitea/issues/23318#issuecomment-1506275446 .
The way to fix this in this PR is to use `delete_modal_actions.tmpl`
here both to fix this issue and keep ui consistency (as suggested by
[TODO
here](4299c3b7db/templates/projects/view.tmpl (L161)
))
And this PR also refactors `delete_modal_actions.tmpl` and its related
styles, and use the template for more modal actions:
1. Added template attributes:
* locale
* ModalButtonStyle: "yes" (default) or "confirm"
* ModalButtonCancelText
* ModalButtonOkText
2. Rename `delete_modal_actions.tmpl` template to
`modal_actions_confirm.tmpl` because it is not only used for action
modals deletion now.
3. Refactored css related to modals into `web_src/css/modules/modal.css`
and improved the styles.
4. Also use the template for PR deletion modal and remove issue
dependency modal.
5. Some modals should also use the template, but not sure how to open
them, so mark these modal actions by `{{/* TODO: Convert to
base/modal_actions_confirm */}}`
After (Also tested on arc green):
Hovering on the left buttons
<img width="711" alt="Screen Shot 2023-04-23 at 15 17 12"
src="https://user-images.githubusercontent.com/17645053/233825650-76307e65-9255-44bb-80e8-7062f58ead1b.png">
<img width="786" alt="Screen Shot 2023-04-23 at 15 17 21"
src="https://user-images.githubusercontent.com/17645053/233825652-4dc6f7d1-a180-49fb-a468-d60950eaee0d.png">
Test for functionalities:
https://user-images.githubusercontent.com/17645053/233826857-76376fda-022c-42d0-b0f3-339c17ca4e59.mov
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
219 lines
9.9 KiB
Handlebars
219 lines
9.9 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content admin edit user">
|
|
{{template "admin/navbar" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "admin.users.edit_account"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<form class="ui form" action="{{.Link}}" method="post">
|
|
{{template "base/disable_form_autofill"}}
|
|
{{.CsrfTokenHtml}}
|
|
<div class="field {{if .Err_UserName}}error{{end}}">
|
|
<label for="user_name">{{.locale.Tr "username"}}</label>
|
|
<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}}>
|
|
</div>
|
|
<!-- Types and name -->
|
|
<div class="inline required field {{if .Err_LoginType}}error{{end}}">
|
|
<label>{{.locale.Tr "admin.users.auth_source"}}</label>
|
|
<div class="ui selection type dropdown">
|
|
<input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type.Int}}-{{.LoginSource.ID}}" required>
|
|
<div class="text">{{.locale.Tr "admin.users.local"}}</div>
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<div class="menu">
|
|
<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
|
|
{{range .Sources}}
|
|
<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="inline field {{if .Err_Visibility}}error{{end}}">
|
|
<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
|
|
<div class="ui selection type dropdown">
|
|
{{if .User.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
|
|
{{if .User.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
|
|
{{if .User.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
|
|
<div class="text">
|
|
{{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
|
|
{{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
|
|
{{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
|
|
</div>
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<div class="menu">
|
|
{{range $mode := .AllowedUserVisibilityModes}}
|
|
{{if $mode.IsPublic}}
|
|
<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
|
|
{{else if $mode.IsLimited}}
|
|
<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
|
|
{{else if $mode.IsPrivate}}
|
|
<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}gt-hidden{{end}}">
|
|
<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
|
|
<input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus>
|
|
</div>
|
|
<div class="field {{if .Err_FullName}}error{{end}}">
|
|
<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
|
|
<input id="full_name" name="full_name" value="{{.User.FullName}}">
|
|
</div>
|
|
<div class="required field {{if .Err_Email}}error{{end}}">
|
|
<label for="email">{{.locale.Tr "email"}}</label>
|
|
<input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required>
|
|
</div>
|
|
<div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}gt-hidden{{end}}">
|
|
<label for="password">{{.locale.Tr "password"}}</label>
|
|
<input id="password" name="password" type="password" autocomplete="new-password">
|
|
<p class="help">{{.locale.Tr "admin.users.password_helper"}}</p>
|
|
</div>
|
|
<div class="field {{if .Err_Website}}error{{end}}">
|
|
<label for="website">{{.locale.Tr "settings.website"}}</label>
|
|
<input id="website" name="website" type="url" value="{{.User.Website}}" placeholder="e.g. http://mydomain.com or https://mydomain.com">
|
|
</div>
|
|
<div class="field {{if .Err_Location}}error{{end}}">
|
|
<label for="location">{{.locale.Tr "settings.location"}}</label>
|
|
<input id="location" name="location" value="{{.User.Location}}">
|
|
</div>
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
|
|
<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
|
|
<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.User.MaxRepoCreation}}">
|
|
<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
|
|
</div>
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.is_activated"}}</strong></label>
|
|
<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
|
|
</div>
|
|
</div>
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.prohibit_login"}}</strong></label>
|
|
<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
|
|
</div>
|
|
</div>
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.is_admin"}}</strong></label>
|
|
<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
|
|
</div>
|
|
</div>
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.is_restricted"}}</strong></label>
|
|
<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
|
|
</div>
|
|
</div>
|
|
<div class="inline field {{if DisableGitHooks}}gt-hidden{{end}}">
|
|
<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "admin.users.allow_git_hook_tooltip"}}">
|
|
<label><strong>{{.locale.Tr "admin.users.allow_git_hook"}}</strong></label>
|
|
<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
|
|
</div>
|
|
</div>
|
|
<div class="inline field {{if or (DisableImportLocal) (.DisableMigrations)}}gt-hidden{{end}}">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.allow_import_local"}}</strong></label>
|
|
<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
|
|
</div>
|
|
</div>
|
|
{{if not .DisableRegularOrgCreation}}
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.allow_create_organization"}}</strong></label>
|
|
<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
|
|
{{if .TwoFactorEnabled}}
|
|
<div class="ui divider"></div>
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label><strong>{{.locale.Tr "admin.users.reset_2fa"}}</strong></label>
|
|
<input name="reset_2fa" type="checkbox">
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
|
|
<div class="ui divider"></div>
|
|
|
|
<div class="field">
|
|
<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
|
|
<button class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
|
|
<h4 class="ui top attached header">
|
|
{{.locale.Tr "settings.avatar"}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
|
|
{{.CsrfTokenHtml}}
|
|
{{if not (DisableGravatar $.Context)}}
|
|
<div class="inline field">
|
|
<div class="ui radio checkbox">
|
|
<input name="source" value="lookup" type="radio" {{if not .User.UseCustomAvatar}}checked{{end}}>
|
|
<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
|
|
</div>
|
|
</div>
|
|
<div class="field {{if .Err_Gravatar}}error{{end}}">
|
|
<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
|
|
<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}">
|
|
</div>
|
|
{{end}}
|
|
|
|
<div class="inline field">
|
|
<div class="ui radio checkbox">
|
|
<input name="source" value="local" type="radio" {{if .User.UseCustomAvatar}}checked{{end}}>
|
|
<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="inline field">
|
|
<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
|
|
<input name="avatar" type="file" >
|
|
</div>
|
|
|
|
<div class="field">
|
|
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
|
|
<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "settings.delete_account_title"}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
|
|
</div>
|
|
<form class="ui form" method="POST" action="{{.Link}}/delete">
|
|
{{$.CsrfTokenHtml}}
|
|
<div class="field">
|
|
<div class="ui checkbox">
|
|
<label for="purge">{{.locale.Tr "admin.users.purge"}}</label>
|
|
<input name="purge" type="checkbox">
|
|
</div>
|
|
<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</form>
|
|
</div>
|
|
{{template "base/footer" .}}
|