diff --git a/appview/issues/issues.go b/appview/issues/issues.go index a96a0185..9fb9e861 100644 --- a/appview/issues/issues.go +++ b/appview/issues/issues.go @@ -419,7 +419,7 @@ func (rp *Issues) NewIssueComment(w http.ResponseWriter, r *http.Request) { body := r.FormValue("body") if body == "" { - rp.pages.Notice(w, "issue", "Body is required") + rp.pages.Notice(w, "issue", "Body is required.") return } @@ -1083,7 +1083,7 @@ func (rp *Issues) NewIssue(w http.ResponseWriter, r *http.Request) { tx, err := rp.db.BeginTx(r.Context(), nil) if err != nil { - rp.pages.Notice(w, "issues", "Failed to create issue, try again later") + rp.pages.Notice(w, "issues", "Failed to create issue, try again later.") return } rollback := func() { diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go index 5340ca5a..c3b2471b 100644 --- a/appview/pages/funcmap.go +++ b/appview/pages/funcmap.go @@ -487,20 +487,20 @@ func (p *Pages) funcMap() template.FuncMap { "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/pages.go b/appview/pages/pages.go index 22500649..9c7f1515 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -645,11 +645,11 @@ type ProfileStats struct { func (p *ProfileCard) GetTabs() [][]any { tabs := [][]any{ - {"overview", "overview", "square-chart-gantt", nil}, - {"repos", "repos", "book-marked", p.Stats.RepoCount}, - {"starred", "starred", "star", p.Stats.StarredCount}, - {"strings", "strings", "line-squiggle", p.Stats.StringCount}, - {"vouches", "vouches", "shield", nil}, + {"Overview", "overview", "square-chart-gantt", nil}, + {"Repos", "repos", "book-marked", p.Stats.RepoCount}, + {"Starred", "starred", "star", p.Stats.StarredCount}, + {"Strings", "strings", "line-squiggle", p.Stats.StringCount}, + {"Vouches", "vouches", "shield", nil}, } return tabs diff --git a/appview/pages/repoinfo/repoinfo.go b/appview/pages/repoinfo/repoinfo.go index 61835efd..036d295a 100644 --- a/appview/pages/repoinfo/repoinfo.go +++ b/appview/pages/repoinfo/repoinfo.go @@ -44,14 +44,14 @@ func (r RepoInfo) FullNameWithoutAt() string { func (r RepoInfo) GetTabs() [][]string { tabs := [][]string{ - {"overview", "/", "square-chart-gantt"}, - {"issues", "/issues", "circle-dot"}, - {"pulls", "/pulls", "git-pull-request"}, - {"pipelines", "/pipelines", "layers-2"}, + {"overview", "/", "square-chart-gantt", "Overview"}, + {"issues", "/issues", "circle-dot", "Issues"}, + {"pulls", "/pulls", "git-pull-request", "Pulls"}, + {"pipelines", "/pipelines", "layers-2", "Pipelines"}, } if r.Roles.SettingsAllowed() { - tabs = append(tabs, []string{"settings", "/settings", "cog"}) + tabs = append(tabs, []string{"settings", "/settings", "cog", "Settings"}) } return tabs diff --git a/appview/pages/templates/errors/404.html b/appview/pages/templates/errors/404.html index a034f527..4f195ff2 100644 --- a/appview/pages/templates/errors/404.html +++ b/appview/pages/templates/errors/404.html @@ -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 index 529e2d59..bb77257a 100644 --- a/appview/pages/templates/errors/500.html +++ b/appview/pages/templates/errors/500.html @@ -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 index 72575817..f854c2dd 100644 --- a/appview/pages/templates/errors/503.html +++ b/appview/pages/templates/errors/503.html @@ -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 index c2a4037f..698a5b4d 100644 --- a/appview/pages/templates/errors/knot404.html +++ b/appview/pages/templates/errors/knot404.html @@ -19,7 +19,7 @@
{{ i "arrow-left" "w-4 h-4" }} - back to timeline + Back to timeline
diff --git a/appview/pages/templates/fragments/pagination.html b/appview/pages/templates/fragments/pagination.html index c2e5dcbc..65ed2365 100644 --- a/appview/pages/templates/fragments/pagination.html +++ b/appview/pages/templates/fragments/pagination.html @@ -23,7 +23,7 @@ {{ end }} > {{ i "chevron-left" "w-4 h-4" }} - prev + Prev {{ if gt $page.Offset 0 }} @@ -74,7 +74,7 @@ href="{{ $basePath }}?{{ $queryParams }}&offset={{ $next }}&limit={{ $page.Limit }}" {{ end }} > - next + Next {{ i "chevron-right" "w-4 h-4" }} diff --git a/appview/pages/templates/goodfirstissues/index.html b/appview/pages/templates/goodfirstissues/index.html index b4fa8dd1..f93d28e8 100644 --- a/appview/pages/templates/goodfirstissues/index.html +++ b/appview/pages/templates/goodfirstissues/index.html @@ -141,7 +141,7 @@ href="/goodfirstissues?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}" > {{ i "chevron-left" "w-4 h-4" }} - previous + Previous {{ else }}
@@ -154,7 +154,7 @@ 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 index 1f58655a..f3010b0c 100644 --- a/appview/pages/templates/knots/dashboard.html +++ b/appview/pages/templates/knots/dashboard.html @@ -30,7 +30,7 @@ {{ 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 }} @@ -101,7 +101,7 @@ 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-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-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 index f41f97bb..a029df48 100644 --- a/appview/pages/templates/knots/fragments/addMemberModal.html +++ b/appview/pages/templates/knots/fragments/addMemberModal.html @@ -6,7 +6,7 @@ popovertargetaction="toggle" > {{ i "user-plus" "w-5 h-5" }} - + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} @@ -28,7 +28,7 @@ class="flex flex-col gap-2" >

Members can create repositories and run workflows on this knot.

@@ -51,10 +51,10 @@ popovertargetaction="hide" class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300" > - {{ i "x" "size-4" }} cancel + {{ i "x" "size-4" }} Cancel {{ end }} @@ -77,7 +77,7 @@ hx-target="#knot-{{.Id}}" > {{ i "rotate-ccw" "w-5 h-5" }} - + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} {{ end }} diff --git a/appview/pages/templates/knots/index.html b/appview/pages/templates/knots/index.html index 638f4d6b..ae8e7969 100644 --- a/appview/pages/templates/knots/index.html +++ b/appview/pages/templates/knots/index.html @@ -48,13 +48,13 @@ {{ define "list" }}
-

your knots

+

Your knots

{{ range $registration := .Registrations }} {{ template "knots/fragments/knotListing" . }} {{ else }}
- no knots registered yet + No knots registered yet
{{ end }}
@@ -64,7 +64,7 @@ {{ define "register" }}
-

register a knot

+

Register a knot

Enter the hostname of your knot to get started.

{{ i "plus" "w-4 h-4" }} - register + Register