From a8e5b94f8e95138dbfa913b74a4d2d65fd5993c1 Mon Sep 17 00:00:00 2001 From: Filip ZybaƂa Date: Fri, 27 Mar 2020 09:57:30 +0100 Subject: Adjusted CSS, added animation. Adjusted table rendering to make it more aesthetic. Generated new expect test outputs. --- .../src/main/kotlin/renderers/html/HtmlRenderer.kt | 48 +++++++++++++++------- 1 file changed, 33 insertions(+), 15 deletions(-) (limited to 'plugins/base/src/main/kotlin/renderers/html') diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt index 439a8fbe..19b0f26f 100644 --- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt @@ -115,13 +115,20 @@ open class HtmlRenderer( } } - private fun TR.buildPlatformTags( - node: ContentGroup + private fun TBODY.buildPlatformTaggedRow( + node: ContentTable, + pageContext: ContentPage, + platformRestriction: PlatformData? ) { - if(ContentKind.shouldBePlatformTagged(node.dci.kind)) { - td { - div("platform-tagged"){ - node.platforms.forEach { + node.children.forEach { + tr("platform-tagged") { + it.children.forEach { + td("content") { + it.build(this, pageContext, platformRestriction) + } + } + td("platform-tagged") { + it.platforms.forEach { div(("platform-tag ${it.platformType.key}")) { text(it.platformType.key.toUpperCase()) } @@ -131,6 +138,22 @@ open class HtmlRenderer( } } + private fun TBODY.buildRow( + node: ContentTable, + pageContext: ContentPage, + platformRestriction: PlatformData? + ) { + node.children.forEach { + tr { + it.children.forEach { + td { + it.build(this, pageContext, platformRestriction) + } + } + } + } + } + override fun FlowContent.buildTable( node: ContentTable, pageContext: ContentPage, @@ -149,15 +172,10 @@ open class HtmlRenderer( } } tbody { - node.children.forEach { - tr { - it.children.forEach { - td { - it.build(this, pageContext, platformRestriction) - } - } - buildPlatformTags(it) - } + if(ContentKind.shouldBePlatformTagged(node.dci.kind)) { + buildPlatformTaggedRow(node, pageContext, platformRestriction) + } else { + buildRow(node, pageContext, platformRestriction) } } } -- cgit