From ad7ba99fad5001b32193bcdd6006f7a38ab0eb89 Mon Sep 17 00:00:00 2001
From: Kevin Bryan <bryank@cs.uri.edu>
Date: Mon, 4 Mar 2024 11:43:15 -0500
Subject: [PATCH 1/8] Draft dataset layout support
---
archetypes/docs/dataset.md | 11 +++++++++++
layouts/datasets/section.html | 22 ++++++++++++++++++++++
layouts/datasets/single.html | 18 ++++++++++++++++++
layouts/partials/datasetcard.html | 15 +++++++++++++++
layouts/partials/datasetitem.html | 7 +++++++
5 files changed, 73 insertions(+)
create mode 100644 archetypes/docs/dataset.md
create mode 100644 layouts/datasets/section.html
create mode 100644 layouts/datasets/single.html
create mode 100644 layouts/partials/datasetcard.html
create mode 100644 layouts/partials/datasetitem.html
diff --git a/archetypes/docs/dataset.md b/archetypes/docs/dataset.md
new file mode 100644
index 0000000..2b6e8f5
--- /dev/null
+++ b/archetypes/docs/dataset.md
@@ -0,0 +1,11 @@
+---
+title: This dataset
+datapath: /datasets/...
+dataurl: where-from
+downloaded: frequency
+cite: url or direct
+science: ai-bio-phys-chem-pseudo
+blurb: >
+ Short description
+type: datasets
+---
diff --git a/layouts/datasets/section.html b/layouts/datasets/section.html
new file mode 100644
index 0000000..e929ff8
--- /dev/null
+++ b/layouts/datasets/section.html
@@ -0,0 +1,22 @@
+{{ define "main" }}
+{{ partial "breadcrumb.html" .}}
+<div class="container content-width px-6 mx-auto navbar-pad">
+{{ .Content }}
+{{ range $science := .Pages }}
+<h1>{{ $science.Param "title" }}</h1>
+{{ range $page := $science.Pages }}
+{{ template "card" (dict "item" $page) }}
+{{ end }}
+{{ end }}
+</div>
+{{ partial "footer.html" . }}
+{{ end }}
+
+{{ define "card" }}
+<div class="flex flex-col pb-4">
+ <h2><a href="{{ .item.RelPermalink }}">{{ .item.Title }}</a></h2>
+ <div class="font-bold">Description: {{ .item.Params.blurb }}</div>
+ <div class="font-bold">Path: <code>{{ .item.Params.datapath }}</code></div>
+ <a href="{{ .item.RelPermalink }}" class="italic">Read More...</a>
+</div>
+{{ end }}
diff --git a/layouts/datasets/single.html b/layouts/datasets/single.html
new file mode 100644
index 0000000..9708928
--- /dev/null
+++ b/layouts/datasets/single.html
@@ -0,0 +1,18 @@
+{{ define "main" }}
+<div class="container content-width px-6 mx-auto navbar-pad">
+ {{ partial "breadcrumb.html" . }}
+ <h1 {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>{{ .Title }}</h1>
+ <table class="table-auto">
+ <tr><td class="font-bold text-right">Path:</td><td> {{ .Params.datapath }} </td></tr>
+ <tr><td class="font-bold text-right">URL:</td><td> {{ .Params.dataurl }}</td></tr>
+ <tr><td class="font-bold text-right">Downloaded:</td><td> {{ .Params.downloaded }}</td></tr>
+ <tr><td class="font-bold text-right">Cite:</td><td> {{ .Params.cite }}</td></tr>
+ <tr><td class="font-bold text-right">Domain:</td><td> {{ .Params.science }}</td></tr>
+ </table>
+ <div id="content" class="pt-4" {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>
+ {{ .Content }}
+ </div>
+ {{ partial "lastmod.html" . }}
+ {{ partial "footer.html" . }}
+</div>
+{{ end }}
diff --git a/layouts/partials/datasetcard.html b/layouts/partials/datasetcard.html
new file mode 100644
index 0000000..f09807a
--- /dev/null
+++ b/layouts/partials/datasetcard.html
@@ -0,0 +1,15 @@
+{{ define "main" }}
+<div class="container content-width px-6 mx-auto navbar-pad">
+ <h1 {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>{{ .Title }}</h1>
+ <table class="table-auto">
+ <tr><td class="font-bold text-right">Path:</td><td> {{ .Params.datapath }} </td></tr>
+ <tr><td class="font-bold text-right">URL:</td><td> {{ .Params.dataurl }}</td></tr>
+ <tr><td class="font-bold text-right">Downloaded:</td><td> {{ .Params.downloaded }}</td></tr>
+ <tr><td class="font-bold text-right">Cite:</td><td> {{ .Params.cite }}</td></tr>
+ <tr><td class="font-bold text-right">Domain:</td><td> {{ .Params.science }}</td></tr>
+ </table>
+ <div id="content" class="pt-4" {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>
+ {{ .Content }}
+ </div>
+</div>
+{{ end }}
diff --git a/layouts/partials/datasetitem.html b/layouts/partials/datasetitem.html
new file mode 100644
index 0000000..d9258df
--- /dev/null
+++ b/layouts/partials/datasetitem.html
@@ -0,0 +1,7 @@
+<div class="flex flex-col pb-4">
+ <h2><a href="{{ .item.RelPermalink }}">{{ .item.Title }}</a></h2>
+ <h1 {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>{{ .Title }}</h1>
+ <div class="font-bold">Description: {{ .item.Params.blurb }}</div>
+ <div class="font-bold">Path: {{ .item.Params.datapath }} </div>
+ <a href="{{ .item.RelPermalink }}" class="italic">Read More...</a>
+</div>
--
GitLab
From b1a8b62838e21a572b41149a9420cf3799b5256e Mon Sep 17 00:00:00 2001
From: Kevin Bryan <bryank@cs.uri.edu>
Date: Tue, 5 Mar 2024 14:20:54 -0500
Subject: [PATCH 2/8] dataset shortcode
---
layouts/shortcodes/datasetcard.html | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 layouts/shortcodes/datasetcard.html
diff --git a/layouts/shortcodes/datasetcard.html b/layouts/shortcodes/datasetcard.html
new file mode 100644
index 0000000..f53804a
--- /dev/null
+++ b/layouts/shortcodes/datasetcard.html
@@ -0,0 +1,10 @@
+<div class="container content-width px-6 mx-auto navbar-pad">
+ <h1>{{ $.Page.Params.title }}</h1>
+ <table class="table-auto">
+ <tr><td class="font-bold text-right">Path:</td><td> {{ $.Page.Params.datapath }} </td></tr>
+ <tr><td class="font-bold text-right">URL:</td><td> {{ $.Page.Params.dataurl }}</td></tr>
+ <tr><td class="font-bold text-right">Downloaded:</td><td> {{ $.Page.Params.downloaded }}</td></tr>
+ <tr><td class="font-bold text-right">Cite:</td><td> {{ $.Page.Params.cite }}</td></tr>
+ <tr><td class="font-bold text-right">Domain:</td><td> {{ $.Page.Params.science }}</td></tr>
+ </table>
+</div>
--
GitLab
From 97733ded7ed24b6624a533fa0b7b36b3dce6b3e6 Mon Sep 17 00:00:00 2001
From: Kevin Bryan <bryank@cs.uri.edu>
Date: Thu, 14 Mar 2024 18:04:52 -0400
Subject: [PATCH 3/8] datasets: use default layout with shortcodes
Tweaked threecol layout to allow supressing "articles in section"
---
layouts/datasets/section.html | 22 ----------------------
layouts/partials/threecol.html | 2 +-
layouts/shortcodes/datasetcard.html | 13 ++++++++++---
layouts/shortcodes/datasetsectoc.html | 8 ++++++++
layouts/shortcodes/datasettoc.html | 11 +++++++++++
5 files changed, 30 insertions(+), 26 deletions(-)
delete mode 100644 layouts/datasets/section.html
create mode 100644 layouts/shortcodes/datasetsectoc.html
create mode 100644 layouts/shortcodes/datasettoc.html
diff --git a/layouts/datasets/section.html b/layouts/datasets/section.html
deleted file mode 100644
index e929ff8..0000000
--- a/layouts/datasets/section.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ define "main" }}
-{{ partial "breadcrumb.html" .}}
-<div class="container content-width px-6 mx-auto navbar-pad">
-{{ .Content }}
-{{ range $science := .Pages }}
-<h1>{{ $science.Param "title" }}</h1>
-{{ range $page := $science.Pages }}
-{{ template "card" (dict "item" $page) }}
-{{ end }}
-{{ end }}
-</div>
-{{ partial "footer.html" . }}
-{{ end }}
-
-{{ define "card" }}
-<div class="flex flex-col pb-4">
- <h2><a href="{{ .item.RelPermalink }}">{{ .item.Title }}</a></h2>
- <div class="font-bold">Description: {{ .item.Params.blurb }}</div>
- <div class="font-bold">Path: <code>{{ .item.Params.datapath }}</code></div>
- <a href="{{ .item.RelPermalink }}" class="italic">Read More...</a>
-</div>
-{{ end }}
diff --git a/layouts/partials/threecol.html b/layouts/partials/threecol.html
index 6ed5ed8..be47161 100644
--- a/layouts/partials/threecol.html
+++ b/layouts/partials/threecol.html
@@ -23,7 +23,7 @@
<div id="content" {{ if not .page.Params.unsearchable }}data-pagefind-body{{ end }}>
{{ .page.Content }}
</div>
- {{ if .page.IsSection }}
+ {{ if and .page.IsSection .page.Params.showArticles }}
<div class="py-4 mb-4 {{ if .page.Content }}border-t border-color{{ end }}">
{{ partial "section-menu.html" .page }}
</div>
diff --git a/layouts/shortcodes/datasetcard.html b/layouts/shortcodes/datasetcard.html
index f53804a..976d6a6 100644
--- a/layouts/shortcodes/datasetcard.html
+++ b/layouts/shortcodes/datasetcard.html
@@ -1,10 +1,17 @@
<div class="container content-width px-6 mx-auto navbar-pad">
<h1>{{ $.Page.Params.title }}</h1>
<table class="table-auto">
+ {{ range $version := $.Page.Params.versions }}
+ <tr><th class="font-bold text-center" colspan="2">Version: {{ $version.version }} </th></tr>
+ <tr><td class="font-bold text-right">Path:</td><td> {{ $version.datapath }} </td></tr>
+ <tr><td class="font-bold text-right">URL:</td><td> {{ $version.dataurl }}</td></tr>
+ <tr><td class="font-bold text-right">Downloaded:</td><td> {{ $version.downloaded }}</td></tr>
+ <tr><td class="font-bold text-right">Cite:</td><td class="overflow-y-scroll"> {{ transform.Highlight $version.cite "bibtex" "hl_inline=true" }}</td></tr>
+ {{ else }}
<tr><td class="font-bold text-right">Path:</td><td> {{ $.Page.Params.datapath }} </td></tr>
<tr><td class="font-bold text-right">URL:</td><td> {{ $.Page.Params.dataurl }}</td></tr>
- <tr><td class="font-bold text-right">Downloaded:</td><td> {{ $.Page.Params.downloaded }}</td></tr>
- <tr><td class="font-bold text-right">Cite:</td><td> {{ $.Page.Params.cite }}</td></tr>
- <tr><td class="font-bold text-right">Domain:</td><td> {{ $.Page.Params.science }}</td></tr>
+ <tr><td class="font-bold text-right">Downloaded:</td><td> {{ $.Page.Params.downloaded }}</td></tr>
+ <tr><td class="font-bold text-right">Cite:</td><td> {{ transform.Highlight $.Page.Params.cite "bibtex" "hl_inline=true" }}</td></tr>
+ {{ end }}
</table>
</div>
diff --git a/layouts/shortcodes/datasetsectoc.html b/layouts/shortcodes/datasetsectoc.html
new file mode 100644
index 0000000..89b19aa
--- /dev/null
+++ b/layouts/shortcodes/datasetsectoc.html
@@ -0,0 +1,8 @@
+{{ range $page := $.Page.Pages }}
+<h2>{{ $page.Param "title" }}</h2>
+<div class="flex flex-col pb-4">
+ <div class="font-bold">Path: <code>{{ $page.Params.datapath }}</code></div>
+ <div class="font-bold">{{ $page.Params.blurb }}</div>
+ <a href="{{ $page.RelPermalink }}" class="italic">Read More...</a>
+</div>
+{{ end }}
diff --git a/layouts/shortcodes/datasettoc.html b/layouts/shortcodes/datasettoc.html
new file mode 100644
index 0000000..043d1cb
--- /dev/null
+++ b/layouts/shortcodes/datasettoc.html
@@ -0,0 +1,11 @@
+{{ range $science := $.Page.Pages }}
+<h1>{{ $science.Param "title" }}</h1>
+{{ range $page := $science.Pages }}
+<div class="flex flex-col pb-4">
+ <h2><a href="{{ $page.RelPermalink }}">{{ $page.Title }}</a></h2>
+ <div class="font-bold">Description: {{ $page.Params.blurb }}</div>
+ <div class="font-bold">Path: <code>{{ $page.Params.datapath }}</code></div>
+ <a href="{{ $page.RelPermalink }}" class="italic">Read More...</a>
+</div>
+{{ end }}
+{{ end }}
--
GitLab
From ebcb61cef91f2ef80a893dcff07aec433200ef8e Mon Sep 17 00:00:00 2001
From: Georgia Stuart <gstuart@umass.edu>
Date: Fri, 15 Mar 2024 14:23:22 -0500
Subject: [PATCH 4/8] Refactor datasets single pages
Signed-off-by: Georgia Stuart <gstuart@umass.edu>
---
layouts/datasets/single.html | 23 ++++++-------------
layouts/partials/datasetcard.html | 34 +++++++++++++++++------------
layouts/partials/threecol.html | 2 ++
layouts/shortcodes/datasetcard.html | 17 ---------------
4 files changed, 29 insertions(+), 47 deletions(-)
diff --git a/layouts/datasets/single.html b/layouts/datasets/single.html
index 9708928..78b8cd6 100644
--- a/layouts/datasets/single.html
+++ b/layouts/datasets/single.html
@@ -1,18 +1,9 @@
{{ define "main" }}
-<div class="container content-width px-6 mx-auto navbar-pad">
- {{ partial "breadcrumb.html" . }}
- <h1 {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>{{ .Title }}</h1>
- <table class="table-auto">
- <tr><td class="font-bold text-right">Path:</td><td> {{ .Params.datapath }} </td></tr>
- <tr><td class="font-bold text-right">URL:</td><td> {{ .Params.dataurl }}</td></tr>
- <tr><td class="font-bold text-right">Downloaded:</td><td> {{ .Params.downloaded }}</td></tr>
- <tr><td class="font-bold text-right">Cite:</td><td> {{ .Params.cite }}</td></tr>
- <tr><td class="font-bold text-right">Domain:</td><td> {{ .Params.science }}</td></tr>
- </table>
- <div id="content" class="pt-4" {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>
- {{ .Content }}
- </div>
- {{ partial "lastmod.html" . }}
- {{ partial "footer.html" . }}
-</div>
+{{ $currentPage := . }}
+{{ $baseSection := .GetPage .Section }}
+{{ $sections := and (gt (len $baseSection.Sections) 0) (not $baseSection.IsHome) }}
+{{ $toc := .Param "toc" }}
+{{ $preamble := ( printf "<h1>%s</h1>" .Title ) | safeHTML }}
+{{ $postamble := ( partial "datasetcard.html" . ) }}
+{{ partial "threecol.html" (dict "page" . "toc" $toc "sections" $sections "maxPage" $baseSection "contentPreamble" $preamble "contentPostamble" $postamble) }}
{{ end }}
diff --git a/layouts/partials/datasetcard.html b/layouts/partials/datasetcard.html
index f09807a..855ea3b 100644
--- a/layouts/partials/datasetcard.html
+++ b/layouts/partials/datasetcard.html
@@ -1,15 +1,21 @@
-{{ define "main" }}
-<div class="container content-width px-6 mx-auto navbar-pad">
- <h1 {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>{{ .Title }}</h1>
- <table class="table-auto">
- <tr><td class="font-bold text-right">Path:</td><td> {{ .Params.datapath }} </td></tr>
- <tr><td class="font-bold text-right">URL:</td><td> {{ .Params.dataurl }}</td></tr>
- <tr><td class="font-bold text-right">Downloaded:</td><td> {{ .Params.downloaded }}</td></tr>
- <tr><td class="font-bold text-right">Cite:</td><td> {{ .Params.cite }}</td></tr>
- <tr><td class="font-bold text-right">Domain:</td><td> {{ .Params.science }}</td></tr>
- </table>
- <div id="content" class="pt-4" {{ if not .Params.unsearchable }}data-pagefind-body{{ end }}>
- {{ .Content }}
- </div>
-</div>
+<table class="table-auto">
+{{ range $version := $.Page.Params.versions }}
+{{ template "ds-card" $version }}
+{{ else }}
+{{ template "ds-card" .Params }}
+{{ end }}
+</table>
+
+{{ define "ds-card" }}
+<table class="table-auto">
+{{ if .version }}<tr><th class="font-bold text-center" colspan="3">Version: {{ .version }}</th></tr>{{ end }}
+<tr><td class="font-bold text-right">Path:</td><td colspan="2">{{ transform.Highlight .datapath "bash" "hl_inline=true" }}</td></tr>
+<tr><td class="font-bold text-right">URL:</td><td colspan="2"><a href="{{ .dataurl | safeURL }}" target="_blank">{{ .dataurl | safeURL }}</a></td></tr>
+<tr><td class="font-bold text-right">Downloaded:</td><td colspan="2">{{ .downloaded }}</td></tr>
+<tr><td class="font-bold text-right">Cite:</td><td>{{ .cite | markdownify }}</td>
+{{ if .bibtex }}<td><button class="flex items-start pl-2 p-1 border border-color bg-zinc-200 rounded-md"><div class="material-symbols-rounded text-2xl mr-1">content_copy</div><div class="text-left text-sm">Copy BibTex</div></button></td>{{ else }}<td></td>{{ end }}
+</tr>
+{{ if .doi }}<tr><td class="font-bold text-right">DOI:</td><td colspan="2"><a href="{{ ( printf "%s/%s" "https://doi.org" .doi ) | safeURL }}" target="_blank">{{ .doi }}</a></td></tr>{{ end }}
+{{/* <tr><td class="font-bold text-right">Bibtex:</td><td> {{ transform.Highlight .bibtex "bibtex" "hl_inline=true" }}</td></tr> */}}
+</table>
{{ end }}
diff --git a/layouts/partials/threecol.html b/layouts/partials/threecol.html
index be47161..df26cf7 100644
--- a/layouts/partials/threecol.html
+++ b/layouts/partials/threecol.html
@@ -21,7 +21,9 @@
<div class="pr-4 navbar-pad {{ if .sections }}xl:col-start-3{{ end }} {{ if $pageTOC }}xl:col-span-6{{ else}}xl:col-span-8{{ end }} pointer-events-auto">
{{ partial "breadcrumb.html" .page }}
<div id="content" {{ if not .page.Params.unsearchable }}data-pagefind-body{{ end }}>
+ {{ if .contentPreamble }}{{ .contentPreamble | safeHTML }}{{ end }}
{{ .page.Content }}
+ {{ if .contentPostamble }}{{ .contentPostamble | safeHTML }}{{ end }}
</div>
{{ if and .page.IsSection .page.Params.showArticles }}
<div class="py-4 mb-4 {{ if .page.Content }}border-t border-color{{ end }}">
diff --git a/layouts/shortcodes/datasetcard.html b/layouts/shortcodes/datasetcard.html
index 976d6a6..e69de29 100644
--- a/layouts/shortcodes/datasetcard.html
+++ b/layouts/shortcodes/datasetcard.html
@@ -1,17 +0,0 @@
-<div class="container content-width px-6 mx-auto navbar-pad">
- <h1>{{ $.Page.Params.title }}</h1>
- <table class="table-auto">
- {{ range $version := $.Page.Params.versions }}
- <tr><th class="font-bold text-center" colspan="2">Version: {{ $version.version }} </th></tr>
- <tr><td class="font-bold text-right">Path:</td><td> {{ $version.datapath }} </td></tr>
- <tr><td class="font-bold text-right">URL:</td><td> {{ $version.dataurl }}</td></tr>
- <tr><td class="font-bold text-right">Downloaded:</td><td> {{ $version.downloaded }}</td></tr>
- <tr><td class="font-bold text-right">Cite:</td><td class="overflow-y-scroll"> {{ transform.Highlight $version.cite "bibtex" "hl_inline=true" }}</td></tr>
- {{ else }}
- <tr><td class="font-bold text-right">Path:</td><td> {{ $.Page.Params.datapath }} </td></tr>
- <tr><td class="font-bold text-right">URL:</td><td> {{ $.Page.Params.dataurl }}</td></tr>
- <tr><td class="font-bold text-right">Downloaded:</td><td> {{ $.Page.Params.downloaded }}</td></tr>
- <tr><td class="font-bold text-right">Cite:</td><td> {{ transform.Highlight $.Page.Params.cite "bibtex" "hl_inline=true" }}</td></tr>
- {{ end }}
- </table>
-</div>
--
GitLab
From f7ac5271d52ffaf8389b35c1fec4a4e91273a38f Mon Sep 17 00:00:00 2001
From: Georgia Stuart <gstuart@umass.edu>
Date: Fri, 15 Mar 2024 14:28:06 -0500
Subject: [PATCH 5/8] Add dark styling to copy button
Signed-off-by: Georgia Stuart <gstuart@umass.edu>
---
layouts/partials/datasetcard.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/layouts/partials/datasetcard.html b/layouts/partials/datasetcard.html
index 855ea3b..e2562ea 100644
--- a/layouts/partials/datasetcard.html
+++ b/layouts/partials/datasetcard.html
@@ -13,7 +13,7 @@
<tr><td class="font-bold text-right">URL:</td><td colspan="2"><a href="{{ .dataurl | safeURL }}" target="_blank">{{ .dataurl | safeURL }}</a></td></tr>
<tr><td class="font-bold text-right">Downloaded:</td><td colspan="2">{{ .downloaded }}</td></tr>
<tr><td class="font-bold text-right">Cite:</td><td>{{ .cite | markdownify }}</td>
-{{ if .bibtex }}<td><button class="flex items-start pl-2 p-1 border border-color bg-zinc-200 rounded-md"><div class="material-symbols-rounded text-2xl mr-1">content_copy</div><div class="text-left text-sm">Copy BibTex</div></button></td>{{ else }}<td></td>{{ end }}
+{{ if .bibtex }}<td><button class="flex items-start pl-2 p-1 border border-color bg-zinc-200 dark:bg-zinc-700 rounded-md"><div class="material-symbols-rounded text-2xl mr-1">content_copy</div><div class="text-left text-sm">Copy BibTex</div></button></td>{{ else }}<td></td>{{ end }}
</tr>
{{ if .doi }}<tr><td class="font-bold text-right">DOI:</td><td colspan="2"><a href="{{ ( printf "%s/%s" "https://doi.org" .doi ) | safeURL }}" target="_blank">{{ .doi }}</a></td></tr>{{ end }}
{{/* <tr><td class="font-bold text-right">Bibtex:</td><td> {{ transform.Highlight .bibtex "bibtex" "hl_inline=true" }}</td></tr> */}}
--
GitLab
From 8c3f342ee903847703fcbdb6923ee6b8149405d7 Mon Sep 17 00:00:00 2001
From: Georgia Stuart <gstuart@umass.edu>
Date: Fri, 28 Jun 2024 12:31:38 -0500
Subject: [PATCH 6/8] Refactor datasets shortcodes
Signed-off-by: Georgia Stuart <gstuart@umass.edu>
---
layouts/partials/datasettocitem.html | 14 ++++++++++++++
layouts/shortcodes/datasetsectoc.html | 8 --------
layouts/shortcodes/datasettoc.html | 11 -----------
layouts/shortcodes/datasettoc.md | 21 +++++++++++++++++++++
4 files changed, 35 insertions(+), 19 deletions(-)
create mode 100644 layouts/partials/datasettocitem.html
delete mode 100644 layouts/shortcodes/datasetsectoc.html
delete mode 100644 layouts/shortcodes/datasettoc.html
create mode 100644 layouts/shortcodes/datasettoc.md
diff --git a/layouts/partials/datasettocitem.html b/layouts/partials/datasettocitem.html
new file mode 100644
index 0000000..90dab3f
--- /dev/null
+++ b/layouts/partials/datasettocitem.html
@@ -0,0 +1,14 @@
+<div class="flex flex-col mb-8 pl-4 border-l-4 border-main dark:border-main-dark">
+{{ template "blurb" ( dict "blurb" .Params.blurb )}}
+{{ range .Params.versions }}{{ template "datasetpath" (dict "datapath" .datapath) }}
+{{ else }}{{ template "datasetpath" (dict "datapath" .Params.datapath) }}{{ end }}
+<div><a class="flex items-center italic" href="{{ .RelPermalink }}"><span class="material-symbols-rounded pr-2 text-main-color text-base">zoom_in</span><span>View more info...</span></a></div>
+</div>
+
+{{ define "datasetpath" }}
+<div class="flex items-center mb-1"><span class="material-symbols-rounded pr-2 text-main-color text-base">folder_open</span><code>{{ .datapath }}</code></div>
+{{ end }}
+
+{{ define "blurb" }}
+<div class="flex items-center mb-1"><span class="material-symbols-rounded pr-2 text-main-color text-base">info</span><span>{{ .blurb | markdownify }}</span></div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/shortcodes/datasetsectoc.html b/layouts/shortcodes/datasetsectoc.html
deleted file mode 100644
index 89b19aa..0000000
--- a/layouts/shortcodes/datasetsectoc.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ range $page := $.Page.Pages }}
-<h2>{{ $page.Param "title" }}</h2>
-<div class="flex flex-col pb-4">
- <div class="font-bold">Path: <code>{{ $page.Params.datapath }}</code></div>
- <div class="font-bold">{{ $page.Params.blurb }}</div>
- <a href="{{ $page.RelPermalink }}" class="italic">Read More...</a>
-</div>
-{{ end }}
diff --git a/layouts/shortcodes/datasettoc.html b/layouts/shortcodes/datasettoc.html
deleted file mode 100644
index 043d1cb..0000000
--- a/layouts/shortcodes/datasettoc.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ range $science := $.Page.Pages }}
-<h1>{{ $science.Param "title" }}</h1>
-{{ range $page := $science.Pages }}
-<div class="flex flex-col pb-4">
- <h2><a href="{{ $page.RelPermalink }}">{{ $page.Title }}</a></h2>
- <div class="font-bold">Description: {{ $page.Params.blurb }}</div>
- <div class="font-bold">Path: <code>{{ $page.Params.datapath }}</code></div>
- <a href="{{ $page.RelPermalink }}" class="italic">Read More...</a>
-</div>
-{{ end }}
-{{ end }}
diff --git a/layouts/shortcodes/datasettoc.md b/layouts/shortcodes/datasettoc.md
new file mode 100644
index 0000000..a6d188b
--- /dev/null
+++ b/layouts/shortcodes/datasettoc.md
@@ -0,0 +1,21 @@
+{{ range $science := page.Sections }}
+
+## {{ $science.Param "title" }}
+
+{{ range $ds := $science.RegularPages }}
+
+### {{ $ds.Title }}
+
+{{ partial "datasettocitem.html" $ds | safeHTML }}
+
+{{ end }}
+{{ else }}
+
+{{ range $ds := page.RegularPages }}
+
+## {{ $ds.Title }}
+
+{{ partial "datasettocitem.html" $ds | safeHTML }}
+
+{{ end }}
+{{ end }}
--
GitLab
From d0d8bf30fca0ff0c6200fb89d6b648a7bbf3d980 Mon Sep 17 00:00:00 2001
From: Georgia Stuart <gstuart@umass.edu>
Date: Fri, 28 Jun 2024 12:55:12 -0500
Subject: [PATCH 7/8] Add link to headings
Signed-off-by: Georgia Stuart <gstuart@umass.edu>
---
layouts/datasets/_markup/render-heading.html | 3 +++
layouts/shortcodes/datasettoc.md | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 layouts/datasets/_markup/render-heading.html
diff --git a/layouts/datasets/_markup/render-heading.html b/layouts/datasets/_markup/render-heading.html
new file mode 100644
index 0000000..1b1bce2
--- /dev/null
+++ b/layouts/datasets/_markup/render-heading.html
@@ -0,0 +1,3 @@
+<h{{ .Level }} id="{{ .Anchor }}">
+ {{ if .Attributes.link }}<a href="{{ .Attributes.link }}">{{ .Text | safeHTML -}}</a>{{ else }}{{ .Text | safeHTML -}}{{ end }}
+</h{{ .Level }}>
\ No newline at end of file
diff --git a/layouts/shortcodes/datasettoc.md b/layouts/shortcodes/datasettoc.md
index a6d188b..aef6682 100644
--- a/layouts/shortcodes/datasettoc.md
+++ b/layouts/shortcodes/datasettoc.md
@@ -1,10 +1,10 @@
{{ range $science := page.Sections }}
-## {{ $science.Param "title" }}
+## {{ $science.Param "title" }} { #{{ print "category-" $science.File.ContentBaseName }} link="{{ $science.RelPermalink }}" }
{{ range $ds := $science.RegularPages }}
-### {{ $ds.Title }}
+### {{ $ds.Title }} { #{{ print "ds-" $ds.File.ContentBaseName }} link="{{ $ds.RelPermalink }}" }
{{ partial "datasettocitem.html" $ds | safeHTML }}
@@ -13,7 +13,7 @@
{{ range $ds := page.RegularPages }}
-## {{ $ds.Title }}
+## {{ $ds.Title }} { #{{ print "ds-" $ds.File.ContentBaseName }} link="{{ $ds.RelPermalink }}" }
{{ partial "datasettocitem.html" $ds | safeHTML }}
--
GitLab
From 3f3bf38532ab4acc6209a62df940bdf5ce3b5c2d Mon Sep 17 00:00:00 2001
From: Georgia Stuart <gstuart@umass.edu>
Date: Fri, 28 Jun 2024 12:56:22 -0500
Subject: [PATCH 8/8] Remote blank template
Signed-off-by: Georgia Stuart <gstuart@umass.edu>
---
layouts/shortcodes/datasetcard.html | 0
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 layouts/shortcodes/datasetcard.html
diff --git a/layouts/shortcodes/datasetcard.html b/layouts/shortcodes/datasetcard.html
deleted file mode 100644
index e69de29..0000000
--
GitLab