-
+
{{template "base/alert" .ctxData}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index c51e6b1d3c3b..3c8b77e93b5b 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -69,7 +69,6 @@ {{.locale.Tr "email"}} {{.locale.Tr "admin.users.activated"}} {{.locale.Tr "admin.users.restricted"}} - {{.locale.Tr "admin.users.repos"}} {{.locale.Tr "admin.users.created"}} {{.locale.Tr "admin.users.last_login"}} @@ -90,7 +89,6 @@ {{.Email}} {{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} - {{.NumRepos}} {{DateTime "short" .CreatedUnix}} {{if .LastLoginUnix}} {{DateTime "short" .LastLoginUnix}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index ac2cf66eb992..984a12b80db3 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -1,29 +1,37 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin view user")}}
-
+

{{.Title}}
- {{.locale.Tr "admin.users.edit"}} + {{ctx.Locale.Tr "admin.users.edit"}}

- {{avatar $.Context .User 48}} + {{ctx.AvatarUtils.Avatar .User 48}}
{{template "shared/user/name" .User}} {{if .User.IsAdmin}} - {{.locale.Tr "admin.users.admin"}} + {{ctx.Locale.Tr "admin.users.admin"}} {{end}}
- {{$.locale.Tr "admin.users.activated"}} + {{ctx.Locale.Tr "admin.users.auth_source"}}: + {{if eq .LoginSource.ID 0 }} + {{ctx.Locale.Tr "admin.users.local"}} + {{else}} + {{.LoginSource.Name}} + {{end}} +
+
+ {{ctx.Locale.Tr "admin.users.activated"}}: {{if .User.IsActive}} {{svg "octicon-check"}} @@ -33,7 +41,7 @@
- {{$.locale.Tr "admin.users.restricted"}} + {{ctx.Locale.Tr "admin.users.restricted"}}: {{if .User.IsRestricted}} {{svg "octicon-check"}} @@ -43,7 +51,12 @@
- {{$.locale.Tr "admin.users.2fa"}} + {{ctx.Locale.Tr "settings.visibility"}}: + {{if .User.Visibility.IsLimited}}{{ctx.Locale.Tr "settings.visibility.limited"}}{{end}} + {{if .User.Visibility.IsPrivate}}{{ctx.Locale.Tr "settings.visibility.private"}}{{end}} +
+
+ {{ctx.Locale.Tr "admin.users.2fa"}}: {{if .TwoFactorEnabled}} {{svg "octicon-check"}} @@ -52,6 +65,19 @@ {{end}}
+ {{if .User.Location}} +
+ {{svg "octicon-location"}}{{.User.Location}} +
+ {{end}} + {{if .User.Website}} +
+ + {{svg "octicon-link"}} + {{.User.Website}} + +
+ {{end}}
@@ -59,7 +85,7 @@

- {{.locale.Tr "admin.emails"}} + {{ctx.Locale.Tr "admin.emails"}}
{{.EmailsTotal}}
@@ -72,12 +98,12 @@
{{.Email}} {{if .IsPrimary}} -
{{$.locale.Tr "settings.primary"}}
+
{{ctx.Locale.Tr "settings.primary"}}
{{end}} {{if .IsActivated}} -
{{$.locale.Tr "settings.activated"}}
+
{{ctx.Locale.Tr "settings.activated"}}
{{else}} -
{{$.locale.Tr "settings.requires_activation"}}
+
{{ctx.Locale.Tr "settings.requires_activation"}}
{{end}}

@@ -88,7 +114,7 @@

- {{.locale.Tr "admin.repositories"}} + {{ctx.Locale.Tr "admin.repositories"}}
{{.ReposTotal}}
@@ -96,6 +122,15 @@
{{template "explore/repo_list" .}}
+

+ {{ctx.Locale.Tr "settings.organization"}} +
+ {{.OrgsTotal}} +
+

+
+ {{template "explore/user_list" .}} +
-{{template "admin/layout_footer" .}} \ No newline at end of file +{{template "admin/layout_footer" .}} diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl new file mode 100644 index 000000000000..ef07a57afe4c --- /dev/null +++ b/templates/explore/user_list.tmpl @@ -0,0 +1,31 @@ +
+ {{range .Users}} +
+
+ {{ctx.AvatarUtils.Avatar . 48}} +
+
+
+ {{template "shared/user/name" .}} + {{if .Visibility.IsPrivate}} + {{ctx.Locale.Tr "repo.desc.private"}} + {{end}} +
+
+ {{if .Location}} + {{svg "octicon-location"}}{{.Location}} + {{end}} + {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} + + {{svg "octicon-mail"}} + {{.Email}} + + {{end}} + {{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} +
+
+
+ {{else}} +
{{ctx.Locale.Tr "explore.user_no_results"}}
+ {{end}} +
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 1280f4add664..7e15ae3d47f4 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -4,37 +4,7 @@
{{template "explore/search" .}} -
- {{range .Users}} -
-
- {{ctx.AvatarUtils.Avatar . 48}} -
-
-
- {{template "shared/user/name" .}} - {{if .Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.private"}} - {{end}} -
-
- {{if .Location}} - {{svg "octicon-location"}}{{.Location}} - {{end}} - {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} - - {{svg "octicon-mail"}} - {{.Email}} - - {{end}} - {{svg "octicon-calendar"}}{{$.locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} -
-
-
- {{else}} -
{{$.locale.Tr "explore.user_no_results"}}
- {{end}} -
+ {{template "explore/user_list" .}} {{template "base/paginate" .}}
diff --git a/web_src/css/admin.css b/web_src/css/admin.css index fecae5f2bf98..a938074e462c 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -42,3 +42,15 @@ .admin .table th { white-space: nowrap; } + +.admin-responsive-columns { + display: flex; + flex-wrap: wrap; + gap: 1rem; + margin-bottom: 1rem; +} + +.admin-responsive-columns > .column { + flex-grow: 1; + flex-basis: calc(50% - .5rem); +} From 70c81e9515ed5205c607943836857d953fea5b35 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 25 Aug 2023 17:42:14 +0200 Subject: [PATCH 3/6] fix tests; apply review suggestion --- templates/admin/user/view.tmpl | 2 +- tests/integration/admin_user_test.go | 6 +++--- web_src/css/admin.css | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 984a12b80db3..723925134a6b 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -24,7 +24,7 @@
{{ctx.Locale.Tr "admin.users.auth_source"}}: - {{if eq .LoginSource.ID 0 }} + {{if eq .LoginSource.ID 0}} {{ctx.Locale.Tr "admin.users.local"}} {{else}} {{.LoginSource.Name}} diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index dd6b9ccbbeb8..669060c787d4 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -51,8 +51,8 @@ func testSuccessfullEdit(t *testing.T, formData user_model.User) { func makeRequest(t *testing.T, formData user_model.User, headerCode int) { session := loginUser(t, "user1") - csrf := GetCSRF(t, session, "/admin/users/"+strconv.Itoa(int(formData.ID))) - req := NewRequestWithValues(t, "POST", "/admin/users/"+strconv.Itoa(int(formData.ID)), map[string]string{ + csrf := GetCSRF(t, session, "/admin/users/"+strconv.Itoa(int(formData.ID))+"/edit") + req := NewRequestWithValues(t, "POST", "/admin/users/"+strconv.Itoa(int(formData.ID))+"/edit", map[string]string{ "_csrf": csrf, "user_name": formData.Name, "login_name": formData.LoginName, @@ -72,7 +72,7 @@ func TestAdminDeleteUser(t *testing.T) { session := loginUser(t, "user1") - csrf := GetCSRF(t, session, "/admin/users/8") + csrf := GetCSRF(t, session, "/admin/users/8/edit") req := NewRequestWithValues(t, "POST", "/admin/users/8/delete", map[string]string{ "_csrf": csrf, }) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index a938074e462c..2eb8e7dd00ce 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -51,6 +51,5 @@ } .admin-responsive-columns > .column { - flex-grow: 1; - flex-basis: calc(50% - .5rem); + flex: 1; } From 36bfa88240d06047bf35d5634cc382bd7b6f6b82 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 25 Aug 2023 17:52:03 +0200 Subject: [PATCH 4/6] split view template --- templates/admin/user/view.tmpl | 92 +------------------------- templates/admin/user/view_details.tmpl | 71 ++++++++++++++++++++ templates/admin/user/view_emails.tmpl | 19 ++++++ 3 files changed, 92 insertions(+), 90 deletions(-) create mode 100644 templates/admin/user/view_details.tmpl create mode 100644 templates/admin/user/view_emails.tmpl diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 723925134a6b..d11efcaca23f 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -10,77 +10,7 @@
-
-
-
- {{ctx.AvatarUtils.Avatar .User 48}} -
-
-
- {{template "shared/user/name" .User}} - {{if .User.IsAdmin}} - {{ctx.Locale.Tr "admin.users.admin"}} - {{end}} -
-
- {{ctx.Locale.Tr "admin.users.auth_source"}}: - {{if eq .LoginSource.ID 0}} - {{ctx.Locale.Tr "admin.users.local"}} - {{else}} - {{.LoginSource.Name}} - {{end}} -
-
- {{ctx.Locale.Tr "admin.users.activated"}}: - - {{if .User.IsActive}} - {{svg "octicon-check"}} - {{else}} - {{svg "octicon-x"}} - {{end}} - -
-
- {{ctx.Locale.Tr "admin.users.restricted"}}: - - {{if .User.IsRestricted}} - {{svg "octicon-check"}} - {{else}} - {{svg "octicon-x"}} - {{end}} - -
-
- {{ctx.Locale.Tr "settings.visibility"}}: - {{if .User.Visibility.IsLimited}}{{ctx.Locale.Tr "settings.visibility.limited"}}{{end}} - {{if .User.Visibility.IsPrivate}}{{ctx.Locale.Tr "settings.visibility.private"}}{{end}} -
-
- {{ctx.Locale.Tr "admin.users.2fa"}}: - - {{if .TwoFactorEnabled}} - {{svg "octicon-check"}} - {{else}} - {{svg "octicon-x"}} - {{end}} - -
- {{if .User.Location}} -
- {{svg "octicon-location"}}{{.User.Location}} -
- {{end}} - {{if .User.Website}} -
- - {{svg "octicon-link"}} - {{.User.Website}} - -
- {{end}} -
-
-
+ {{template "admin/user/view_details" .}}
@@ -91,25 +21,7 @@
-
- {{range .Emails}} -
-
-
- {{.Email}} - {{if .IsPrimary}} -
{{ctx.Locale.Tr "settings.primary"}}
- {{end}} - {{if .IsActivated}} -
{{ctx.Locale.Tr "settings.activated"}}
- {{else}} -
{{ctx.Locale.Tr "settings.requires_activation"}}
- {{end}} -
-
-
- {{end}} -
+ {{template "admin/user/view_emails" .}}