diff --git a/README.md b/README.md index 580feb38..f73a6fc0 100644 --- a/README.md +++ b/README.md @@ -283,8 +283,6 @@ paige: web_master: "" search: hide_page: false - section_pages: - full_pages: false # Display full pages in the list of pages style: "" # CSS included at the end of the stylesheet, before style-last.css ``` diff --git a/layouts/partials/paige/article.html b/layouts/partials/paige/article.html index 9c871aed..09b7ed7c 100644 --- a/layouts/partials/paige/article.html +++ b/layouts/partials/paige/article.html @@ -1,20 +1,9 @@ -{{ $params := . }} - -{{ $fullpages := false }} {{ $page := . }} -{{ if reflect.IsMap $params }} - {{ $fullpages = $params.fullpages }} - {{ $page = $params.page }} -{{ else }} - {{ $params = dict "fullpages" $fullpages "page" $page }} -{{ end }} - -{{ $class := cond $fullpages (slice "paige-article") slice }} +{{ $class := slice }} {{ $draft := $page.Draft }} {{ $expired := and $page.ExpiryDate (lt $page.ExpiryDate now) }} {{ $future := and $page.PublishDate (gt $page.PublishDate now) }} -{{ $id := not $fullpages }} {{ $modified := and $page.PublishDate $page.Lastmod (lt $page.PublishDate $page.Lastmod) }} {{ if $draft }} @@ -53,11 +42,11 @@ {{ $class = delimit ($class | uniq) " " }} -
+
- {{ partial "paige/metadata.html" $params }} + {{ partial "paige/metadata.html" $page }} {{ partial "paige/alert.html" $page }} - {{ partial "paige/toc.html" $params }} - {{ partial "paige/content.html" $params }} + {{ partial "paige/toc.html" $page }} + {{ partial "paige/content.html" $page }}
diff --git a/layouts/partials/paige/content.html b/layouts/partials/paige/content.html index 1709f080..068f99da 100644 --- a/layouts/partials/paige/content.html +++ b/layouts/partials/paige/content.html @@ -1,15 +1,7 @@ -{{ $params := . }} - -{{ $fullpages := false }} {{ $page := . }} -{{ if reflect.IsMap $params }} - {{ $fullpages = $params.fullpages }} - {{ $page = $params.page }} -{{ end }} - -{{ $content := cond ($fullpages | not) ($page.Content | replaceRE `()` (printf `${1}#${3}` (i18n "paige_aria_section_link")) | safeHTML) $page.Content }} +{{ $content := $page.Content | replaceRE `()` (printf `${1}#${3}` (i18n "paige_aria_section_link")) | safeHTML }} {{ with $content }} -
{{ . }}
+
{{ . }}
{{ end }} diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html index c5b71b1f..09788fe5 100644 --- a/layouts/partials/paige/links.html +++ b/layouts/partials/paige/links.html @@ -16,7 +16,7 @@ {{ partial "paige/link.html" (dict "href" "_paige/bootstrap/paige.scss" "page" $page "sass" true) }} {{ partial "paige/link.html" (dict "href" "_paige/bootstrap-icons/bootstrap-icons.css") }} -{{ if or ($page.Param "paige.math") (and ($page.Param "paige.section_pages.full_pages") (where $page.Pages "Params.paige.math" "eq" true)) }} +{{ if $page.Param "paige.math" }} {{ partial "paige/link.html" (dict "href" "_paige/katex/katex.min.css") }} {{ end }} diff --git a/layouts/partials/paige/metadata.html b/layouts/partials/paige/metadata.html index 1b46cade..9509884c 100644 --- a/layouts/partials/paige/metadata.html +++ b/layouts/partials/paige/metadata.html @@ -1,21 +1,11 @@ -{{ $params := . }} - -{{ $fullpages := false }} {{ $page := . }} -{{ if reflect.IsMap $params }} - {{ $fullpages = $params.fullpages }} - {{ $page = $params.page }} -{{ end }} - {{ $authors := partial "paige/authors.html" $page }} {{ $categories := $page.Params.categories | default slice | uniq }} -{{ $class := $fullpages }} {{ $commiturl := "" }} {{ $date := cond (eq ($page.Param "paige.date.source" | default "published") "published") $page.PublishDate $page.Lastmod }} {{ $dateformat := $page.Param "paige.date.format" | default ":date_long" }} {{ $description := $page.Description | markdownify }} -{{ $id := not $fullpages }} {{ $readingtime := $page.ReadingTime }} {{ $series := $page.Params.series }} {{ $tags := $page.Params.tags | default slice | uniq }} @@ -27,17 +17,17 @@ {{ $commiturl = print ($page.Param "paige.git.commit_url_prefix") $page.GitInfo.Hash }} {{ end }} -