-
+
{{template "base/alert" .ctxData}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 5cd617a0b5..c9d3a552dc 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -17,7 +17,7 @@ {{range .Notices}} -
+
{{.ID}} {{$.locale.Tr .TrStr}} {{.Description}} @@ -31,7 +31,7 @@ -
+ {{.CsrfTokenHtml}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index 4ed9dbb9aa..efca8c1f2f 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -11,6 +11,7 @@ {{.locale.Tr "admin.monitor.queue.type"}} {{.locale.Tr "admin.monitor.queue.exemplar"}} {{.locale.Tr "admin.monitor.queue.numberworkers"}} + {{.locale.Tr "admin.monitor.queue.activeworkers"}} {{.locale.Tr "admin.monitor.queue.numberinqueue"}} @@ -21,9 +22,10 @@ {{$q.GetName}} {{$q.GetType}} {{$q.GetItemTypeName}} - {{$sum := $q.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}} - {{$sum = $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}} - {{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}} + {{$q.GetWorkerNumber}} + {{$q.GetWorkerActiveNumber}} + {{$sum := $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}} + {{$.locale.Tr "admin.monitor.queue.review_add"}} {{end}} diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index c8ae07a19a..a46d9462ec 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -11,6 +11,7 @@ {{.locale.Tr "admin.monitor.queue.type"}} {{.locale.Tr "admin.monitor.queue.exemplar"}} {{.locale.Tr "admin.monitor.queue.numberworkers"}} + {{.locale.Tr "admin.monitor.queue.activeworkers"}} {{.locale.Tr "admin.monitor.queue.maxnumberworkers"}} {{.locale.Tr "admin.monitor.queue.numberinqueue"}} @@ -20,10 +21,11 @@ {{.Queue.GetName}} {{.Queue.GetType}} {{.Queue.GetItemTypeName}} - {{$sum := .Queue.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}} - {{if lt $sum 0}}-{{else}}{{.Queue.GetWorkerMaxNumber}}{{end}} + {{.Queue.GetWorkerNumber}} + {{.Queue.GetWorkerActiveNumber}} + {{.Queue.GetWorkerMaxNumber}} - {{$sum = .Queue.GetQueueItemNumber}} + {{$sum := .Queue.GetQueueItemNumber}} {{if lt $sum 0}} - {{else}} diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl index 15e51e4aca..b0e282bcc7 100644 --- a/templates/admin/stacktrace-row.tmpl +++ b/templates/admin/stacktrace-row.tmpl @@ -27,7 +27,7 @@
-
+
{{svg "octicon-code" 16}}{{.Description}}{{if gt .Count 1}} * {{.Count}}{{end}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 45fed87a40..b3e0caa169 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -68,36 +68,35 @@ {{.locale.Tr "email"}} {{.locale.Tr "admin.users.activated"}} - {{.locale.Tr "admin.users.admin"}} {{.locale.Tr "admin.users.restricted"}} {{.locale.Tr "admin.users.2fa"}} - {{.locale.Tr "admin.users.repos"}} {{.locale.Tr "admin.users.created"}} {{.locale.Tr "admin.users.last_login"}} {{SortArrow "lastlogin" "reverselastlogin" $.SortType false}} - {{.locale.Tr "admin.users.edit"}} {{range .Users}} {{.ID}} - {{.Name}} + + {{.Name}} + {{if .IsAdmin}} + {{$.locale.Tr "admin.users.admin"}} + {{end}} + {{.Email}} {{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} - {{if .IsAdmin}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} - {{.NumRepos}} {{DateTime "short" .CreatedUnix}} {{if .LastLoginUnix}} {{DateTime "short" .LastLoginUnix}} {{else}} {{$.locale.Tr "admin.users.never_login"}} {{end}} - {{svg "octicon-pencil"}} {{end}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl new file mode 100644 index 0000000000..fd3017607c --- /dev/null +++ b/templates/admin/user/view.tmpl @@ -0,0 +1,48 @@ +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin view user")}} + +
+
+
+

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

+
+ {{template "admin/user/view_details" .}} +
+
+
+

+ {{ctx.Locale.Tr "admin.emails"}} +
+ {{.EmailsTotal}} +
+

+
+ {{template "admin/user/view_emails" .}} +
+
+
+

+ {{ctx.Locale.Tr "admin.repositories"}} +
+ {{.ReposTotal}} +
+

+
+ {{template "explore/repo_list" .}} +
+

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

+
+ {{template "explore/user_list" .}} +
+
+ +{{template "admin/layout_footer" .}} diff --git a/templates/admin/user/view_details.tmpl b/templates/admin/user/view_details.tmpl new file mode 100644 index 0000000000..ceb3b9a055 --- /dev/null +++ b/templates/admin/user/view_details.tmpl @@ -0,0 +1,65 @@ +
+
+
+ {{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}} +
+
+
diff --git a/templates/admin/user/view_emails.tmpl b/templates/admin/user/view_emails.tmpl new file mode 100644 index 0000000000..22ce305a88 --- /dev/null +++ b/templates/admin/user/view_emails.tmpl @@ -0,0 +1,19 @@ +
+ {{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}} +
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index 3b87f25d63..cf647f1cc6 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -23,7 +23,7 @@ {{end}}
- {{.locale.Tr "licenses"}} + {{.locale.Tr "licenses"}} {{if .EnableSwagger}}API{{end}} {{template "custom/extra_links_footer" .}}
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 8eebaebd70..c3645209cd 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -25,42 +25,7 @@ .ui.secondary.menu .dropdown.item > .menu { margin-top: 0; } -{{if .PageIsUserProfile}} - - - - - {{if .ContextUser.Description}} - - {{end}} -{{else if .Repository}} - {{if .Issue}} - - - {{if .Issue.Content}} - - {{end}} - {{else}} - - - {{if .Repository.Description}} - - {{end}} - {{end}} - - {{if (.Repository.AvatarLink ctx)}} - - {{else}} - - {{end}} -{{else}} - - - - - -{{end}} - + {{template "base/head_opengraph" .}} {{template "base/head_style" .}} {{template "custom/header" .}} diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1ad7fd20bd..5a2d0ddb0b 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -48,7 +48,7 @@ {{template "custom/extra_links" .}} {{if not .IsSigned}} - {{.locale.Tr "help"}} + {{.locale.Tr "help"}} {{end}}
@@ -171,7 +171,7 @@ {{svg "octicon-tools"}} {{.locale.Tr "your_settings"}} - + {{svg "octicon-question"}} {{.locale.Tr "help"}} diff --git a/templates/base/head_opengraph.tmpl b/templates/base/head_opengraph.tmpl new file mode 100644 index 0000000000..19d924610c --- /dev/null +++ b/templates/base/head_opengraph.tmpl @@ -0,0 +1,47 @@ +{{- /* og:description - a one to two sentence description of your object, maybe it only needs at most 300 bytes */ -}} +{{if .PageIsUserProfile}} + + + + + {{if .ContextUser.Description}} + + {{end}} +{{else if .Repository}} + {{if .Issue}} + + + {{if .Issue.Content}} + + {{end}} + {{else if or .PageIsDiff .IsViewFile}} + + + {{if .PageIsDiff}} + {{- $commitMessageParts := StringUtils.Cut .Commit.Message "\n" -}} + {{- $commitMessageBody := index $commitMessageParts 1 -}} + {{- if $commitMessageBody -}} + + {{- end -}} + {{end}} + {{else}} + + + {{if .Repository.Description}} + + {{end}} + {{end}} + + {{if (.Repository.AvatarLink ctx)}} + + {{else}} + + {{end}} +{{else}} + + + + + +{{end}} + diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl index 684e2860bf..faac696705 100644 --- a/templates/code/searchresults.tmpl +++ b/templates/code/searchresults.tmpl @@ -1,6 +1,6 @@ -
+
{{range $term := .SearchResultLanguages}} - + {{$term.Language}}
{{$term.Count}}
diff --git a/templates/devtest/flex-list.tmpl b/templates/devtest/flex-list.tmpl index f9087a5714..80cd22440d 100644 --- a/templates/devtest/flex-list.tmpl +++ b/templates/devtest/flex-list.tmpl @@ -1,8 +1,9 @@ {{template "base/head" .}} -
-
-

Flex List

+
+
+

Flex List (standalone)

+
@@ -84,6 +85,31 @@
+ +
+ +

Flex List (with "ui segment")

+
+
+
item 1
+
item 2
+
+
+
+

Flex List (with "ui segment")

+
+
item 1
+
item 2
+
+
+ +

If parent provides the padding/margin space:

+
+
+
item 1 (no padding top)
+
item 2 (no padding bottom)
+
+
{{template "base/footer" .}} diff --git a/templates/devtest/fomantic-modal.tmpl b/templates/devtest/fomantic-modal.tmpl index 799bab7594..b91b29f3cc 100644 --- a/templates/devtest/fomantic-modal.tmpl +++ b/templates/devtest/fomantic-modal.tmpl @@ -2,16 +2,33 @@
{{template "base/alert" .}} - - {{template "base/footer" .}} diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 342f8c2e9b..b3b68c4dba 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -79,6 +79,14 @@
+
+

Buttons

+
+
+
+
+
+

Tooltip

text with tooltip
diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl new file mode 100644 index 0000000000..cf6a2933b0 --- /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 .Email (or (and $.ShowUserEmail $.IsSigned (not .KeepEmailPrivate)) $.PageIsAdminUsers)}} + + {{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 1280f4add6..7e15ae3d47 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/templates/install.tmpl b/templates/install.tmpl index 1716d0a5e4..c8e094b5a3 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -8,7 +8,7 @@
{{template "base/alert" .}} -

{{.locale.Tr "install.docker_helper" "https://docs.gitea.io/en-us/install-with-docker/" | Safe}}

+

{{.locale.Tr "install.docker_helper" "https://docs.gitea.com/installation/install-with-docker" | Safe}}

diff --git a/templates/mail/team_invite.tmpl b/templates/mail/team_invite.tmpl index 8357895265..d21b7843ec 100644 --- a/templates/mail/team_invite.tmpl +++ b/templates/mail/team_invite.tmpl @@ -4,10 +4,9 @@ -{{$invite_url := printf "%sorg/invite/%s" AppUrl (QueryEscape .Invite.Token)}}

{{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName) | Str2html}}

-

{{.locale.Tr "mail.team_invite.text_2"}}

{{$invite_url}}

+

{{.locale.Tr "mail.team_invite.text_2"}}

{{.InviteURL}}

{{.locale.Tr "mail.link_not_working_do_paste"}}

{{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 7e988ba0c7..966150aa93 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -19,15 +19,15 @@
- +
- +
- +
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 0bd744d2b8..72be948650 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -57,7 +57,7 @@ {{if .NumMembers}}

{{.locale.Tr "org.members"}} - {{.NumMembers}} {{svg "octicon-chevron-right"}} + {{.NumMembers}} {{svg "octicon-chevron-right"}}

{{$isMember := .IsOrganizationMember}} @@ -71,7 +71,7 @@ {{if .IsOrganizationMember}}
{{.locale.Tr "org.teams"}} - {{.Org.NumTeams}} {{svg "octicon-chevron-right"}} + {{.Org.NumTeams}} {{svg "octicon-chevron-right"}}
{{range .Teams}} diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 2700c61bb6..81dde17455 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,14 +1,10 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
-
-
+
+
{{$.locale.Tr "org.settings.labels_desc" | Str2html}}
-
-
- -
-
+
{{template "repo/issue/labels/label_new" .}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 03827e4c3f..ecc269481d 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -40,19 +40,19 @@
- +
- +
- +
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index ab5f6c6e75..71c9bb9563 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -10,7 +10,7 @@ {{$canAddRemove := and $.IsOrganizationOwner (not $.Team.IncludesAllRepositories)}} {{if $canAddRemove}}
- + {{.CsrfTokenHtml}}
- +
diff --git a/templates/package/content/cargo.tmpl b/templates/package/content/cargo.tmpl index b3dfbae257..b7a34632e4 100644 --- a/templates/package/content/cargo.tmpl +++ b/templates/package/content/cargo.tmpl @@ -18,7 +18,7 @@ git-fetch-with-cli = true
cargo add {{.PackageDescriptor.Package.Name}}@{{.PackageDescriptor.Version.Version}}
- +
diff --git a/templates/package/content/chef.tmpl b/templates/package/content/chef.tmpl index 331b1fb49f..2596f8d493 100644 --- a/templates/package/content/chef.tmpl +++ b/templates/package/content/chef.tmpl @@ -11,7 +11,7 @@ 
knife supermarket install {{.PackageDescriptor.Package.Name}} {{.PackageDescriptor.Version.Version}}
- +
diff --git a/templates/package/content/composer.tmpl b/templates/package/content/composer.tmpl index c2a8bc9625..80997c583f 100644 --- a/templates/package/content/composer.tmpl +++ b/templates/package/content/composer.tmpl @@ -17,7 +17,7 @@ 
composer require {{.PackageDescriptor.Package.Name}}:{{.PackageDescriptor.Version.Version}}
- +