From 89dd9488376febacb0bfc7cbc692cd8c74e41804 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sun, 10 Sep 2023 11:49:31 +0200 Subject: [PATCH 1/6] add tooltip to user details link --- templates/admin/user/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index b3e0caa16915b..6e81b0972e872 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -82,7 +82,7 @@ {{.ID}} - {{.Name}} + {{.Name}} {{if .IsAdmin}} {{$.locale.Tr "admin.users.admin"}} {{end}} From fbc0e1a570139c1535c98df049746223458506dd Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 21 Sep 2023 07:29:48 +0200 Subject: [PATCH 2/6] switch to icons --- templates/admin/user/list.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index e18cf7f3e5b35..e07d0e1fc5714 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -75,6 +75,7 @@ {{.locale.Tr "admin.users.last_login"}} {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} + {{.locale.Tr "admin.users.details"}} @@ -82,7 +83,7 @@ {{.ID}} - {{.Name}} + {{svg "octicon-home"}}{{.Name}} {{if .IsAdmin}} {{$.locale.Tr "admin.users.admin"}} {{else if eq 2 .Type}}{{/* Reserved user */}} @@ -103,6 +104,7 @@ {{else}} {{$.locale.Tr "admin.users.never_login"}} {{end}} + {{svg "octicon-person"}} {{end}} From b83082c5d98823eade02f46e66b12825c47acb96 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Thu, 21 Sep 2023 10:51:10 +0200 Subject: [PATCH 3/6] fix template --- templates/admin/user/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index e07d0e1fc5714..973b8c3baff79 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -104,7 +104,7 @@ {{else}} {{$.locale.Tr "admin.users.never_login"}} {{end}} - {{svg "octicon-person"}} + {{svg "octicon-person"}} {{end}} From e90ee5116f7a3581306673ee5ee0d1316fd39c8b Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 29 Sep 2023 20:45:28 +0200 Subject: [PATCH 4/6] Remove home icon, add edit link and column label --- options/locale/locale_en-US.ini | 1 + templates/admin/org/list.tmpl | 4 ++-- templates/admin/user/list.tmpl | 11 ++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8667e77a89505..b5dbbbe3e3659 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -90,6 +90,7 @@ remove = Remove remove_all = Remove All remove_label_str = Remove item "%s" edit = Edit +actions_noun = Actions enabled = Enabled disabled = Disabled diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 1c041ca347340..4a2eed6dd6ad3 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -25,7 +25,7 @@ {{ctx.Locale.Tr "admin.users.created"}} {{SortArrow "recentupdate" "leastupdate" $.SortType false}} - {{ctx.Locale.Tr "admin.users.edit"}} + {{ctx.Locale.Tr "actions_noun"}} @@ -45,7 +45,7 @@ {{.NumMembers}} {{.NumRepos}} {{DateTime "short" .CreatedUnix}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 3f84cdfecd825..f7a7fae3e932f 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -77,7 +77,7 @@ {{ctx.Locale.Tr "admin.users.last_login"}} {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} - {{.locale.Tr "admin.users.details"}} + {{.locale.Tr "actions_noun"}} @@ -85,7 +85,7 @@ {{.ID}} - {{svg "octicon-home"}}{{.Name}} + {{.Name}} {{if .IsAdmin}} {{ctx.Locale.Tr "admin.users.admin"}} {{else if eq 2 .Type}}{{/* Reserved user */}} @@ -106,7 +106,12 @@ {{else}} {{ctx.Locale.Tr "admin.users.never_login"}} {{end}} - {{svg "octicon-person"}} + +
+ {{svg "octicon-person"}} + {{svg "octicon-pencil"}} +
+ {{end}} From a107e65dd66d2a5dd98ec928c607ba9e7198f4df Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 29 Sep 2023 21:13:10 +0200 Subject: [PATCH 5/6] change actions to operations --- options/locale/locale_en-US.ini | 1 - templates/admin/org/list.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b5dbbbe3e3659..8667e77a89505 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -90,7 +90,6 @@ remove = Remove remove_all = Remove All remove_label_str = Remove item "%s" edit = Edit -actions_noun = Actions enabled = Enabled disabled = Disabled diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 4a2eed6dd6ad3..d5a3d426bc025 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -25,7 +25,7 @@ {{ctx.Locale.Tr "admin.users.created"}} {{SortArrow "recentupdate" "leastupdate" $.SortType false}} - {{ctx.Locale.Tr "actions_noun"}} + {{ctx.Locale.Tr "repo.commit.operations"}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index f7a7fae3e932f..98be16b4d1899 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -77,7 +77,7 @@ {{ctx.Locale.Tr "admin.users.last_login"}} {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} - {{.locale.Tr "actions_noun"}} + {{.locale.Tr "repo.commit.operations"}} From 59683b94deffb2f42a7aa0bb4316b335a4264690 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Sat, 30 Sep 2023 11:40:09 +0200 Subject: [PATCH 6/6] remove header title --- templates/admin/org/list.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index d5a3d426bc025..0d79456b47c7f 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -25,7 +25,7 @@ {{ctx.Locale.Tr "admin.users.created"}} {{SortArrow "recentupdate" "leastupdate" $.SortType false}} - {{ctx.Locale.Tr "repo.commit.operations"}} + diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 98be16b4d1899..46fd376dae9da 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -77,7 +77,7 @@ {{ctx.Locale.Tr "admin.users.last_login"}} {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} - {{.locale.Tr "repo.commit.operations"}} +