diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go --- a/appview/pages/funcmap.go +++ b/appview/pages/funcmap.go @@ -45,6 +45,12 @@ return template.FuncMap{ "split": func(s string) []string { return strings.Split(s, "\n") }, + "capitalize": func(s string) string { + if s == "" { + return s + } + return strings.ToUpper(s[:1]) + s[1:] + }, "trimPrefix": func(s, prefix string) string { return strings.TrimPrefix(s, prefix) }, @@ -527,20 +533,20 @@ return map[string]any{ "OrderedReactionKinds": models.OrderedReactionKinds, // would be great to have ordered maps right about now "UserSettingsTabs": []tab{ - {"Name": "profile", "Icon": "user"}, - {"Name": "keys", "Icon": "key"}, - {"Name": "emails", "Icon": "mail"}, - {"Name": "notifications", "Icon": "bell"}, - {"Name": "knots", "Icon": "volleyball"}, - {"Name": "spindles", "Icon": "spool"}, - {"Name": "sites", "Icon": "globe"}, + {"Name": "profile", "Label": "Profile", "Icon": "user"}, + {"Name": "keys", "Label": "Keys", "Icon": "key"}, + {"Name": "emails", "Label": "Emails", "Icon": "mail"}, + {"Name": "notifications", "Label": "Notifications", "Icon": "bell"}, + {"Name": "knots", "Label": "Knots", "Icon": "volleyball"}, + {"Name": "spindles", "Label": "Spindles", "Icon": "spool"}, + {"Name": "sites", "Label": "Sites", "Icon": "globe"}, }, "RepoSettingsTabs": []tab{ - {"Name": "general", "Icon": "sliders-horizontal"}, - {"Name": "access", "Icon": "users"}, - {"Name": "pipelines", "Icon": "layers-2"}, - {"Name": "hooks", "Icon": "webhook"}, - {"Name": "sites", "Icon": "globe"}, + {"Name": "general", "Label": "General", "Icon": "sliders-horizontal"}, + {"Name": "access", "Label": "Access", "Icon": "users"}, + {"Name": "pipelines", "Label": "Pipelines", "Icon": "layers-2"}, + {"Name": "hooks", "Label": "Hooks", "Icon": "webhook"}, + {"Name": "sites", "Label": "Sites", "Icon": "globe"}, }, "PdsUserDomain": p.pdsCfg.UserDomain, } diff --git a/appview/pages/templates/brand/brand.html b/appview/pages/templates/brand/brand.html --- a/appview/pages/templates/brand/brand.html +++ b/appview/pages/templates/brand/brand.html @@ -1,4 +1,4 @@ -{{ define "title" }}brand{{ end }} +{{ define "title" }}Brand · Tangled{{ end }} {{ define "content" }}
diff --git a/appview/pages/templates/errors/404.html b/appview/pages/templates/errors/404.html --- a/appview/pages/templates/errors/404.html +++ b/appview/pages/templates/errors/404.html @@ -1,4 +1,4 @@ -{{ define "title" }}404 · tangled{{ end }} +{{ define "title" }}404 · Tangled{{ end }} {{ define "content" }}
@@ -11,7 +11,7 @@

- 404 — page not found + 404 — Page not found

The page you're looking for doesn't exist. It may have been moved, deleted, or you have the wrong URL. @@ -19,7 +19,7 @@

{{ i "arrow-left" "w-4 h-4" }} - go back + Go back
diff --git a/appview/pages/templates/errors/500.html b/appview/pages/templates/errors/500.html --- a/appview/pages/templates/errors/500.html +++ b/appview/pages/templates/errors/500.html @@ -1,4 +1,4 @@ -{{ define "title" }}500 · tangled{{ end }} +{{ define "title" }}500 · Tangled{{ end }} {{ define "content" }}
@@ -11,7 +11,7 @@

- 500 — internal server error + 500 — Internal server error

We encountered an error while processing your request. Please try again later. @@ -19,11 +19,11 @@

{{ i "arrow-left" "w-4 h-4" }} - back to home + Back to home
diff --git a/appview/pages/templates/errors/503.html b/appview/pages/templates/errors/503.html --- a/appview/pages/templates/errors/503.html +++ b/appview/pages/templates/errors/503.html @@ -1,4 +1,4 @@ -{{ define "title" }}503 · tangled{{ end }} +{{ define "title" }}503 · Tangled{{ end }} {{ define "content" }}
@@ -11,7 +11,7 @@

- 503 — service unavailable + 503 — Service unavailable

We were unable to reach the knot hosting this repository. The service may be temporarily unavailable. @@ -19,11 +19,11 @@

{{ i "arrow-left" "w-4 h-4" }} - back to timeline + Back to timeline
diff --git a/appview/pages/templates/errors/knot404.html b/appview/pages/templates/errors/knot404.html --- a/appview/pages/templates/errors/knot404.html +++ b/appview/pages/templates/errors/knot404.html @@ -1,4 +1,4 @@ -{{ define "title" }}404 · tangled{{ end }} +{{ define "title" }}404 · Tangled{{ end }} {{ define "content" }}
@@ -11,7 +11,7 @@

- 404 — repository not found + 404 — Repository not found

The repository you were looking for could not be found. The knot serving the repository may be unavailable. @@ -19,7 +19,7 @@

{{ i "arrow-left" "w-4 h-4" }} - back to timeline + Back to timeline
diff --git a/appview/pages/templates/fragments/comment/commentHeader.html b/appview/pages/templates/fragments/comment/commentHeader.html --- a/appview/pages/templates/fragments/comment/commentHeader.html +++ b/appview/pages/templates/fragments/comment/commentHeader.html @@ -32,7 +32,7 @@ id="comment-{{ .Comment.Rkey }}"> {{ if .Comment.Deleted }} {{ template "repo/fragments/shortTimeAgo" .Comment.Deleted }} {{ else if .Comment.Edited }} - edited {{ template "repo/fragments/shortTimeAgo" .Comment.Edited }} + Edited {{ template "repo/fragments/shortTimeAgo" .Comment.Edited }} {{ else }} {{ template "repo/fragments/shortTimeAgo" .Comment.Created }} {{ end }} diff --git a/appview/pages/templates/fragments/comment/edit.html b/appview/pages/templates/fragments/comment/edit.html --- a/appview/pages/templates/fragments/comment/edit.html +++ b/appview/pages/templates/fragments/comment/edit.html @@ -31,7 +31,7 @@ type="submit" class="btn-create py-0 flex gap-1 items-center group text-sm" > {{ i "check" "size-4" }} - save + Save {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} {{ end }} @@ -44,6 +44,6 @@ hx-target="closest form" hx-swap="outerHTML" > {{ i "x" "size-4" }} - cancel + Cancel {{ end }} diff --git a/appview/pages/templates/fragments/comment/reply.html b/appview/pages/templates/fragments/comment/reply.html --- a/appview/pages/templates/fragments/comment/reply.html +++ b/appview/pages/templates/fragments/comment/reply.html @@ -34,7 +34,7 @@ hx-target="closest form" hx-swap="outerHTML" > {{ i "x" "size-4" }} - cancel + Cancel {{ end }} @@ -45,6 +45,6 @@ class="btn-create flex items-center gap-2 no-underline hover:no-underline" > {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} - reply + Reply {{ end }} diff --git a/appview/pages/templates/fragments/pagination.html b/appview/pages/templates/fragments/pagination.html --- a/appview/pages/templates/fragments/pagination.html +++ b/appview/pages/templates/fragments/pagination.html @@ -23,7 +23,7 @@ href="{{ $basePath }}?{{ $queryParams }}&offset={{ $prev }}&limit={{ $page.Limit }}" {{ end }} > {{ i "chevron-left" "w-4 h-4" }} - prev + Prev {{ if gt $page.Offset 0 }} @@ -74,7 +74,7 @@ hx-boost="true" href="{{ $basePath }}?{{ $queryParams }}&offset={{ $next }}&limit={{ $page.Limit }}" {{ end }} > - next + Next {{ i "chevron-right" "w-4 h-4" }}
diff --git a/appview/pages/templates/fragments/starBtn.html b/appview/pages/templates/fragments/starBtn.html --- a/appview/pages/templates/fragments/starBtn.html +++ b/appview/pages/templates/fragments/starBtn.html @@ -22,7 +22,7 @@ {{ else }} {{ i "star" "w-4 h-4 shrink-0 inline group-[.htmx-request]:hidden" }} {{ end }} {{ i "loader-circle" "w-4 h-4 shrink-0 animate-spin hidden group-[.htmx-request]:inline" }} - {{ if .IsStarred }}unstar{{ else }}star{{ end }} + {{ if .IsStarred }}Unstar{{ else }}Star{{ end }} {{ if .RepoName }} {{ $did := .SubjectAt.Authority | string }} diff --git a/appview/pages/templates/goodfirstissues/index.html b/appview/pages/templates/goodfirstissues/index.html --- a/appview/pages/templates/goodfirstissues/index.html +++ b/appview/pages/templates/goodfirstissues/index.html @@ -1,7 +1,7 @@ -{{ define "title" }}good first issues{{ end }} +{{ define "title" }}Good first issues · Tangled{{ end }} {{ define "extrameta" }} - + @@ -141,7 +141,7 @@ hx-boost="true" href="/goodfirstissues?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}" > {{ i "chevron-left" "w-4 h-4" }} - previous + Previous {{ else }}
@@ -154,7 +154,7 @@ class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" hx-boost="true" href="/goodfirstissues?offset={{ $next.Offset }}&limit={{ $next.Limit }}" > - next + Next {{ i "chevron-right" "w-4 h-4" }} {{ end }} diff --git a/appview/pages/templates/knots/dashboard.html b/appview/pages/templates/knots/dashboard.html --- a/appview/pages/templates/knots/dashboard.html +++ b/appview/pages/templates/knots/dashboard.html @@ -1,4 +1,4 @@ -{{ define "title" }}{{ .Registration.Domain }} · {{ .Tab }} settings{{ end }} +{{ define "title" }}{{ .Tab | capitalize }} · {{ .Registration.Domain }} · Tangled{{ end }} {{ define "content" }}
@@ -19,24 +19,24 @@ {{ define "knotDash" }}
-

{{ .Tab }} · {{ .Registration.Domain }}

+

{{ .Tab | capitalize }} · {{ .Registration.Domain }}

{{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} {{ $isOwner := and .LoggedInUser (eq .LoggedInUser.Did .Registration.ByDid) }} {{ if .Registration.IsRegistered }} - {{ i "shield-check" "w-4 h-4" }} verified + {{ i "shield-check" "w-4 h-4" }} Verified {{ if $isOwner }} {{ template "knots/fragments/addMemberModal" .Registration }} {{ end }} {{ else if .Registration.IsReadOnly }} - {{ i "shield-alert" "w-4 h-4" }} read-only + {{ i "shield-alert" "w-4 h-4" }} Read-only {{ if $isOwner }} {{ block "retryButton" .Registration }} {{ end }} {{ end }} {{ else }} - {{ i "shield-off" "w-4 h-4" }} unverified + {{ i "shield-off" "w-4 h-4" }} Unverified {{ if $isOwner }} {{ block "retryButton" .Registration }} {{ end }} {{ end }} @@ -101,7 +101,7 @@ hx-confirm="{{ template "knots/fragments/deleteConfirm" . }}" hx-headers='{"shouldRedirect": "true"}' > {{ i "trash-2" "w-5 h-5" }} - + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} {{ end }} @@ -116,7 +116,7 @@ hx-swap="none" hx-headers='{"shouldRefresh": "true"}' > {{ i "rotate-ccw" "w-5 h-5" }} - + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} {{ end }} @@ -135,7 +135,7 @@ hx-vals='{"member": "{{$member}}" }' hx-confirm="Are you sure you want to remove {{ $memberHandle }} from this knot?" > {{ i "user-minus" "w-4 h-4" }} - remove + Remove {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} {{ end }} diff --git a/appview/pages/templates/knots/fragments/addMemberModal.html b/appview/pages/templates/knots/fragments/addMemberModal.html --- a/appview/pages/templates/knots/fragments/addMemberModal.html +++ b/appview/pages/templates/knots/fragments/addMemberModal.html @@ -6,7 +6,7 @@ popovertarget="add-member-{{ .Id }}" popovertargetaction="toggle" > {{ i "user-plus" "w-5 h-5" }} - + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} @@ -27,8 +27,8 @@ hx-indicator="#spinner" hx-swap="none" class="flex flex-col gap-2" > -
diff --git a/appview/pages/templates/layouts/profilebase.html b/appview/pages/templates/layouts/profilebase.html --- a/appview/pages/templates/layouts/profilebase.html +++ b/appview/pages/templates/layouts/profilebase.html @@ -1,4 +1,4 @@ -{{ define "title" }}{{ resolve .Card.UserDid }}{{ end }} +{{ define "title" }}{{ resolve .Card.UserDid }} · Tangled{{ end }} {{ define "extrameta" }} {{ $handle := resolve .Card.UserDid }} @@ -89,7 +89,7 @@ {{ end }} "> {{ i $icon "w-4 h-4 mr-2" }} - {{ $key }} + {{ if eq $key "repos" }}Repositories{{ else }}{{ $key | capitalize }}{{ end }} {{ if $meta }} {{ scaleFmt $meta }} {{ end }} @@ -104,8 +104,8 @@ {{ define "punchcard" }} {{ $now := now }}
-

