Skip to content

Build: use partialCached #1951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dscho merged 3 commits into from
Apr 3, 2025
Merged

Build: use partialCached #1951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d27312
Build: use partialCached
dotnetCarpenter Feb 19, 2025
743664a
Build: vary cached footer on section
dotnetCarpenter Feb 24, 2025
7ea3705
Move conditional code from footer to baseof.html
dotnetCarpenter Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ <h1>Redirecting&hellip;</h1>

{{ $style := resources.Get "sass/application.scss" | resources.ExecuteAsTemplate "application.scss" . | css.Sass | resources.Minify | fingerprint }}
<link rel="stylesheet" href="{{ $style.RelPermalink }}"{{ if (hasPrefix .Site.BaseURL "https://") }} integrity="{{ $style.Data.Integrity }}"{{ end }}>
<script src="{{ relURL "js/modernizr.js" }}"></script>
<!--[if (gte IE 6)&(lte IE 8)]>
<script src="{{ relURL "js/selectivizr-min.js" }}"></script>
<![endif]-->
Expand All @@ -83,7 +84,7 @@ <h1>Redirecting&hellip;</h1>
<div id="content-wrapper">
<div class="inner">
{{ partial "site-root.html" . }}
{{ partial "footer.html" . }}
{{ partialCached "footer.html" . }}
</div> <!-- .inner -->
</div> <!-- #content-wrapper -->
{{ else if (isset .Params "book") }}
Expand Down Expand Up @@ -111,7 +112,7 @@ <h1>{{ .Params.book.section.cs_number }} {{ .Params.book.chapter.title }} - {{ .
{{ end }}
</div>
</div>
{{ partial "footer.html" . }}
{{ partialCached "footer.html" . }}
</div>
{{ else if (isset .Params "docname") }}
<div class="inner">
Expand Down Expand Up @@ -144,7 +145,7 @@ <h3 hidden="true" data-pagefind-weight="{{ $weight }}">{{ $command_name }}</h3>
</div>
</div>
</div>
{{ partial "footer.html" . }}
{{ partialCached "footer.html" . }}
</div>
{{ else }}
<div class="inner">
Expand Down Expand Up @@ -181,7 +182,8 @@ <h1 data-pagefind-meta="title">About{{ if (isset .Params "subtitle") }} - {{ .Pa
{{ end }}
</div>
</div>
{{ partial "footer.html" . }}
{{ if eq (.Scratch.Get "section") "search" }}<script src="{{ relURL "pagefind/pagefind-ui.js" }}"></script>{{ end }}
{{ partialCached "footer.html" . }}
Copy link
Copy Markdown
Member

@dscho dscho Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that this would break the /search page, as there is a line in footer.html that is contingent on the current page section.

Copy link
Copy Markdown
Member

@dscho dscho Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dotnetCarpenter could you have a look whether the search page renders correctly?

Copy link
Copy Markdown
Member

@dscho dscho Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dotnetCarpenter I had a look, and it does not look good:

ca70cdd917e0fef93cec35d593cd9e12db7a5ab7

In my hands, you need this to fix it:

Suggested change
{{ partialCached "footer.html" . }}
{{ if eq (.Scratch.Get "section") "search" }}
{{ partial "footer.html" . }}
{{ else }}
{{ partialCached "footer.html" . }}
{{ end }}

Copy link
Copy Markdown
Member

@dscho dscho Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dotnetCarpenter see #1955.

Copy link
Copy Markdown
Contributor Author

@dotnetCarpenter dotnetCarpenter Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dscho I'll take a look :)

</div>
{{ end }}

Expand Down
3 changes: 0 additions & 3 deletions layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,5 @@
<script src="{{ relURL "js/jquery-ui-1.8.18.custom.min.js" }}"></script>
<script src="{{ relURL "js/jquery.defaultvalue.js" }}"></script>
<script src="{{ relURL "js/session.min.js" }}"></script>
<script src="{{ relURL "js/modernizr.js" }}"></script>
<script src="{{ relURL "js/modernize.js" }}"></script>
{{ if eq (.Scratch.Get "section") "search" }}<script src="{{ relURL "pagefind/pagefind-ui.js" }}"></script>{{ end }}
{{ $js := resources.Get "js/application.js" | resources.ExecuteAsTemplate "js/application.js" . | resources.Minify | fingerprint }}
<script src="{{ $js.RelPermalink }}"{{ if (hasPrefix .Site.BaseURL "https://") }} integrity="{{ $js.Data.Integrity }}"{{ end }}></script>
2 changes: 1 addition & 1 deletion layouts/partials/site-root.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3>Community</h3>
</div>
</section>
<section id="front-downloads">
{{ partial "monitor.html" . }}
{{ partialCached "monitor.html" . }}
<table>
<tr>
<td nowrap="true"><a href="{{ relURL "downloads/guis" }}" class="icon gui" id="gui-link">Graphical UIs</a></td>
Expand Down
2 changes: 1 addition & 1 deletion layouts/shortcodes/monitor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{ partial "monitor.html" . }}
{{ partialCached "monitor.html" . }}
Loading