From 3f43ebf4edf335710f9edec7229219be48b908a5 Mon Sep 17 00:00:00 2001 From: Yader Velasquez Date: Fri, 9 Feb 2024 16:33:05 -0600 Subject: [PATCH] Small form improvements/fixes for note and org link forms --- api/graph/schema.resolvers.go | 3 +-- core/routes.go | 5 +++-- templates/link_create.html | 28 +++++++++++++--------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/api/graph/schema.resolvers.go b/api/graph/schema.resolvers.go index af41c47..d67f767 100644 --- a/api/graph/schema.resolvers.go +++ b/api/graph/schema.resolvers.go @@ -38,7 +38,7 @@ import ( "golang.org/x/image/draw" "golang.org/x/net/idna" "netlandish.com/x/gobwebs" - "netlandish.com/x/gobwebs-oauth2" + oauth2 "netlandish.com/x/gobwebs-oauth2" gaccounts "netlandish.com/x/gobwebs/accounts" "netlandish.com/x/gobwebs/database" "netlandish.com/x/gobwebs/email" @@ -4741,7 +4741,6 @@ func (r *queryResolver) GetOrgLinks(ctx context.Context, input *model.GetLinkInp } } } - // unttaged } if input.Tag != nil && *input.Tag != "" { diff --git a/core/routes.go b/core/routes.go index ac2bfa3..f2f0edd 100644 --- a/core/routes.go +++ b/core/routes.go @@ -1314,8 +1314,8 @@ func (s *Service) OrgLinksList(c echo.Context) error { pd.Data["untagged"] = lt.Translate("Untagged") pd.Data["mark_as_read"] = lt.Translate("Mark as read") pd.Data["mark_as_unread"] = lt.Translate("Mark as unread") - pd.Data["mark_as_starred"] = lt.Translate("Starred") - pd.Data["mark_as_non_starred"] = lt.Translate("Unstarred") + pd.Data["mark_as_starred"] = lt.Translate("Star") + pd.Data["mark_as_non_starred"] = lt.Translate("Unstar") pd.Data["no_links"] = lt.Translate("No Links") orgLinks := result.OrgLinks.Result gmap := gobwebs.Map{ @@ -2480,6 +2480,7 @@ func (s *Service) NoteCreate(c echo.Context) error { pd.Data["tags"] = lt.Translate("Tags") pd.Data["cancel"] = lt.Translate("Cancel") pd.Data["back"] = lt.Translate("Back") + pd.Data["organization"] = lt.Translate("Organization") visibilityOpt := map[int]string{ models.OrgLinkVisibilityPublic: lt.Translate("Public"), diff --git a/templates/link_create.html b/templates/link_create.html index 4637921..1ae1e15 100644 --- a/templates/link_create.html +++ b/templates/link_create.html @@ -44,22 +44,20 @@

{{ . }}

{{ end }} -
-
- - -
-
- - -
- {{if eq .orgLinkID nil }} -
- - -
- {{end}} +
+ + +
+
+ +
+ {{if eq .orgLinkID nil }} +
+ + +
+ {{end}}
{{ if .selectedOrg }} -- 2.45.2