- PUNCHCARD +

+ Punchcard {{ .Total | int64 | commaFmt }} commits diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html --- a/appview/pages/templates/layouts/repobase.html +++ b/appview/pages/templates/layouts/repobase.html @@ -1,4 +1,4 @@ -{{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} +{{ define "title" }}{{ .RepoInfo.FullName }} · Tangled{{ end }} {{ define "content" }}

@@ -45,7 +45,7 @@ " > {{ i $icon "w-4 h-4 mr-2" }} - {{ $key }} + {{ $key | capitalize }} {{ if $meta }} {{ scaleFmt $meta }} {{ end }} @@ -90,7 +90,7 @@
{{ if .RepoInfo.Description }} {{ .RepoInfo.Description | description }} {{ else }} - this repo has no description + This repository has no description {{ end }} {{ with .RepoInfo.Website }} @@ -124,7 +124,7 @@ hx-boost="true" href="/{{ .RepoInfo.FullName }}/fork" > {{ i "git-fork" "w-4 h-4" }} - fork + Fork {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} diff --git a/appview/pages/templates/legal/terms.html b/appview/pages/templates/legal/terms.html --- a/appview/pages/templates/legal/terms.html +++ b/appview/pages/templates/legal/terms.html @@ -1,4 +1,4 @@ -{{ define "title" }}terms of service{{ end }} +{{ define "title" }}Terms of service · Tangled{{ end }} {{ define "content" }}
diff --git a/appview/pages/templates/notifications/list.html b/appview/pages/templates/notifications/list.html --- a/appview/pages/templates/notifications/list.html +++ b/appview/pages/templates/notifications/list.html @@ -1,4 +1,4 @@ -{{ define "title" }}notifications{{ end }} +{{ define "title" }}Notifications · Tangled{{ end }} {{ define "content" }}
@@ -6,7 +6,7 @@

Notifications

 {{ i "settings" "w-4 h-4" }} - preferences + Preferences
@@ -43,7 +43,7 @@ hx-boost="true" href = "/notifications?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}" > {{ i "chevron-left" "w-4 h-4" }} - previous + Previous {{ else }}
@@ -57,7 +57,7 @@ class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" hx-boost="true" href = "/notifications?offset={{ $next.Offset }}&limit={{ $next.Limit }}" > - next + Next {{ i "chevron-right" "w-4 h-4" }} {{ end }} diff --git a/appview/pages/templates/repo/blob.html b/appview/pages/templates/repo/blob.html --- a/appview/pages/templates/repo/blob.html +++ b/appview/pages/templates/repo/blob.html @@ -1,4 +1,4 @@ -{{ define "title" }}{{ .Path }} at {{ .Ref }} · {{ .RepoInfo.FullName }}{{ end }} +{{ define "title" }}{{ .Path }} at {{ .Ref }} · {{ .RepoInfo.FullName }} · Tangled{{ end }} {{ define "extrameta" }} {{ template "repo/fragments/meta" . }} @@ -45,13 +45,13 @@ {{ end }} {{ if .BlobView.HasRawView }} - view raw + View raw {{ end }} {{ if .BlobView.ShowToggle }} - view {{ if .BlobView.ShowingRendered }}code{{ else }}rendered{{ end }} + View {{ if .BlobView.ShowingRendered }}code{{ else }}rendered{{ end }} {{ end }} diff --git a/appview/pages/templates/repo/branches.html b/appview/pages/templates/repo/branches.html --- a/appview/pages/templates/repo/branches.html +++ b/appview/pages/templates/repo/branches.html @@ -1,5 +1,5 @@ {{ define "title" }} - branches · {{ .RepoInfo.FullName }} + Branches · {{ .RepoInfo.FullName }} · Tangled {{ end }} {{ define "extrameta" }} @@ -11,7 +11,7 @@ {{ end }} {{ define "repoContent" }}
-

+

Branches

@@ -19,10 +19,10 @@ - - - - + + + + @@ -41,7 +41,7 @@ font-mono px-2 mx-1/2 inline-flex items-center "> - default + Default {{ end }} @@ -84,7 +84,7 @@ font-mono px-2 inline-flex items-center "> - default + Default {{ end }} diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html --- a/appview/pages/templates/repo/commit.html +++ b/appview/pages/templates/repo/commit.html @@ -1,6 +1,6 @@ {{ define "title" }} {{ $messageParts := splitN .Diff.Commit.Message "\n\n" 2 }} - {{ index $messageParts 0 }} · {{ .RepoInfo.FullName }}@{{ slice .Diff.Commit.This 0 7 }} + {{ index $messageParts 0 }} · {{ .RepoInfo.FullName }}@{{ slice .Diff.Commit.This 0 7 }} · Tangled {{ end }} {{ define "extrameta" }} @@ -49,7 +49,7 @@
{{ i "shield-check" "w-4 h-4" }} - verified + Verified