Refactor grid into partial (#530)

scientific-python · Mar 6, 2024 · 91de393 · 91de393
1 parent 9e8a02d
commit 91de393
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 25 deletions.
diff --git a/layouts/partials/_elements/grid.html b/layouts/partials/_elements/grid.html
@@ -0,0 +1,26 @@
+{{- $outline := default "false" .outline -}}
+{{- $columns := default "auto" .columns -}}
+{{- $items := .items -}}
+{{- if eq $outline "true" -}}
+  {{- $outline = "sd-border-1" -}}
+{{- end -}}
+<div class="sd-container-fluid sd-mb-4 {{ $outline | safeHTMLAttr }}">
+{{- if eq $columns "auto"}}
+  <div class="sd-row sd-row-cols-auto sd-row-cols-xs-auto sd-row-cols-sm-auto sd-row-cols-md-auto sd-row-cols-lg-auto">
+{{- else }}
+  {{- $columns := split $columns " " }}
+  {{- $xs := index $columns 0 }}
+  {{- $sm := index $columns 1 }}
+  {{- $md := index $columns 2 }}
+  {{- $lg := index $columns 3 }}
+  <div class="sd-row sd-row-cols-1 sd-row-cols-xs-{{ $xs }} sd-row-cols-sm-{{ $sm }} sd-row-cols-md-{{ $md }} sd-row-cols-lg-{{ $lg }} sd-g-2 sd-g-xs-{{ $xs }} sd-g-sm-{{ $sm }} sd-g-md-{{ $md }} sd-g-lg-{{ $lg }}">
+{{- end }}
+{{- range $key, $d := $items -}}
+  {{- if eq $d.type "card" }}
+    {{- partial "_elements/card.html" $d -}}
+  {{- else }}
+    {{- partial "_elements/item.html" $d -}}
+  {{- end }}
+{{- end }}
+  </div>
+</div>
diff --git a/layouts/shortcodes/grid1.html b/layouts/shortcodes/grid1.html
@@ -2,7 +2,7 @@
 
 doc: Grids.
 
-{{< grid1 columns="1 2 3 4" outline="" >}}
+{{< grid1 columns="1 2 3 4" outline="true" >}}
 
 [[item]]
 type = ''
@@ -96,21 +96,6 @@
 
 */}}
 
-{{- $outline := "" -}}
-{{- if isset .Params `outline` -}}
-  {{- $outline = "sd-border-1" -}}
-{{- end -}}
-<div class="sd-container-fluid sd-mb-4 {{ $outline | safeHTMLAttr }}">
-{{- with .Get "columns" }}
-  {{- $columns := split . " " }}
-  {{- $xs := index $columns 0 }}
-  {{- $sm := index $columns 1 }}
-  {{- $md := index $columns 2 }}
-  {{- $lg := index $columns 3 }}
-  <div class="sd-row sd-row-cols-1 sd-row-cols-xs-{{ $xs }} sd-row-cols-sm-{{ $sm }} sd-row-cols-md-{{ $md }} sd-row-cols-lg-{{ $lg }} sd-g-2 sd-g-xs-{{ $xs }} sd-g-sm-{{ $sm }} sd-g-md-{{ $md }} sd-g-lg-{{ $lg }}">
-{{- else }}
-  <div class="sd-row sd-row-cols-auto sd-row-cols-xs-auto sd-row-cols-sm-auto sd-row-cols-md-auto sd-row-cols-lg-auto">
-{{- end }}
 {{- $items := "" -}}
 {{- with .Get "file" -}}
   {{- with $.Page.Resources.Get  . | transform.Unmarshal }}
@@ -121,12 +106,4 @@
 {{- else }}
   {{- $items = (index (.Inner | transform.Unmarshal) "item") }}
 {{- end }}
-{{- range $key, $d := $items -}}
-  {{- if eq $d.type "card" }}
-    {{- partial "_elements/card.html" $d -}}
-  {{- else }}
-    {{- partial "_elements/item.html" $d -}}
-  {{- end }}
-{{- end }}
-  </div>
-</div>
+{{- partial "_elements/grid.html" (merge .Params (dict "items" $items)) -}}