From 28f3f4ecc7652c4d5495881903c87b213f6a3447 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 2 Aug 2022 14:27:55 +0200
Subject: [PATCH] show description and readme in package view

---
 templates/package/content/composer.tmpl  | 2 ++
 templates/package/content/conan.tmpl     | 2 ++
 templates/package/content/container.tmpl | 3 +++
 templates/package/content/generic.tmpl   | 2 ++
 templates/package/content/helm.tmpl      | 2 ++
 templates/package/content/maven.tmpl     | 2 ++
 templates/package/content/npm.tmpl       | 2 ++
 templates/package/content/nuget.tmpl     | 2 ++
 templates/package/content/readme.tmpl    | 6 ++++++
 templates/package/content/rubygems.tmpl  | 3 +++
 templates/package/view.tmpl              | 7 +++++++
 11 files changed, 33 insertions(+)
 create mode 100644 templates/package/content/readme.tmpl

diff --git a/templates/package/content/composer.tmpl b/templates/package/content/composer.tmpl
index 8cc18f8ba..390088549 100644
--- a/templates/package/content/composer.tmpl
+++ b/templates/package/content/composer.tmpl
@@ -22,6 +22,8 @@
 		</div>
 	</div>
 
+	{{template "package/content/readme" .}}
+
 	{{if .PackageDescriptor.Metadata.Description}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/conan.tmpl b/templates/package/content/conan.tmpl
index c496cee55..c838a02ea 100644
--- a/templates/package/content/conan.tmpl
+++ b/templates/package/content/conan.tmpl
@@ -16,6 +16,8 @@
 		</div>
 	</div>
 
+	{{template "package/content/readme" .}}
+
 	{{if .PackageDescriptor.Metadata.Description}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl
index 44a64d13e..b55c26e11 100644
--- a/templates/package/content/container.tmpl
+++ b/templates/package/content/container.tmpl
@@ -19,6 +19,9 @@
 			</div>
 		</div>
 	</div>
+
+	{{template "package/content/readme" .}}
+
 	{{if .PackageDescriptor.Metadata.MultiArch}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.container.multi_arch"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/generic.tmpl b/templates/package/content/generic.tmpl
index 045ff7d08..e01de4e80 100644
--- a/templates/package/content/generic.tmpl
+++ b/templates/package/content/generic.tmpl
@@ -11,4 +11,6 @@
 			</div>
 		</div>
 	</div>
+
+	{{template "package/content/readme" .}}
 {{end}}
diff --git a/templates/package/content/helm.tmpl b/templates/package/content/helm.tmpl
index 59cdc157b..90224cabe 100644
--- a/templates/package/content/helm.tmpl
+++ b/templates/package/content/helm.tmpl
@@ -17,6 +17,8 @@ helm repo update</code></pre></div>
 		</div>
 	</div>
 
+	{{template "package/content/readme" .}}
+
 	{{if .PackageDescriptor.Metadata.Description}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/maven.tmpl b/templates/package/content/maven.tmpl
index 0b5612151..4bc5828dc 100644
--- a/templates/package/content/maven.tmpl
+++ b/templates/package/content/maven.tmpl
@@ -45,6 +45,8 @@
 		</div>
 	</div>
 
+	{{template "package/content/readme" .}}
+
 	{{if .PackageDescriptor.Metadata.Description}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl
index 33d51d4df..21cfd3437 100644
--- a/templates/package/content/npm.tmpl
+++ b/templates/package/content/npm.tmpl
@@ -20,6 +20,8 @@
 		</div>
 	</div>
 
+	{{template "package/content/readme" .}}
+
 	{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl
index 4ea41fa82..c02243f30 100644
--- a/templates/package/content/nuget.tmpl
+++ b/templates/package/content/nuget.tmpl
@@ -16,6 +16,8 @@
 		</div>
 	</div>
 
+	{{template "package/content/readme" .}}
+
 	{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.ReleaseNotes}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">
diff --git a/templates/package/content/readme.tmpl b/templates/package/content/readme.tmpl
new file mode 100644
index 000000000..8a3f427b3
--- /dev/null
+++ b/templates/package/content/readme.tmpl
@@ -0,0 +1,6 @@
+{{if .PackageDescriptor.Package.Readme}}
+	<h4 class="ui top attached header">{{.locale.Tr "packages.readme"}}</h4>
+	<div class="ui attached segment">
+		{{RenderMarkdownToHtml .PackageDescriptor.Package.Readme}}
+	</div>
+{{end}}
diff --git a/templates/package/content/rubygems.tmpl b/templates/package/content/rubygems.tmpl
index 0cb7b670b..2927b3ac3 100644
--- a/templates/package/content/rubygems.tmpl
+++ b/templates/package/content/rubygems.tmpl
@@ -17,6 +17,9 @@ end</code></pre></div>
 			</div>
 		</div>
 	</div>
+
+	{{template "package/content/readme" .}}
+
 	{{if .PackageDescriptor.Metadata.Description}}
 		<h4 class="ui top attached header">{{.locale.Tr "packages.about"}}</h4>
 		<div class="ui attached segment">{{.PackageDescriptor.Metadata.Description}}</div>
diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index ba309b6a7..16eca46e8 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -7,6 +7,12 @@
 				<div class="sixteen wide column title">
 					<div class="issue-title">
 						<h1>{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})</h1>
+
+						<p class="description">
+							{{if .PackageDescriptor.Package.Description}}
+								{{- .PackageDescriptor.Package.Description -}}
+							{{end}}
+						</p>
 					</div>
 					<div>
 						{{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix $.locale}}
@@ -18,6 +24,7 @@
 					</div>
 					<div class="ui divider"></div>
 				</div>
+
 				<div class="twelve wide column">
 					{{template "package/content/composer" .}}
 					{{template "package/content/conan" .}}