8000 activity: fix "Long content coverage button" KAK-3917 by molon · Pull Request #461 · qor5/admin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

activity: fix "Long content coverage button" KAK-3917 #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2024
Merged

activity: fix "Long content coverage button" KAK-3917 #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions activity/timeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,23 @@ func (c *TimelineCompo) humanContent(ctx context.Context, log *ActivityLog, forc
}),
),
h.Div().Attr("v-if", "!!xlocals.showEditBox").Class("flex-grow-1 d-flex flex-column mt-4").Style("position: relative").Children(
v.VTextarea().Rows(3).Attr("row-height", "12").Clearable(false).AutoGrow(true).Label("").Variant(v.VariantOutlined).
v.VTextarea().Rows(2).Attr(":row-height", "12").Clearable(false).AutoGrow(true).Label("").Variant(v.VariantOutlined).
Color(v.ColorPrimary).Class("text-grey-darken-3 textarea-with-bottom-btns").
Attr(web.VField("note", note.Note)...),
h.Div().Class("d-flex flex-row ga-1").Style("position: absolute; top: 6px; right: 6px").Children(
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(v.SizeXSmall).Icon("mdi-close").
Attr("@click", "xlocals.showEditBox = false"),
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(v.SizeXSmall).Icon("mdi-check").
h.Div().Class("d-flex flex-row ga-2").Style("position: absolute; bottom: 32px; right: 12px").Children(
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(16).
Attr("@click", "xlocals.showEditBox = false").Children(
v.VIcon("mdi-close").Size(16),
),
v.VBtn("").Variant(v.VariantText).Color(v.ColorPrimary).Size(16).
Attr("@click", stateful.PostAction(ctx, c,
c.UpdateNote, UpdateNoteRequest{
LogID: log.ID,
},
stateful.WithAppendFix(`v.request.note = form["note"];`),
).Go()),
).Go()).Children(
v.VIcon("mdi-check").Size(16),
),
),
),
)
Expand Down Expand Up @@ -126,16 +131,21 @@ func (c *TimelineCompo) MarshalHTML(ctx context.Context) ([]byte, error) {
Class("text-none mb-4").Variant(v.VariantTonal).Color("grey-darken-3").Size(v.SizeDefault).PrependIcon("mdi-plus").
Attr("@click", "xlocals.showEditBox = true"),
h.Div().Attr("v-if", "!!xlocals.showEditBox").Class("d-flex flex-column").Style("position: relative").Children(
v.VTextarea().Rows(3).Attr("row-height", "12").Clearable(false).AutoGrow(true).Label(msgr.AddNote).Variant(v.VariantOutlined).
v.VTextarea().Rows(2).Attr(":row-height", "12").Clearable(false).AutoGrow(true).Label("").Placeholder(msgr.AddNote).Variant(v.VariantOutlined).
Color(v.ColorPrimary).Class("text-grey-darken-3 textarea-with-bottom-btns").
Attr(web.VField("note", "")...),
h.Div().Class("d-flex flex-row ga-1").Style("position: absolute; top: 6px; right: 6px").Children(
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(v.SizeXSmall).Icon("mdi-close").
Attr("@click", "xlocals.showEditBox = false"),
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(v.SizeXSmall).Icon("mdi-check").
h.Div().Class("d-flex flex-row ga-2").Style("position: absolute; bottom: 32px; right: 12px").Children(
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(16).
Attr("@click", "xlocals.showEditBox = false").Children(
v.VIcon("mdi-close").Size(16),
),
v.VBtn("").Variant(v.VariantText).Color("grey-darken-3").Size(16).
Attr("@click", stateful.PostAction(ctx, c,
c.CreateNote, CreateNoteRequest{},
stateful.WithAppendFix(`v.request.note = form["note"];`),
).Go()),
).Go()).Children(
v.VIcon("mdi-check").Size(16),
),
),
),
),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/pquerna/otp v1.4.0
github.com/qor/oss v0.0.0-20240729105053-88484a799a79
github.com/qor5/web/v3 v3.0.6-0.20240808073627-bd2003d12e2c
github.com/qor5/x/v3 v3.0.7-0.20240809065519-d95284b78343
github.com/qor5/x/v3 v3.0.7-0.20240809112350-e3e56895c265
github.com/samber/lo v1.46.0
github.com/shurcooL/sanitized_anchor_name v1.0.0
github.com/spf13/cast v1.6.0
Expand Down
10 changes: 2 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,14 +319,8 @@ github.com/qor5/web v1.3.2 h1:zw796YJeDLe8vRwGR1cM+uS1ZuSkPutchBEXv2GgOhI=
github.com/qor5/web v1.3.2/go.mod h1:LszskQJbFQDJwOeZC6j6afOiHxxyjrzz8B3zuBwfgKQ=
github.com/qor5/web/v3 v3.0.6-0.20240808073627-bd2003d12e2c h1:uYoko94cUQN04E2hnZIsp/+yiEEI97V5OKcbS9cTa7o=
github.com/qor5/web/v3 v3.0.6-0.20240808073627-bd2003d12e2c/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0=
github.com/qor5/x/v3 v3.0.7-0.20240808022508-35f1ab5b53fe h1:kZSRwsseo3Jwlk3Z/27f8h6kQynNII5YewbYppB648k=
github.com/qor5/x/v3 v3.0.7-0.20240808022508-35f1ab5b53fe/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw=
github.com/qor5/x/v3 v3.0.7-0.20240808085055-02376b65a3f9 h1:fuCaJ519NO5SL2LryGKNcYmgbrbiPxLMkun976s95d0=
github.com/qor5/x/v3 v3.0.7-0.20240808085055-02376b65a3f9/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw=
github.com/qor5/x/v3 v3.0.7-0.20240808103450-13664afa0ba5 h1:GIIq/qk4VzVYHQMDJ++lHwa6L6y1O2yCWzXUX/p6CQw=
github.com/qor5/x/v3 v3.0.7-0.20240808103450-13664afa0ba5/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw=
github.com/qor5/x/v3 v3.0.7-0.20240809065519-d95284b78343 h1:teAzU+82V7wEje9accu0ulvtidOr5+cgCZFUAO5JmJE=
github.com/qor5/x/v3 v3.0.7-0.20240809065519-d95284b78343/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw=
github.com/qor5/x/v3 v3.0.7-0.20240809112350-e3e56895c265 h1:ZEwtJe82NINcx9eecYE4nselvuDeMUcUe4bDpTDSokY=
github.com/qor5/x/v3 v3.0.7-0.20240809112350-e3e56895c265/go.mod h1:p8LBZGmJ9pozop2jMACV5tN/1gkpAskteOhlwcfFxpw=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
Expand Down
Loading
0