From cdcfd92f606b577ec51decdc772a1d23c92d9721 Mon Sep 17 00:00:00 2001 From: Marvin Elsen Date: Sat, 21 Sep 2024 20:19:00 +0200 Subject: [PATCH] Refactor HTML definition in detail view --- .../ui/controllers/DetailsController.kt | 30 +++++++++++-------- src/main/resources/css/definitions.css | 5 ++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/com/marvinelsen/willow/ui/controllers/DetailsController.kt b/src/main/kotlin/com/marvinelsen/willow/ui/controllers/DetailsController.kt index 039dcb1..1e40f15 100644 --- a/src/main/kotlin/com/marvinelsen/willow/ui/controllers/DetailsController.kt +++ b/src/main/kotlin/com/marvinelsen/willow/ui/controllers/DetailsController.kt @@ -8,6 +8,12 @@ import javafx.scene.control.Label import javafx.scene.control.ListView import javafx.scene.control.TabPane import javafx.scene.web.WebView +import kotlinx.html.body +import kotlinx.html.h1 +import kotlinx.html.html +import kotlinx.html.li +import kotlinx.html.ol +import kotlinx.html.stream.createHTML class DetailsController(private val model: Model) { @FXML @@ -64,19 +70,19 @@ class DetailsController(private val model: Model) { return@addListener } webViewDefinition.engine.loadContent( - buildString { - append("") - append("") - append("

CC-CEDICT

") - append("
    ") - for (definition in newValue.definitions) { - append("
  1. ") - append(definition.joinToString(separator = "; ")) - append("
    2. ") + createHTML().html { + body { + h1 { + +"CC-CEDICT" + } + ol { + for (definition in newValue.definitions) { + li { + +definition.joinToString(separator = "; ") + } + } + } } - append("
") - append("") - append("") } ) } diff --git a/src/main/resources/css/definitions.css b/src/main/resources/css/definitions.css index 18d48cd..7a0d446 100644 --- a/src/main/resources/css/definitions.css +++ b/src/main/resources/css/definitions.css @@ -15,6 +15,11 @@ h1 { font-size: 1.25em; } +ol { + padding-left: 0; + list-style-position: inside; +} + ol li:only-child { list-style: none; }