From b58e4e8c793703dd5a7967c41ee3e7998195808c Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Tue, 10 Apr 2018 20:56:56 +0200 Subject: [PATCH] Slightly imroved main quote rendering --- pages/character/character.go | 9 ++------- pages/character/character.pixy | 9 ++++++--- utils/editform/editform.go | 1 - 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pages/character/character.go b/pages/character/character.go index b0adb041..b284f29f 100644 --- a/pages/character/character.go +++ b/pages/character/character.go @@ -37,14 +37,9 @@ func Get(ctx *aero.Context) string { }) // Quotes - var mainQuote *arn.Quote + mainQuote := character.MainQuote() quotes := character.Quotes() - for i, quote := range quotes { - if quote.IsMainQuote { - mainQuote = quote - quotes = append(quotes[:i], quotes[i+1:]...) - } - } + arn.SortQuotesPopularFirst(quotes) // Set OpenGraph attributes diff --git a/pages/character/character.pixy b/pages/character/character.pixy index 93ebd36c..3117913e 100644 --- a/pages/character/character.pixy +++ b/pages/character/character.pixy @@ -13,9 +13,11 @@ component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime Japanese(character.Name.Japanese) else Japanese("日本語の名前無し") - if mainQuote != nil + + if mainQuote != nil .character-quote Quote(mainQuote) + .character-description.mountable!= markdown.Render(character.Description) h3.mountable Anime @@ -30,8 +32,9 @@ component CharacterDetails(character *arn.Character, characterAnime []*arn.Anime .character-quotes.mountable each quote in quotes - .character-quote - Quote(quote) + if mainQuote == nil || quote.ID != mainQuote.ID + .character-quote + Quote(quote) .character-sidebar if len(character.Attributes) > 0 diff --git a/utils/editform/editform.go b/utils/editform/editform.go index 9342d4aa..032c40c5 100644 --- a/utils/editform/editform.go +++ b/utils/editform/editform.go @@ -200,7 +200,6 @@ func RenderField(b *bytes.Buffer, v *reflect.Value, field reflect.StructField, i return } - // TODO: Render bool type b.WriteString(components.InputBool(idPrefix+field.Name, fieldValue.Bool(), field.Name, field.Tag.Get("tooltip"))) return }