diff options
Diffstat (limited to 'templates/admin')
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 69 | ||||
| -rw-r--r-- | templates/admin/auth/source/oauth.tmpl | 16 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 6 | ||||
| -rw-r--r-- | templates/admin/hooks.tmpl | 3 | ||||
| -rw-r--r-- | templates/admin/packages/list.tmpl | 19 | ||||
| -rw-r--r-- | templates/admin/repo/list.tmpl | 23 | ||||
| -rw-r--r-- | templates/admin/user/edit.tmpl | 6 | ||||
| -rw-r--r-- | templates/admin/user/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/admin/user/view.tmpl | 17 |
9 files changed, 72 insertions, 89 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 660f0d0881..7b96b4e94f 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -15,7 +15,14 @@ </div> <div class="required inline field {{if .Err_Name}}error{{end}}"> <label for="auth_name">{{ctx.Locale.Tr "admin.auths.auth_name"}}</label> - <input id="auth_name" name="name" value="{{.Source.Name}}" autofocus required> + <input id="auth_name" name="name" value="{{.Source.Name}}" required> + </div> + <div class="inline field"> + <div class="ui checkbox"> + <label ><strong>{{ctx.Locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label> + <input name="two_factor_policy" type="checkbox" value="skip" {{if eq .Source.TwoFactorPolicy "skip"}}checked{{end}}> + <p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p> + </div> </div> <!-- LDAP and DLDAP --> @@ -159,13 +166,6 @@ </div> </div> {{end}} - <div class="optional field"> - <div class="ui checkbox"> - <label for="skip_local_two_fa"><strong>{{ctx.Locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label> - <input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}> - <p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p> - </div> - </div> <div class="inline field"> <div class="ui checkbox"> <label for="allow_deactivate_all"><strong>{{ctx.Locale.Tr "admin.auths.allow_deactivate_all"}}</strong></label> @@ -227,13 +227,6 @@ <input id="allowed_domains" name="allowed_domains" value="{{$cfg.AllowedDomains}}"> <p class="help">{{ctx.Locale.Tr "admin.auths.allowed_domains_helper"}}</p> </div> - <div class="optional field"> - <div class="ui checkbox"> - <label for="skip_local_two_fa"><strong>{{ctx.Locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label> - <input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}> - <p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p> - </div> - </div> {{end}} <!-- PAM --> @@ -247,13 +240,6 @@ <label for="pam_email_domain">{{ctx.Locale.Tr "admin.auths.pam_email_domain"}}</label> <input id="pam_email_domain" name="pam_email_domain" value="{{$cfg.EmailDomain}}"> </div> - <div class="optional field"> - <div class="ui checkbox"> - <label for="skip_local_two_fa"><strong>{{ctx.Locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label> - <input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}> - <p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p> - </div> - </div> {{end}} <!-- OAuth2 --> @@ -288,13 +274,6 @@ <label for="open_id_connect_auto_discovery_url">{{ctx.Locale.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label> <input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{$cfg.OpenIDConnectAutoDiscoveryURL}}"> </div> - <div class="optional field"> - <div class="ui checkbox"> - <label for="skip_local_two_fa"><strong>{{ctx.Locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label> - <input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}> - <p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p> - </div> - </div> <div class="oauth2_use_custom_url inline field"> <div class="ui checkbox"> <label><strong>{{ctx.Locale.Tr "admin.auths.oauth2_use_custom_url"}}</strong></label> @@ -322,20 +301,31 @@ <input id="oauth2_tenant" name="oauth2_tenant" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.Tenant}}{{end}}"> </div> - {{range .OAuth2Providers}}{{if .CustomURLSettings}} + {{range .OAuth2Providers}} + <input id="{{.Name}}_SupportSSHPublicKey" value="{{.SupportSSHPublicKey}}" type="hidden"> + {{if .CustomURLSettings}} <input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true"> <input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden"> <input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden"> <input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden"> <input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden"> <input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden"> - {{end}}{{end}} + {{end}} + {{end}} <div class="field"> <label for="oauth2_scopes">{{ctx.Locale.Tr "admin.auths.oauth2_scopes"}}</label> <input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{StringUtils.Join $cfg.Scopes ","}}{{end}}"> </div> <div class="field"> + <label>{{ctx.Locale.Tr "admin.auths.oauth2_full_name_claim_name"}}</label> + <input name="oauth2_full_name_claim_name" value="{{$cfg.FullNameClaimName}}" placeholder="name"> + </div> + <div class="field oauth2_ssh_public_key_claim_name"> + <label>{{ctx.Locale.Tr "admin.auths.oauth2_ssh_public_key_claim_name"}}</label> + <input name="oauth2_ssh_public_key_claim_name" value="{{$cfg.SSHPublicKeyClaimName}}" placeholder="sshpubkey"> + </div> + <div class="field"> <label for="oauth2_required_claim_name">{{ctx.Locale.Tr "admin.auths.oauth2_required_claim_name"}}</label> <input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{$cfg.RequiredClaimName}}"> <p class="help">{{ctx.Locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}</p> @@ -429,7 +419,10 @@ <div class="field"> <button class="ui primary button">{{ctx.Locale.Tr "admin.auths.update"}}</button> - <button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{ctx.Locale.Tr "admin.auths.delete"}}</button> + <button class="ui red button link-action" data-url="{{$.Link}}/delete?id={{.Source.ID}}" + data-modal-confirm-header="{{ctx.Locale.Tr "admin.auths.delete_auth_title"}}" + data-modal-confirm-content="{{ctx.Locale.Tr "admin.auths.delete_auth_desc"}}" + >{{ctx.Locale.Tr "admin.auths.delete"}}</button> </div> </form> </div> @@ -445,16 +438,4 @@ <p class="oauth2">{{ctx.Locale.Tr "admin.auths.tips.oauth2.general.tip"}} <b id="oauth2-callback-url"></b></p> </div> </div> - -<div class="ui g-modal-confirm delete modal"> - <div class="header"> - {{svg "octicon-trash"}} - {{ctx.Locale.Tr "admin.auths.delete_auth_title"}} - </div> - <div class="content"> - <p>{{ctx.Locale.Tr "admin.auths.delete_auth_desc"}}</p> - </div> - {{template "base/modal_actions_confirm" .}} -</div> - {{template "admin/layout_footer" .}} diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index f02c5bdf30..69590635e4 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -63,19 +63,31 @@ <input id="oauth2_tenant" name="oauth2_tenant" value="{{.oauth2_tenant}}"> </div> - {{range .OAuth2Providers}}{{if .CustomURLSettings}} + {{range .OAuth2Providers}} + <input id="{{.Name}}_SupportSSHPublicKey" value="{{.SupportSSHPublicKey}}" type="hidden"> + {{if .CustomURLSettings}} <input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true"> <input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden"> <input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden"> <input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden"> <input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden"> <input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden"> - {{end}}{{end}} + {{end}} + {{end}} <div class="field"> <label for="oauth2_scopes">{{ctx.Locale.Tr "admin.auths.oauth2_scopes"}}</label> <input id="oauth2_scopes" name="oauth2_scopes" value="{{.oauth2_scopes}}"> </div> + + <div class="field"> + <label>{{ctx.Locale.Tr "admin.auths.oauth2_full_name_claim_name"}}</label> + <input name="oauth2_full_name_claim_name" value="{{.oauth2_full_name_claim_name}}" placeholder="name"> + </div> + <div class="field oauth2_ssh_public_key_claim_name"> + <label>{{ctx.Locale.Tr "admin.auths.oauth2_ssh_public_key_claim_name"}}</label> + <input name="oauth2_ssh_public_key_claim_name" value="{{.oauth2_ssh_public_key_claim_name}}" placeholder="sshpubkey"> + </div> <div class="field"> <label for="oauth2_required_claim_name">{{ctx.Locale.Tr "admin.auths.oauth2_required_claim_name"}}</label> <input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{.oauth2_required_claim_name}}"> diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 29a5e1b473..806347c720 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -69,10 +69,6 @@ {{if not .SSH.StartBuiltinServer}} <dt>{{ctx.Locale.Tr "admin.config.ssh_root_path"}}</dt> <dd>{{.SSH.RootPath}}</dd> - <dt>{{ctx.Locale.Tr "admin.config.ssh_key_test_path"}}</dt> - <dd>{{.SSH.KeyTestPath}}</dd> - <dt>{{ctx.Locale.Tr "admin.config.ssh_keygen_path"}}</dt> - <dd>{{.SSH.KeygenPath}}</dd> <dt>{{ctx.Locale.Tr "admin.config.ssh_minimum_key_size_check"}}</dt> <dd>{{svg (Iif .SSH.MinimumKeySizeCheck "octicon-check" "octicon-x")}}</dd> {{if .SSH.MinimumKeySizeCheck}} @@ -148,7 +144,7 @@ <dt>{{ctx.Locale.Tr "admin.config.enable_openid_signin"}}</dt> <dd>{{svg (Iif .Service.EnableOpenIDSignIn "octicon-check" "octicon-x")}}</dd> <dt>{{ctx.Locale.Tr "admin.config.require_sign_in_view"}}</dt> - <dd>{{svg (Iif .Service.RequireSignInView "octicon-check" "octicon-x")}}</dd> + <dd>{{svg (Iif .Service.RequireSignInViewStrict "octicon-check" "octicon-x")}}</dd> <dt>{{ctx.Locale.Tr "admin.config.mail_notify"}}</dt> <dd>{{svg (Iif .Service.EnableNotifyMail "octicon-check" "octicon-x")}}</dd> <dt>{{ctx.Locale.Tr "admin.config.enable_captcha"}}</dt> diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl index c77d27dbd0..d5fdef6850 100644 --- a/templates/admin/hooks.tmpl +++ b/templates/admin/hooks.tmpl @@ -1,9 +1,6 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}} <div class="admin-setting-content"> - {{template "repo/settings/webhook/base_list" .SystemWebhooks}} {{template "repo/settings/webhook/base_list" .DefaultWebhooks}} - - {{template "repo/settings/webhook/delete_modal" .}} </div> {{template "admin/layout_footer" .}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 0c6889b599..4817f2681b 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -72,7 +72,12 @@ </td> <td>{{FileSize .CalculateBlobSize}}</td> <td>{{DateUtils.AbsoluteShort .Version.CreatedUnix}}</td> - <td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td> + <td> + <a class="text red show-modal" href data-modal="#admin-package-delete-modal" + data-modal-form.action="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}&id={{.Version.ID}}" + data-modal-package-name="{{.Package.Name}}" data-modal-package-version="{{.Version.Version}}" + >{{svg "octicon-trash"}}</a> + </td> </tr> {{else}} <tr><td class="tw-text-center" colspan="10">{{ctx.Locale.Tr "no_results_found"}}</td></tr> @@ -84,15 +89,13 @@ {{template "base/paginate" .}} </div> -<div class="ui g-modal-confirm delete modal"> - <div class="header"> - {{svg "octicon-trash"}} - {{ctx.Locale.Tr "packages.settings.delete"}} - </div> +<form class="ui small modal form-fetch-action" method="post" id="admin-package-delete-modal"> + {{.CsrfTokenHtml}} + <div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "packages.settings.delete"}}</div> <div class="content"> - {{ctx.Locale.Tr "packages.settings.delete.notice" (`<span class="name"></span>`|SafeHTML) (`<span class="dataVersion"></span>`|SafeHTML)}} + {{ctx.Locale.Tr "packages.settings.delete.notice" (HTMLFormat `<span class="%s"></span>` "package-name") (HTMLFormat `<span class="%s"></span>` "package-version")}} </div> {{template "base/modal_actions_confirm" .}} -</div> +</form> {{template "admin/layout_footer" .}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 762013af47..767d00fa74 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -7,10 +7,10 @@ </div> </h4> <div class="ui attached segment"> - {{template "shared/repo_search" .}} + {{template "shared/repo/search" .}} </div> <div class="ui attached table segment"> - <table class="ui very basic striped table unstackable"> + <table class="ui very basic striped table selectable unstackable"> <thead> <tr> <th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th> @@ -84,7 +84,12 @@ <td>{{FileSize .LFSSize}}</td> <td>{{DateUtils.AbsoluteShort .UpdatedUnix}}</td> <td>{{DateUtils.AbsoluteShort .CreatedUnix}}</td> - <td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td> + <td> + <a class="text red show-modal" href data-modal="#admin-repo-delete-modal" + data-modal-form.action="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}&id={{.ID}}" + data-modal-repo-name="{{.Name}}" + >{{svg "octicon-trash"}}</a> + </td> </tr> {{else}} <tr><td class="tw-text-center" colspan="12">{{ctx.Locale.Tr "no_results_found"}}</td></tr> @@ -96,17 +101,15 @@ {{template "base/paginate" .}} </div> -<div class="ui g-modal-confirm delete modal"> - <div class="header"> - {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.settings.delete"}} - </div> +<form class="ui small modal form-fetch-action" id="admin-repo-delete-modal" method="post"> + {{.CsrfTokenHtml}} + <div class="header">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.settings.delete"}}</div> <div class="content"> <p>{{ctx.Locale.Tr "repo.settings.delete_desc"}}</p> - {{ctx.Locale.Tr "repo.settings.delete_notices_2" (`<span class="name"></span>`|SafeHTML)}}<br> + {{ctx.Locale.Tr "repo.settings.delete_notices_2" (HTMLFormat `<span class="%s"></span>` "repo-name")}}<br> {{ctx.Locale.Tr "repo.settings.delete_notices_fork_1"}}<br> </div> {{template "base/modal_actions_confirm" .}} -</div> +</form> {{template "admin/layout_footer" .}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index c04d332660..879b5cb550 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -9,7 +9,7 @@ {{.CsrfTokenHtml}} <div class="field {{if .Err_UserName}}error{{end}}"> <label for="user_name">{{ctx.Locale.Tr "username"}}</label> - <input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}} maxlength="40"> + <input id="user_name" name="user_name" value="{{.User.Name}}" {{if not .User.IsLocal}}disabled{{end}} maxlength="40"> </div> <!-- Types and name --> <div class="inline required field {{if .Err_LoginType}}error{{end}}"> @@ -55,7 +55,7 @@ <div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}tw-hidden{{end}}"> <label for="login_name">{{ctx.Locale.Tr "admin.users.auth_login_name"}}</label> - <input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus> + <input id="login_name" name="login_name" value="{{.User.LoginName}}"> </div> <div class="field {{if .Err_FullName}}error{{end}}"> <label for="full_name">{{ctx.Locale.Tr "settings.full_name"}}</label> @@ -63,7 +63,7 @@ </div> <div class="required field {{if .Err_Email}}error{{end}}"> <label for="email">{{ctx.Locale.Tr "email"}}</label> - <input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required> + <input id="email" name="email" type="email" value="{{.User.Email}}" required> </div> <div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}tw-hidden{{end}}"> <label for="password">{{ctx.Locale.Tr "password"}}</label> diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index eb3f6cd720..49f62dda74 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -56,7 +56,7 @@ </form> </div> <div class="ui attached table segment"> - <table class="ui very basic striped table unstackable"> + <table class="ui very basic striped selectable table unstackable"> <thead> <tr> <th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" .SortType false}}</th> diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 21943a8382..67f9148e64 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -15,10 +15,7 @@ </div> <div class="tw-flex-1"> <h4 class="ui top attached header"> - {{ctx.Locale.Tr "admin.emails"}} - <div class="ui right"> - {{.EmailsTotal}} - </div> + {{ctx.Locale.Tr "admin.emails"}} ({{ctx.Locale.Tr "admin.total" .EmailsTotal}}) </h4> <div class="ui attached segment"> {{template "admin/user/view_emails" .}} @@ -26,19 +23,13 @@ </div> </div> <h4 class="ui top attached header"> - {{ctx.Locale.Tr "admin.repositories"}} - <div class="ui right"> - {{.ReposTotal}} - </div> + {{ctx.Locale.Tr "admin.repositories"}} ({{ctx.Locale.Tr "admin.total" .ReposTotal}}) </h4> <div class="ui attached segment"> - {{template "explore/repo_list" .}} + {{template "shared/repo/list" .}} </div> <h4 class="ui top attached header"> - {{ctx.Locale.Tr "settings.organization"}} - <div class="ui right"> - {{.OrgsTotal}} - </div> + {{ctx.Locale.Tr "settings.organization"}} ({{ctx.Locale.Tr "admin.total" .OrgsTotal}}) </h4> <div class="ui attached segment"> {{template "explore/user_list" .}} |