From 603707335204eef33a622c6bf10234f2962b4717 Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Mon, 21 Mar 2022 00:06:38 +0300 Subject: [PATCH] Recent changes: Get rid of ? in a circle --- views/history.qtpl | 1 - views/history.qtpl.go | 135 ++++++++++++++++++------------------ views/stuff.qtpl | 4 -- views/stuff.qtpl.go | 155 ++++++++++++++++-------------------------- 4 files changed, 123 insertions(+), 172 deletions(-) diff --git a/views/history.qtpl b/views/history.qtpl index 9f6d957..2f53493 100644 --- a/views/history.qtpl +++ b/views/history.qtpl @@ -82,7 +82,6 @@ if err != nil { {% endfor %} {% endif %} - {%s= helpTopicBadgeHTML(lc.Locale, "recent_changes") %} diff --git a/views/history.qtpl.go b/views/history.qtpl.go index 92327ec..0ffbbee 100644 --- a/views/history.qtpl.go +++ b/views/history.qtpl.go @@ -272,181 +272,176 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int, lc *l18n.Localize //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(` `) -//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) { -//line views/history.qtpl:89 +//line views/history.qtpl:88 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:89 +//line views/history.qtpl:88 StreamRecentChangesHTML(qw422016, n, lc) -//line views/history.qtpl:89 +//line views/history.qtpl:88 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 { -//line views/history.qtpl:89 +//line views/history.qtpl:88 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:89 +//line views/history.qtpl:88 WriteRecentChangesHTML(qb422016, n, lc) -//line views/history.qtpl:89 +//line views/history.qtpl:88 qs422016 := string(qb422016.B) -//line views/history.qtpl:89 +//line views/history.qtpl:88 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:89 +//line views/history.qtpl:88 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) { -//line views/history.qtpl:91 +//line views/history.qtpl:90 qw422016.N().S(`
`) -//line views/history.qtpl:96 +//line views/history.qtpl:95 qw422016.E().S(rev.Hash) -//line views/history.qtpl:96 +//line views/history.qtpl:95 qw422016.N().S(` `) -//line views/history.qtpl:98 +//line views/history.qtpl:97 if rev.Username != "anon" { -//line views/history.qtpl:98 +//line views/history.qtpl:97 qw422016.N().S(` — `) -//line views/history.qtpl:102 +//line views/history.qtpl:101 } -//line views/history.qtpl:102 +//line views/history.qtpl:101 qw422016.N().S(`
`) -//line views/history.qtpl:106 +//line views/history.qtpl:105 qw422016.N().S(rev.HyphaeLinksHTML()) -//line views/history.qtpl:106 +//line views/history.qtpl:105 qw422016.N().S(` `) -//line views/history.qtpl:109 +//line views/history.qtpl:108 qw422016.E().S(rev.Message) -//line views/history.qtpl:109 +//line views/history.qtpl:108 qw422016.N().S(`
`) -//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) { -//line views/history.qtpl:112 +//line views/history.qtpl:111 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:112 +//line views/history.qtpl:111 streamrecentChangesEntry(qw422016, rev) -//line views/history.qtpl:112 +//line views/history.qtpl:111 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 { -//line views/history.qtpl:112 +//line views/history.qtpl:111 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:112 +//line views/history.qtpl:111 writerecentChangesEntry(qb422016, rev) -//line views/history.qtpl:112 +//line views/history.qtpl:111 qs422016 := string(qb422016.B) -//line views/history.qtpl:112 +//line views/history.qtpl:111 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:112 +//line views/history.qtpl:111 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) { -//line views/history.qtpl:114 +//line views/history.qtpl:113 qw422016.N().S(`

`) -//line views/history.qtpl:118 +//line views/history.qtpl:117 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(`

`) -//line views/history.qtpl:119 +//line views/history.qtpl:118 qw422016.N().S(list) -//line views/history.qtpl:119 +//line views/history.qtpl:118 qw422016.N().S(`
`) -//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) { -//line views/history.qtpl:123 +//line views/history.qtpl:122 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:123 +//line views/history.qtpl:122 StreamHistoryHTML(qw422016, rq, hyphaName, list, lc) -//line views/history.qtpl:123 +//line views/history.qtpl:122 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 { -//line views/history.qtpl:123 +//line views/history.qtpl:122 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:123 +//line views/history.qtpl:122 WriteHistoryHTML(qb422016, rq, hyphaName, list, lc) -//line views/history.qtpl:123 +//line views/history.qtpl:122 qs422016 := string(qb422016.B) -//line views/history.qtpl:123 +//line views/history.qtpl:122 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:123 +//line views/history.qtpl:122 return qs422016 -//line views/history.qtpl:123 +//line views/history.qtpl:122 } diff --git a/views/stuff.qtpl b/views/stuff.qtpl index 6403939..73045e4 100644 --- a/views/stuff.qtpl +++ b/views/stuff.qtpl @@ -160,10 +160,6 @@ It outputs a poorly formatted JSON, but it works and is valid.

{%s lc.Get("help.empty_error_line_2a") %} {%s lc.Get("help.empty_error_link") %} {%s lc.Get("help.empty_error_line_2b") %}

{% endfunc %} -{% func helpTopicBadgeHTML(lang, topic string) %} -? -{% endfunc %} - {% func HyphaListHTML(lc *l18n.Localizer) %}
diff --git a/views/stuff.qtpl.go b/views/stuff.qtpl.go index 84001e4..34a9ae6 100644 --- a/views/stuff.qtpl.go +++ b/views/stuff.qtpl.go @@ -601,63 +601,24 @@ func HelpEmptyErrorHTML(lc *l18n.Localizer) string { } //line views/stuff.qtpl:163 -func streamhelpTopicBadgeHTML(qw422016 *qt422016.Writer, lang, topic string) { -//line views/stuff.qtpl:163 - qw422016.N().S(` -? -`) -//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) { -//line views/stuff.qtpl:167 +//line views/stuff.qtpl:163 qw422016.N().S(`

`) -//line views/stuff.qtpl:170 +//line views/stuff.qtpl:166 qw422016.E().S(lc.Get("ui.list_heading")) -//line views/stuff.qtpl:170 +//line views/stuff.qtpl:166 qw422016.N().S(`

`) -//line views/stuff.qtpl:171 +//line views/stuff.qtpl:167 qw422016.E().S(lc.GetPlural("ui.list_desc", hyphae.Count())) -//line views/stuff.qtpl:171 +//line views/stuff.qtpl:167 qw422016.N().S(`

    `) -//line views/stuff.qtpl:174 +//line views/stuff.qtpl:170 hyphaNames := make(chan string) sortedHypha := hyphae.PathographicSort(hyphaNames) for hypha := range hyphae.YieldExistingHyphae() { @@ -665,134 +626,134 @@ func StreamHyphaListHTML(qw422016 *qt422016.Writer, lc *l18n.Localizer) { } close(hyphaNames) -//line views/stuff.qtpl:180 +//line views/stuff.qtpl:176 qw422016.N().S(` `) -//line views/stuff.qtpl:181 +//line views/stuff.qtpl:177 for hyphaName := range sortedHypha { -//line views/stuff.qtpl:181 +//line views/stuff.qtpl:177 qw422016.N().S(` `) -//line views/stuff.qtpl:182 +//line views/stuff.qtpl:178 h := hyphae.ByName(hyphaName) -//line views/stuff.qtpl:182 +//line views/stuff.qtpl:178 qw422016.N().S(`
  • `) -//line views/stuff.qtpl:185 +//line views/stuff.qtpl:181 qw422016.E().S(util.BeautifulName(h.CanonicalName())) -//line views/stuff.qtpl:185 +//line views/stuff.qtpl:181 qw422016.N().S(` `) -//line views/stuff.qtpl:187 +//line views/stuff.qtpl:183 switch h := h.(type) { -//line views/stuff.qtpl:188 +//line views/stuff.qtpl:184 case *hyphae.MediaHypha: -//line views/stuff.qtpl:188 +//line views/stuff.qtpl:184 qw422016.N().S(` `) -//line views/stuff.qtpl:190 +//line views/stuff.qtpl:186 qw422016.E().S(filepath.Ext(h.MediaFilePath())[1:]) -//line views/stuff.qtpl:190 +//line views/stuff.qtpl:186 qw422016.N().S(` `) -//line views/stuff.qtpl:192 +//line views/stuff.qtpl:188 } -//line views/stuff.qtpl:192 +//line views/stuff.qtpl:188 qw422016.N().S(`
    • `) -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:190 } -//line views/stuff.qtpl:194 +//line views/stuff.qtpl:190 qw422016.N().S(`
`) -//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) { -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 StreamHyphaListHTML(qw422016, lc) -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 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 { -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 WriteHyphaListHTML(qb422016, lc) -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:198 +//line views/stuff.qtpl:194 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) { -//line views/stuff.qtpl:200 +//line views/stuff.qtpl:196 qw422016.N().S(` `) -//line views/stuff.qtpl:201 +//line views/stuff.qtpl:197 for _, scriptPath := range cfg.CommonScripts { -//line views/stuff.qtpl:201 +//line views/stuff.qtpl:197 qw422016.N().S(` `) -//line views/stuff.qtpl:203 +//line views/stuff.qtpl:199 } -//line views/stuff.qtpl:203 +//line views/stuff.qtpl:199 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) { -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 StreamCommonScripts(qw422016) -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 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 { -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 qb422016 := qt422016.AcquireByteBuffer() -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 WriteCommonScripts(qb422016) -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 qs422016 := string(qb422016.B) -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 qt422016.ReleaseByteBuffer(qb422016) -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 return qs422016 -//line views/stuff.qtpl:204 +//line views/stuff.qtpl:200 }