loading up the forgejo repo on tangled to test page performance
ui(admin): improve names of user settings and add descriptions
Changes
* checkbox titles are no longer strong.
* added descriptions to all options. Mostly from memory, but there are a few sources:
- https://docs.gitea.com/help/faq#active-user-vs-login-prohibited-user
- https://docs.gitea.com/help/faq#restricted-users
* for git hooks, I just moved tooltip into description.
* renamed titles. The only important one is: "Disable sign-in" -> "Suspended account" as it has a change of terminology. We don't seem to have anything about this option in our docs though. This is what the option really does. In fact, it does not invalidate current sessions of the user, but shows them the same "Sign-in prohibited" screen for all actions.
Preview: https://codeberg.org/attachments/e5649045-dfe8-4327-869f-cb2530ca6b17
(the text of the last one is slightly outdated after review)
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4499
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+25
-12
+10
-4
options/locale/locale_en-US.ini
+10
-4
options/locale/locale_en-US.ini
···
3019
3019
users.edit_account = Edit user account
3020
3020
users.max_repo_creation = Maximum number of repositories
3021
3021
users.max_repo_creation_desc = (Enter -1 to use the global default limit.)
3022
-
users.is_activated = User Account Is Activated
3023
-
users.prohibit_login = Disable sign-in
3024
-
users.is_admin = Is administrator
3025
-
users.is_restricted = Is restricted
3022
+
users.is_activated = Activated account
3023
+
users.activated.description = Completion of email verification. The owner of an unactivated account will not be able to log in until email verification is completed.
3024
+
users.prohibit_login = Suspended account
3025
+
users.block.description = Block this user from interacting with this service through their account and prohibit signing in.
3026
+
users.is_admin = Administrator account
3027
+
users.admin.description = Grant this user full access to all administrative features available through the web UI and the API.
3028
+
users.is_restricted = Restricted account
3029
+
users.restricted.description = Only allow interaction with the repositories and organizations where this user is added as a collaborator. This prevents access to public repositories on this instance.
3026
3030
users.allow_git_hook = Can create Git hooks
3027
3031
users.allow_git_hook_tooltip = Git hooks are executed as the OS user running Forgejo and will have the same level of host access. As a result, users with this special Git hook privilege can access and modify all Forgejo repositories as well as the database used by Forgejo. Consequently they are also able to gain Forgejo administrator privileges.
3028
3032
users.allow_import_local = Can import local repositories
3033
+
users.local_import.description = Allow importing repositories from the server's local file system. This can be a security issue.
3029
3034
users.allow_create_organization = Can create organizations
3035
+
users.organization_creation.description = Allow creation of new organizations.
3030
3036
users.update_profile = Update user account
3031
3037
users.delete_account = Delete user account
3032
3038
users.cannot_delete_self = You cannot delete yourself
+15
-8
templates/admin/user/edit.tmpl
+15
-8
templates/admin/user/edit.tmpl
···
110
110
111
111
<div class="inline field">
112
112
<div class="ui checkbox">
113
-
<label><strong>{{ctx.Locale.Tr "admin.users.is_activated"}}</strong></label>
113
+
<label>{{ctx.Locale.Tr "admin.users.is_activated"}}</label>
114
114
<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
115
115
</div>
116
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.activated.description"}}</span>
116
117
</div>
117
118
<div class="inline field">
118
119
<div class="ui checkbox">
119
-
<label><strong>{{ctx.Locale.Tr "admin.users.prohibit_login"}}</strong></label>
120
+
<label>{{ctx.Locale.Tr "admin.users.prohibit_login"}}</label>
120
121
<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
121
122
</div>
123
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.block.description"}}</span>
122
124
</div>
123
125
<div class="inline field">
124
126
<div class="ui checkbox">
125
-
<label><strong>{{ctx.Locale.Tr "admin.users.is_admin"}}</strong></label>
127
+
<label>{{ctx.Locale.Tr "admin.users.is_admin"}}</label>
126
128
<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
127
129
</div>
130
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.admin.description"}}</span>
128
131
</div>
129
132
<div class="inline field">
130
133
<div class="ui checkbox">
131
-
<label><strong>{{ctx.Locale.Tr "admin.users.is_restricted"}}</strong></label>
134
+
<label>{{ctx.Locale.Tr "admin.users.is_restricted"}}</label>
132
135
<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
133
136
</div>
137
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.restricted.description"}}</span>
134
138
</div>
135
139
<div class="inline field {{if DisableGitHooks}}tw-hidden{{end}}">
136
-
<div class="ui checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.users.allow_git_hook_tooltip"}}">
137
-
<label><strong>{{ctx.Locale.Tr "admin.users.allow_git_hook"}}</strong></label>
140
+
<div class="ui checkbox">
141
+
<label>{{ctx.Locale.Tr "admin.users.allow_git_hook"}}</label>
138
142
<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
139
143
</div>
144
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.allow_git_hook_tooltip"}}</span>
140
145
</div>
141
146
<div class="inline field {{if or (DisableImportLocal) (.DisableMigrations)}}tw-hidden{{end}}">
142
147
<div class="ui checkbox">
143
-
<label><strong>{{ctx.Locale.Tr "admin.users.allow_import_local"}}</strong></label>
148
+
<label>{{ctx.Locale.Tr "admin.users.allow_import_local"}}</label>
144
149
<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
145
150
</div>
151
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.local_import.description"}}</span>
146
152
</div>
147
153
{{if not .DisableRegularOrgCreation}}
148
154
<div class="inline field">
149
155
<div class="ui checkbox">
150
-
<label><strong>{{ctx.Locale.Tr "admin.users.allow_create_organization"}}</strong></label>
156
+
<label>{{ctx.Locale.Tr "admin.users.allow_create_organization"}}</label>
151
157
<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
152
158
</div>
159
+
<span class="help tw-block">{{ctx.Locale.Tr "admin.users.organization_creation.description"}}</span>
153
160
</div>
154
161
{{end}}
155
162