1
0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2024-12-12 05:20:26 +00:00

Mycomarkup: Migrate to v3.5.2

This commit is contained in:
Timur Ismagilov 2021-12-31 02:42:21 +05:00
parent 471805e6b4
commit 1f4dfa1246
4 changed files with 12 additions and 12 deletions

4
go.mod
View File

@ -3,7 +3,7 @@ module github.com/bouncepaw/mycorrhiza
go 1.17 go 1.17
require ( require (
github.com/bouncepaw/mycomarkup/v3 v3.5.0 github.com/bouncepaw/mycomarkup/v3 v3.5.2
github.com/go-ini/ini v1.63.2 github.com/go-ini/ini v1.63.2
github.com/gorilla/feeds v1.1.1 github.com/gorilla/feeds v1.1.1
github.com/gorilla/mux v1.8.0 github.com/gorilla/mux v1.8.0
@ -22,7 +22,7 @@ require (
// Use this trick to test local Mycomarkup changes, replace the path with yours, // Use this trick to test local Mycomarkup changes, replace the path with yours,
// but do not commit the change to the path: // but do not commit the change to the path:
// replace github.com/bouncepaw/mycomarkup/v3 v3.5.0 => "/Users/bouncepaw/GolandProjects/mycomarkup" // replace github.com/bouncepaw/mycomarkup/v3 v3.5.2 => "/Users/bouncepaw/GolandProjects/mycomarkup"
// Use this utility every time Mycomarkup gets a major update: // Use this utility every time Mycomarkup gets a major update:
// https://github.com/marwan-at-work/mod // https://github.com/marwan-at-work/mod

4
go.sum
View File

@ -2,8 +2,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 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.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/bouncepaw/mycomarkup/v3 v3.5.0 h1:KaVAFliD8jTXSpeVRq9VLpHBURR06EsQm9EhDX7d7fE= github.com/bouncepaw/mycomarkup/v3 v3.5.2 h1:AEcGFxFa6OlTkjBwi6+zlTxV7St89bDr8UM2TSmkRcw=
github.com/bouncepaw/mycomarkup/v3 v3.5.0/go.mod h1:BpiGUVsYCgRZCDxF0iIdc08LJokm/Ab36S/Hif0J6D0= github.com/bouncepaw/mycomarkup/v3 v3.5.2/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 h1:XUgliKdAE0fff2MOEfjHP/Sj1Iy6Yxn4zXOj3jXfDE8=
github.com/chekoopa/go-localize v0.4.0/go.mod h1:bMeziCOnL4H5lGOy2o0eWBRNht2x2RRNWGKZ4oDuxNU= 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 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=

View File

@ -87,7 +87,7 @@ If you rename .prevnext, change the docs too.
%} %}
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">
<article id="hypha"> <section id="hypha">
<div class="jump-btn"> <div class="jump-btn">
<a class="jump-btn__link" href="#hypha-bottom">↓</a> <a class="jump-btn__link" href="#hypha-bottom">↓</a>
</div> </div>
@ -100,7 +100,7 @@ If you rename .prevnext, change the docs too.
{% else %} {% else %}
{%= nonExistentHyphaNotice(h, u, lc) %} {%= nonExistentHyphaNotice(h, u, lc) %}
{% endif %} {% endif %}
</article> </section>
<section class="prevnext"> <section class="prevnext">
{% if prevHyphaName != "" %} {% if prevHyphaName != "" %}
<a class="prevnext__el prevnext__prev" href="/hypha/{%s prevHyphaName %}" rel="prev">← {%s util.BeautifulName(path.Base(prevHyphaName)) %}</a> <a class="prevnext__el prevnext__prev" href="/hypha/{%s prevHyphaName %}" rel="prev">← {%s util.BeautifulName(path.Base(prevHyphaName)) %}</a>
@ -128,11 +128,11 @@ If you rename .prevnext, change the docs too.
%} %}
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">
<article> <section>
<p>{%s lc.Get("ui.revision_warning") %} <a href="/rev-text/{%s revHash %}/{%s h.Name %}">{%s lc.Get("ui.revision_link") %}</a></p> <p>{%s lc.Get("ui.revision_warning") %} <a href="/rev-text/{%s revHash %}/{%s h.Name %}">{%s lc.Get("ui.revision_link") %}</a></p>
{%s= NaviTitleHTML(h) %} {%s= NaviTitleHTML(h) %}
{%s= contents %} {%s= contents %}
</article> </section>
{%= SubhyphaeHTML(subhyphae, lc) %} {%= SubhyphaeHTML(subhyphae, lc) %}
</main> </main>
{%= siblingHyphaeHTML(siblings, lc) %} {%= siblingHyphaeHTML(siblings, lc) %}

View File

@ -315,7 +315,7 @@ func StreamHyphaHTML(qw422016 *qt422016.Writer, rq *http.Request, lc *l18n.Local
qw422016.N().S(` qw422016.N().S(`
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">
<article id="hypha"> <section id="hypha">
<div class="jump-btn"> <div class="jump-btn">
<a class="jump-btn__link" href="#hypha-bottom"></a> <a class="jump-btn__link" href="#hypha-bottom"></a>
</div> </div>
@ -368,7 +368,7 @@ func StreamHyphaHTML(qw422016 *qt422016.Writer, rq *http.Request, lc *l18n.Local
} }
//line views/readers.qtpl:102 //line views/readers.qtpl:102
qw422016.N().S(` qw422016.N().S(`
</article> </section>
<section class="prevnext"> <section class="prevnext">
`) `)
//line views/readers.qtpl:105 //line views/readers.qtpl:105
@ -478,7 +478,7 @@ func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, lc *l18n.Lo
qw422016.N().S(` qw422016.N().S(`
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">
<article> <section>
<p>`) <p>`)
//line views/readers.qtpl:132 //line views/readers.qtpl:132
qw422016.E().S(lc.Get("ui.revision_warning")) qw422016.E().S(lc.Get("ui.revision_warning"))
@ -506,7 +506,7 @@ func StreamRevisionHTML(qw422016 *qt422016.Writer, rq *http.Request, lc *l18n.Lo
qw422016.N().S(contents) qw422016.N().S(contents)
//line views/readers.qtpl:134 //line views/readers.qtpl:134
qw422016.N().S(` qw422016.N().S(`
</article> </section>
`) `)
//line views/readers.qtpl:136 //line views/readers.qtpl:136
StreamSubhyphaeHTML(qw422016, subhyphae, lc) StreamSubhyphaeHTML(qw422016, subhyphae, lc)