From dbdb5f770412781f54c59fbc5d08623cabdf6cbb Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Tue, 30 Nov 2021 20:41:48 +0300 Subject: [PATCH] Toolbar: Change the heading buttons Before: ## heading, ### heading After: = heading, == heading Now this release can be called 1.7! --- go.mod | 1 + go.sum | 6 ++++++ static/toolbar.js | 4 ++-- views/mutators.qtpl | 4 ++-- views/mutators.qtpl.go | 4 ++-- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 37c67ca..6032795 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( ) require ( + github.com/chekoopa/go-localize v0.4.0 // indirect github.com/kr/pretty v0.2.1 // indirect github.com/stretchr/testify v1.7.0 // indirect golang.org/x/sys v0.0.0-20211109184856-51b60fd695b3 // indirect diff --git a/go.sum b/go.sum index a9f990f..077bb04 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,11 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/bouncepaw/mycomarkup/v3 v3.4.1 h1:9rv0X/QzMM2TlVu+SNjkNQTARY1jYxhl/YZJcYrsIQo= github.com/bouncepaw/mycomarkup/v3 v3.4.1/go.mod h1:BpiGUVsYCgRZCDxF0iIdc08LJokm/Ab36S/Hif0J6D0= +github.com/chekoopa/go-localize v0.4.0 h1:XUgliKdAE0fff2MOEfjHP/Sj1Iy6Yxn4zXOj3jXfDE8= +github.com/chekoopa/go-localize v0.4.0/go.mod h1:bMeziCOnL4H5lGOy2o0eWBRNht2x2RRNWGKZ4oDuxNU= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-ini/ini v1.63.2 h1:kwN3umicd2HF3Tgvap4um1ZG52/WyKT9GGdPx0CJk6Y= @@ -49,5 +53,7 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/static/toolbar.js b/static/toolbar.js index 6f2f9b7..3da99f1 100644 --- a/static/toolbar.js +++ b/static/toolbar.js @@ -81,8 +81,8 @@ const insertHorizontalBar = textInserter('\n----\n'), insertTableBlock = textInserter('\ntable {\n \n}\n', 12), insertRocket = textInserter('\n=> '), insertXcl = textInserter('\n<= '), - insertHeading2 = textInserter('\n## '), - insertHeading3 = textInserter('\n### '), + insertHeading1 = textInserter('\n= '), + insertHeading2 = textInserter('\n== '), insertCodeblock = textInserter('\n```\n\n```\n', 5), insertBulletedList = textInserter('\n* '), insertNumberedList = textInserter('\n*. ') diff --git a/views/mutators.qtpl b/views/mutators.qtpl index 1fa64ec..cfb4e08 100644 --- a/views/mutators.qtpl +++ b/views/mutators.qtpl @@ -16,8 +16,8 @@ }{ {"link", "wrapLink()", fmt.Sprintf("[[%s]]", lc.Get("edit.link"))}, {"titlelink", "wrapTitleLink()", fmt.Sprintf("[[%s | %s]]", lc.Get("edit.link"), lc.Get("edit.link_title"))}, - {"heading2", "insertHeading2()", fmt.Sprintf("## %s", lc.Get("edit.heading"))}, - {"heading3", "insertHeading3()", fmt.Sprintf("### %s", lc.Get("edit.heading"))}, + {"heading1", "insertHeading1()", fmt.Sprintf("= %s", lc.Get("edit.heading"))}, + {"heading2", "insertHeading2()", fmt.Sprintf("== %s", lc.Get("edit.heading"))}, {"bold", "wrapBold()", fmt.Sprintf("**%s**", lc.Get("edit.bold"))}, {"italic", "wrapItalic()", fmt.Sprintf("//%s//", lc.Get("edit.italic"))}, {"highlighted", "wrapHighlighted()", fmt.Sprintf("++%s++", lc.Get("edit.highlight"))}, diff --git a/views/mutators.qtpl.go b/views/mutators.qtpl.go index 5dd5994..74690c5 100644 --- a/views/mutators.qtpl.go +++ b/views/mutators.qtpl.go @@ -52,8 +52,8 @@ func StreamToolbar(qw422016 *qt422016.Writer, u *user.User, lc *l18n.Localizer) }{ {"link", "wrapLink()", fmt.Sprintf("[[%s]]", lc.Get("edit.link"))}, {"titlelink", "wrapTitleLink()", fmt.Sprintf("[[%s | %s]]", lc.Get("edit.link"), lc.Get("edit.link_title"))}, - {"heading2", "insertHeading2()", fmt.Sprintf("## %s", lc.Get("edit.heading"))}, - {"heading3", "insertHeading3()", fmt.Sprintf("### %s", lc.Get("edit.heading"))}, + {"heading1", "insertHeading1()", fmt.Sprintf("= %s", lc.Get("edit.heading"))}, + {"heading2", "insertHeading2()", fmt.Sprintf("== %s", lc.Get("edit.heading"))}, {"bold", "wrapBold()", fmt.Sprintf("**%s**", lc.Get("edit.bold"))}, {"italic", "wrapItalic()", fmt.Sprintf("//%s//", lc.Get("edit.italic"))}, {"highlighted", "wrapHighlighted()", fmt.Sprintf("++%s++", lc.Get("edit.highlight"))},