From a8e52ab26dc6d12c8c18844ed29b9e604f6f4522 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 10 May 2022 10:06:38 +0100 Subject: [PATCH] JAL-4004 cosmetic improvements for Java documentation renderer --- build.gradle | 8 ++- help/help/html/releases.html | 119 +++++++++++++++++++++--------------------- help/help/html/whatsNew.html | 1 + help/templates/releases.html | 9 ++-- help/templates/whatsNew.html | 1 + 5 files changed, 73 insertions(+), 65 deletions(-) diff --git a/build.gradle b/build.gradle index 1056124..51c7eb2 100644 --- a/build.gradle +++ b/build.gradle @@ -138,6 +138,7 @@ ext { if (findProperty("JALVIEW_VERSION")==null || "".equals(JALVIEW_VERSION)) { JALVIEW_VERSION = releaseProps.get("jalview.version") } + println("JALVIEW_VERSION is set to '${JALVIEW_VERSION}'") // this property set when running Eclipse headlessly j2sHeadlessBuildProperty = string("net.sf.j2s.core.headlessbuild") @@ -1475,7 +1476,7 @@ task releasesTemplates { } firstPart = false } - def displayDate = releaseFilesDates[rFile].format("d MMMMM yyyy") + def displayDate = releaseFilesDates[rFile].format("dd/MM/yyyy") def lm = null def rContentProcessed = "" @@ -1515,12 +1516,15 @@ task releasesTemplates { releasesHtmlFile.text = releasesTemplate if (whatsnewMdFile.exists()) { + def wnDisplayDate = releaseFilesDates[releaseMdFile] != null ? releaseFilesDates[releaseMdFile].format("dd MMMM yyyy") : "" def whatsnewMd = hugoTemplateSubstitutions(whatsnewMdFile.text) Node whatsnewNode = parser.parse(whatsnewMd) String whatsnewHtml = renderer.render(whatsnewNode) whatsnewHtml = whatsnewTemplateFile.text.replaceAll("__WHATS_NEW__", whatsnewHtml) whatsnewHtmlFile.text = hugoTemplateSubstitutions(whatsnewHtml, - [:] + [ + DISPLAY_DATE: wnDisplayDate + ] ) } diff --git a/help/help/html/releases.html b/help/help/html/releases.html index 2924858..70db82f 100644 --- a/help/help/html/releases.html +++ b/help/help/html/releases.html @@ -30,13 +30,13 @@ table, th, td { ul { padding: 2; margin-left: 18; - list-style-type: square; + list-style-type: disc; } ul ul { list-style-type: circle; } ul ul ul { - list-style-type: disc; + list-style-type: square; } li::marker { color: #0084A8; @@ -45,7 +45,7 @@ li { padding-bottom: 5; } th { - font-size: 110%; + font-size: 100%; text-style: none; font-weight: bold; padding: 5; @@ -59,7 +59,7 @@ th { } td { vertical-align: top; - padding: 10; + padding: 2; } td.release { width: 8%; @@ -67,6 +67,7 @@ td.release { text-style: italic; text-overflow: ellipsis; white-space: nowrap; + padding-top: 15; } td.new_features, td.issues_resolved { @@ -90,7 +91,7 @@ td.issues_resolved { 2.11.2.2
- 19 April 2022 + 19/04/2022