mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-31 11:29:09 +00:00
Code Issues Releases Wiki Activity

Recent changes: Get rid of ? in a circle

Browse Source
This commit is contained in:
Timur Ismagilov 2022-03-21 00:06:38 +03:00
parent 40bb20a89c
commit 6037073352
4 changed files with 123 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
views/history.qtpl
View File

@ -82,7 +82,6 @@ if err != nil {
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{%s= helpTopicBadgeHTML(lc.Locale, "recent_changes") %}
</section> </section>
</main> </main>
</div> </div>

135
views/history.qtpl.go
View File

@ -272,181 +272,176 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int, lc *l18n.Localize
//line views/history.qtpl:84 //line views/history.qtpl:84
} }
//line views/history.qtpl:84 //line views/history.qtpl:84
qw422016.N().S(`
`)
//line views/history.qtpl:85
qw422016.N().S(helpTopicBadgeHTML(lc.Locale, "recent_changes"))
//line views/history.qtpl:85
qw422016.N().S(` qw422016.N().S(`
</section> </section>
</main> </main>
</div> </div>
`) `)
//line views/history.qtpl:89 //line views/history.qtpl:88
} }
//line views/history.qtpl:89 //line views/history.qtpl:88
func WriteRecentChangesHTML(qq422016 qtio422016.Writer, n int, lc *l18n.Localizer) { func WriteRecentChangesHTML(qq422016 qtio422016.Writer, n int, lc *l18n.Localizer) {
//line views/history.qtpl:89 //line views/history.qtpl:88
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line views/history.qtpl:89 //line views/history.qtpl:88
StreamRecentChangesHTML(qw422016, n, lc) StreamRecentChangesHTML(qw422016, n, lc)
//line views/history.qtpl:89 //line views/history.qtpl:88
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line views/history.qtpl:89 //line views/history.qtpl:88
} }
//line views/history.qtpl:89 //line views/history.qtpl:88
func RecentChangesHTML(n int, lc *l18n.Localizer) string { func RecentChangesHTML(n int, lc *l18n.Localizer) string {
//line views/history.qtpl:89 //line views/history.qtpl:88
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line views/history.qtpl:89 //line views/history.qtpl:88
WriteRecentChangesHTML(qb422016, n, lc) WriteRecentChangesHTML(qb422016, n, lc)
//line views/history.qtpl:89 //line views/history.qtpl:88
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line views/history.qtpl:89 //line views/history.qtpl:88
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line views/history.qtpl:89 //line views/history.qtpl:88
return qs422016 return qs422016
//line views/history.qtpl:89 //line views/history.qtpl:88
} }
//line views/history.qtpl:91 //line views/history.qtpl:90
func streamrecentChangesEntry(qw422016 *qt422016.Writer, rev history.Revision) { func streamrecentChangesEntry(qw422016 *qt422016.Writer, rev history.Revision) {
//line views/history.qtpl:91 //line views/history.qtpl:90
qw422016.N().S(` qw422016.N().S(`
<div> <div>
<time class="recent-changes__entry__time"> <time class="recent-changes__entry__time">
`) `)
//line views/history.qtpl:94 //line views/history.qtpl:93
qw422016.E().S(rev.Time.UTC().Format("15:04 UTC")) qw422016.E().S(rev.Time.UTC().Format("15:04 UTC"))
//line views/history.qtpl:94 //line views/history.qtpl:93
qw422016.N().S(` qw422016.N().S(`
</time> </time>
<span class="recent-changes__entry__message">`) <span class="recent-changes__entry__message">`)
//line views/history.qtpl:96 //line views/history.qtpl:95
qw422016.E().S(rev.Hash) qw422016.E().S(rev.Hash)
//line views/history.qtpl:96 //line views/history.qtpl:95
qw422016.N().S(`</span> qw422016.N().S(`</span>
`) `)
//line views/history.qtpl:98 //line views/history.qtpl:97
if rev.Username != "anon" { if rev.Username != "anon" {
//line views/history.qtpl:98 //line views/history.qtpl:97
qw422016.N().S(` qw422016.N().S(`
<span class="recent-changes__entry__author"> <span class="recent-changes__entry__author">
&mdash; <a href="/hypha/`) &mdash; <a href="/hypha/`)
//line views/history.qtpl:100 //line views/history.qtpl:99
qw422016.E().S(cfg.UserHypha) qw422016.E().S(cfg.UserHypha)
//line views/history.qtpl:100 //line views/history.qtpl:99
qw422016.N().S(`/`) qw422016.N().S(`/`)
//line views/history.qtpl:100 //line views/history.qtpl:99
qw422016.E().S(rev.Username) qw422016.E().S(rev.Username)
//line views/history.qtpl:100 //line views/history.qtpl:99
qw422016.N().S(`" rel="author">`) qw422016.N().S(`" rel="author">`)
//line views/history.qtpl:100 //line views/history.qtpl:99
qw422016.E().S(rev.Username) qw422016.E().S(rev.Username)
//line views/history.qtpl:100 //line views/history.qtpl:99
qw422016.N().S(`</a> qw422016.N().S(`</a>
</span> </span>
`) `)
//line views/history.qtpl:102 //line views/history.qtpl:101
} }
//line views/history.qtpl:102 //line views/history.qtpl:101
qw422016.N().S(` qw422016.N().S(`
</div> </div>
<div> <div>
<span class="recent-changes__entry__links"> <span class="recent-changes__entry__links">
`) `)
//line views/history.qtpl:106 //line views/history.qtpl:105
qw422016.N().S(rev.HyphaeLinksHTML()) qw422016.N().S(rev.HyphaeLinksHTML())
//line views/history.qtpl:106 //line views/history.qtpl:105
qw422016.N().S(` qw422016.N().S(`
</span> </span>
<span class="recent-changes__entry__message"> <span class="recent-changes__entry__message">
`) `)
//line views/history.qtpl:109 //line views/history.qtpl:108
qw422016.E().S(rev.Message) qw422016.E().S(rev.Message)
//line views/history.qtpl:109 //line views/history.qtpl:108
qw422016.N().S(` qw422016.N().S(`
</span> </span>
</div> </div>
`) `)
//line views/history.qtpl:112 //line views/history.qtpl:111
} }
//line views/history.qtpl:112 //line views/history.qtpl:111
func writerecentChangesEntry(qq422016 qtio422016.Writer, rev history.Revision) { func writerecentChangesEntry(qq422016 qtio422016.Writer, rev history.Revision) {
//line views/history.qtpl:112 //line views/history.qtpl:111
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line views/history.qtpl:112 //line views/history.qtpl:111
streamrecentChangesEntry(qw422016, rev) streamrecentChangesEntry(qw422016, rev)
//line views/history.qtpl:112 //line views/history.qtpl:111
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line views/history.qtpl:112 //line views/history.qtpl:111
} }
//line views/history.qtpl:112 //line views/history.qtpl:111
func recentChangesEntry(rev history.Revision) string { func recentChangesEntry(rev history.Revision) string {
//line views/history.qtpl:112 //line views/history.qtpl:111
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line views/history.qtpl:112 //line views/history.qtpl:111
writerecentChangesEntry(qb422016, rev) writerecentChangesEntry(qb422016, rev)
//line views/history.qtpl:112 //line views/history.qtpl:111
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line views/history.qtpl:112 //line views/history.qtpl:111
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line views/history.qtpl:112 //line views/history.qtpl:111
return qs422016 return qs422016
//line views/history.qtpl:112 //line views/history.qtpl:111
} }
//line views/history.qtpl:114 //line views/history.qtpl:113
func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string, lc *l18n.Localizer) { func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string, lc *l18n.Localizer) {
//line views/history.qtpl:114 //line views/history.qtpl:113
qw422016.N().S(` qw422016.N().S(`
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">
<article class="history"> <article class="history">
<h1>`) <h1>`)
//line views/history.qtpl:118 //line views/history.qtpl:117
qw422016.N().S(fmt.Sprintf(lc.Get("ui.history_title"), beautifulLink(hyphaName))) qw422016.N().S(fmt.Sprintf(lc.Get("ui.history_title"), beautifulLink(hyphaName)))
//line views/history.qtpl:118 //line views/history.qtpl:117
qw422016.N().S(`</h1> qw422016.N().S(`</h1>
`) `)
//line views/history.qtpl:119 //line views/history.qtpl:118
qw422016.N().S(list) qw422016.N().S(list)
//line views/history.qtpl:119 //line views/history.qtpl:118
qw422016.N().S(` qw422016.N().S(`
</article> </article>
</main> </main>
</div> </div>
`) `)
//line views/history.qtpl:123 //line views/history.qtpl:122
} }
//line views/history.qtpl:123 //line views/history.qtpl:122
func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string, lc *l18n.Localizer) { func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string, lc *l18n.Localizer) {
//line views/history.qtpl:123 //line views/history.qtpl:122
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line views/history.qtpl:123 //line views/history.qtpl:122
StreamHistoryHTML(qw422016, rq, hyphaName, list, lc) StreamHistoryHTML(qw422016, rq, hyphaName, list, lc)
//line views/history.qtpl:123 //line views/history.qtpl:122
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line views/history.qtpl:123 //line views/history.qtpl:122
} }
//line views/history.qtpl:123 //line views/history.qtpl:122
func HistoryHTML(rq *http.Request, hyphaName, list string, lc *l18n.Localizer) string { func HistoryHTML(rq *http.Request, hyphaName, list string, lc *l18n.Localizer) string {
//line views/history.qtpl:123 //line views/history.qtpl:122
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line views/history.qtpl:123 //line views/history.qtpl:122
WriteHistoryHTML(qb422016, rq, hyphaName, list, lc) WriteHistoryHTML(qb422016, rq, hyphaName, list, lc)
//line views/history.qtpl:123 //line views/history.qtpl:122
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line views/history.qtpl:123 //line views/history.qtpl:122
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line views/history.qtpl:123 //line views/history.qtpl:122
return qs422016 return qs422016
//line views/history.qtpl:123 //line views/history.qtpl:122
} }

4
views/stuff.qtpl
View File

@ -160,10 +160,6 @@ It outputs a poorly formatted JSON, but it works and is valid.
<p>{%s lc.Get("help.empty_error_line_2a") %} <a class="wikilink wikilink_external wikilink_https" href="https://github.com/bouncepaw/mycorrhiza">{%s lc.Get("help.empty_error_link") %}</a> {%s lc.Get("help.empty_error_line_2b") %}</p> <p>{%s lc.Get("help.empty_error_line_2a") %} <a class="wikilink wikilink_external wikilink_https" href="https://github.com/bouncepaw/mycorrhiza">{%s lc.Get("help.empty_error_link") %}</a> {%s lc.Get("help.empty_error_line_2b") %}</p>
{% endfunc %} {% endfunc %}
{% func helpTopicBadgeHTML(lang, topic string) %}
<a class="help-topic-badge" href="/help/en/{%s topic %}">?</a>
{% endfunc %}
{% func HyphaListHTML(lc *l18n.Localizer) %} {% func HyphaListHTML(lc *l18n.Localizer) %}
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">

155
views/stuff.qtpl.go
View File

@ -601,63 +601,24 @@ func HelpEmptyErrorHTML(lc *l18n.Localizer) string {
} }
//line views/stuff.qtpl:163 //line views/stuff.qtpl:163
func streamhelpTopicBadgeHTML(qw422016 *qt422016.Writer, lang, topic string) {
//line views/stuff.qtpl:163
qw422016.N().S(`
<a class="help-topic-badge" href="/help/en/`)
//line views/stuff.qtpl:164
qw422016.E().S(topic)
//line views/stuff.qtpl:164
qw422016.N().S(`">?</a>
`)
//line views/stuff.qtpl:165
}
//line views/stuff.qtpl:165
func writehelpTopicBadgeHTML(qq422016 qtio422016.Writer, lang, topic string) {
//line views/stuff.qtpl:165
qw422016 := qt422016.AcquireWriter(qq422016)
//line views/stuff.qtpl:165
streamhelpTopicBadgeHTML(qw422016, lang, topic)
//line views/stuff.qtpl:165
qt422016.ReleaseWriter(qw422016)
//line views/stuff.qtpl:165
}
//line views/stuff.qtpl:165
func helpTopicBadgeHTML(lang, topic string) string {
//line views/stuff.qtpl:165
qb422016 := qt422016.AcquireByteBuffer()
//line views/stuff.qtpl:165
writehelpTopicBadgeHTML(qb422016, lang, topic)
//line views/stuff.qtpl:165
qs422016 := string(qb422016.B)
//line views/stuff.qtpl:165
qt422016.ReleaseByteBuffer(qb422016)
//line views/stuff.qtpl:165
return qs422016
//line views/stuff.qtpl:165
}
//line views/stuff.qtpl:167
func StreamHyphaListHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) { func StreamHyphaListHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) {
//line views/stuff.qtpl:167 //line views/stuff.qtpl:163
qw422016.N().S(` qw422016.N().S(`
<div class="layout"> <div class="layout">
<main class="main-width"> <main class="main-width">
<h1>`) <h1>`)
//line views/stuff.qtpl:170 //line views/stuff.qtpl:166
qw422016.E().S(lc.Get("ui.list_heading")) qw422016.E().S(lc.Get("ui.list_heading"))
//line views/stuff.qtpl:170 //line views/stuff.qtpl:166
qw422016.N().S(`</h1> qw422016.N().S(`</h1>
<p>`) <p>`)
//line views/stuff.qtpl:171 //line views/stuff.qtpl:167
qw422016.E().S(lc.GetPlural("ui.list_desc", hyphae.Count())) qw422016.E().S(lc.GetPlural("ui.list_desc", hyphae.Count()))
//line views/stuff.qtpl:171 //line views/stuff.qtpl:167
qw422016.N().S(`</p> qw422016.N().S(`</p>
<ul class="hypha-list"> <ul class="hypha-list">
`) `)
//line views/stuff.qtpl:174 //line views/stuff.qtpl:170
hyphaNames := make(chan string) hyphaNames := make(chan string)
sortedHypha := hyphae.PathographicSort(hyphaNames) sortedHypha := hyphae.PathographicSort(hyphaNames)
for hypha := range hyphae.YieldExistingHyphae() { for hypha := range hyphae.YieldExistingHyphae() {
@ -665,134 +626,134 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) {
} }
close(hyphaNames) close(hyphaNames)
//line views/stuff.qtpl:180 //line views/stuff.qtpl:176
qw422016.N().S(` qw422016.N().S(`
`) `)
//line views/stuff.qtpl:181 //line views/stuff.qtpl:177
for hyphaName := range sortedHypha { for hyphaName := range sortedHypha {
//line views/stuff.qtpl:181 //line views/stuff.qtpl:177
qw422016.N().S(` qw422016.N().S(`
`) `)
//line views/stuff.qtpl:182 //line views/stuff.qtpl:178
h := hyphae.ByName(hyphaName) h := hyphae.ByName(hyphaName)
//line views/stuff.qtpl:182 //line views/stuff.qtpl:178
qw422016.N().S(` qw422016.N().S(`
<li class="hypha-list__entry"> <li class="hypha-list__entry">
<a class="hypha-list__link" href="/hypha/`) <a class="hypha-list__link" href="/hypha/`)
//line views/stuff.qtpl:184 //line views/stuff.qtpl:180
qw422016.E().S(h.CanonicalName()) qw422016.E().S(h.CanonicalName())
//line views/stuff.qtpl:184 //line views/stuff.qtpl:180
qw422016.N().S(`"> qw422016.N().S(`">
`) `)
//line views/stuff.qtpl:185 //line views/stuff.qtpl:181
qw422016.E().S(util.BeautifulName(h.CanonicalName())) qw422016.E().S(util.BeautifulName(h.CanonicalName()))
//line views/stuff.qtpl:185 //line views/stuff.qtpl:181
qw422016.N().S(` qw422016.N().S(`
</a> </a>
`) `)
//line views/stuff.qtpl:187 //line views/stuff.qtpl:183
switch h := h.(type) { switch h := h.(type) {
//line views/stuff.qtpl:188 //line views/stuff.qtpl:184
case *hyphae.MediaHypha: case *hyphae.MediaHypha:
//line views/stuff.qtpl:188 //line views/stuff.qtpl:184
qw422016.N().S(` qw422016.N().S(`
<span class="hypha-list__amnt-type"> <span class="hypha-list__amnt-type">
`) `)
//line views/stuff.qtpl:190 //line views/stuff.qtpl:186
qw422016.E().S(filepath.Ext(h.MediaFilePath())[1:]) qw422016.E().S(filepath.Ext(h.MediaFilePath())[1:])
//line views/stuff.qtpl:190 //line views/stuff.qtpl:186
qw422016.N().S(` qw422016.N().S(`
</span> </span>
`) `)
//line views/stuff.qtpl:192 //line views/stuff.qtpl:188
} }
//line views/stuff.qtpl:192 //line views/stuff.qtpl:188
qw422016.N().S(` qw422016.N().S(`
</li> </li>
`) `)
//line views/stuff.qtpl:194 //line views/stuff.qtpl:190
} }
//line views/stuff.qtpl:194 //line views/stuff.qtpl:190
qw422016.N().S(` qw422016.N().S(`
</ul> </ul>
</main> </main>
</div> </div>
`) `)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
} }
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
func WriteHyphaListHTML(qq422016 qtio422016.Writer, lc *l18n.Localizer) { func WriteHyphaListHTML(qq422016 qtio422016.Writer, lc *l18n.Localizer) {
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
StreamHyphaListHTML(qw422016, lc) StreamHyphaListHTML(qw422016, lc)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
} }
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
func HyphaListHTML(lc *l18n.Localizer) string { func HyphaListHTML(lc *l18n.Localizer) string {
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
WriteHyphaListHTML(qb422016, lc) WriteHyphaListHTML(qb422016, lc)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
return qs422016 return qs422016
//line views/stuff.qtpl:198 //line views/stuff.qtpl:194
} }
//line views/stuff.qtpl:200 //line views/stuff.qtpl:196
func StreamCommonScripts(qw422016 *qt422016.Writer) { func StreamCommonScripts(qw422016 *qt422016.Writer) {
//line views/stuff.qtpl:200 //line views/stuff.qtpl:196
qw422016.N().S(` qw422016.N().S(`
`) `)
//line views/stuff.qtpl:201 //line views/stuff.qtpl:197
for _, scriptPath := range cfg.CommonScripts { for _, scriptPath := range cfg.CommonScripts {
//line views/stuff.qtpl:201 //line views/stuff.qtpl:197
qw422016.N().S(` qw422016.N().S(`
<script src="`) <script src="`)
//line views/stuff.qtpl:202 //line views/stuff.qtpl:198
qw422016.E().S(scriptPath) qw422016.E().S(scriptPath)
//line views/stuff.qtpl:202 //line views/stuff.qtpl:198
qw422016.N().S(`"></script> qw422016.N().S(`"></script>
`) `)
//line views/stuff.qtpl:203 //line views/stuff.qtpl:199
} }
//line views/stuff.qtpl:203 //line views/stuff.qtpl:199
qw422016.N().S(` qw422016.N().S(`
`) `)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
} }
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
func WriteCommonScripts(qq422016 qtio422016.Writer) { func WriteCommonScripts(qq422016 qtio422016.Writer) {
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
qw422016 := qt422016.AcquireWriter(qq422016) qw422016 := qt422016.AcquireWriter(qq422016)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
StreamCommonScripts(qw422016) StreamCommonScripts(qw422016)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
qt422016.ReleaseWriter(qw422016) qt422016.ReleaseWriter(qw422016)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
} }
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
func CommonScripts() string { func CommonScripts() string {
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
qb422016 := qt422016.AcquireByteBuffer() qb422016 := qt422016.AcquireByteBuffer()
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
WriteCommonScripts(qb422016) WriteCommonScripts(qb422016)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
qs422016 := string(qb422016.B) qs422016 := string(qb422016.B)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
qt422016.ReleaseByteBuffer(qb422016) qt422016.ReleaseByteBuffer(qb422016)
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
return qs422016 return qs422016
//line views/stuff.qtpl:204 //line views/stuff.qtpl:200
} }