Merge branch 'main' into sync-with-carpentries

.github/pull.yml

@@ -0,0 +1,8 @@
+## Automatically sync fork with upstream
+version: "1"
+rules:
+  - base: carpentries-main
+    upstream: carpentries:main
+    mergeUnstable: false
+label: ":arrow_heading_down: pull"
+conflictLabel: "merge-conflict"

.gitignore

@@ -1,3 +1,4 @@
 .Rproj.user
 node_modules/*
 docs
+.Rhistory

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: varnish
 Title: Front-end for The Carpentries Lesson Infrastructure
-Version: 1.0.3
+Version: 1.0.3.9000-1
 Authors@R: c(
     person(given = "Robert",
            family = "Davey",

README.md

@@ -1,4 +1,5 @@
-# {varnish}: Template for The Carpentries Workbench <img src='man/figures/logo.png' align='right' alt='' width=120 />
+# Template for Carpentries Lessons (with L2D themes)
+
 
 [![varnish status badge](https://carpentries.r-universe.dev/badges/varnish)](https://carpentries.r-universe.dev)
 
@@ -30,7 +31,7 @@ uglifyjs. Their sources live in the [`source/`](source/) folder with directives
 to include their dependencies (bootstrap, jquery, feather).
 
 The minified versions are built via GitHub actions any time one of the source
-files is changed. 
+files is changed.
 
 To build this locally, you need to make sure to have a working version of
 `node` and `npm`, which can be installed [via the node version manager, nvm](https://github.com/nvm-sh/nvm#intro).
@@ -121,7 +122,7 @@ template:
 
 Each of these parameters can be accessed via the `{{ yaml }}` mustache context.
 For example, this adds a paragraph describing the license provided that the
-`{{ license }}` parameter is present in the yaml: 
+`{{ license }}` parameter is present in the yaml:
 
 ```html
 {{#yaml}}{{#license}}
@@ -138,8 +139,9 @@ For example, this adds a paragraph describing the license provided that the
 
  - `{{ instructor }}`: a boolean indicating instructor view
  - `{{ aio }}`: a boolean indicating that the aio page should be included
+ - `{{ aio_pdf }}`: a boolean indicating that the aio PDF page should be included
  - `{{ this_page }}`: The file-only HTML path of the current page (e.g. `index.html` or `introduction.html`).
- - `{{{ schedule }}}`: The HTML sidebar of the schedule of episodes. 
+ - `{{{ schedule }}}`: The HTML sidebar of the schedule of episodes.
  - `{{{ resources }}}`: an additional part of the sidebar giving extra resource elements avaialable in mobile view.
 
 [{pkgdown}]: https://r-lib.github.io/pkgdown

inst/pkgdown/templates/content-chapter.html

@@ -50,6 +50,10 @@ <h1>{{& pagetitle}}</h1>
           <button role="button" aria-pressed="false" tabindex="0" id="expand-code" class="pull-right" data-expand="{{ translate.ExpandAllSolutions }} " data-collapse="{{ translate.CollapseAllSolutions }} "> {{ translate.ExpandAllSolutions }} <i aria-hidden="true" data-feather="plus"></i></button>
         </div>
 
+        {{#this_page_pdf}}
+            <p><a href="{{#site}}{{root}}{{/site}}{{this_page_pdf}}"><strong>Download Chapter PDF</strong></a></p>
+        {{/this_page_pdf}}
+
         {{{body}}}
 
       </div> <!-- / div.lesson-content -->

inst/pkgdown/templates/footer.html

@@ -1,29 +1,6 @@
 		<footer class="row footer mx-md-3">
 			<hr/>
 			<div class="col-md-6">
-        {{# translate.ThisLessonCoC }}<p>{{& translate.ThisLessonCoC }}</p>{{/ translate.ThisLessonCoC }}
-        {{#yaml}}
-        <p>
-        {{^old-url}}
-        <a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">{{ translate.EditOnGH }}</a>
-        {{/old-url}}
-	{{#old-url}}
-        {{#pre-beta-date}}
-        <a href="{{#yaml}}https://carpentries.github.io/workbench/contributor/pre-beta.html?id={{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">{{ translate.EditOnGH }}</a>
-        {{/pre-beta-date}}
-        {{^pre-beta-date}}
-        <a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">{{ translate.EditOnGH }}</a>
-        {{/pre-beta-date}}
-	{{/old-url}}
-        {{/yaml}}
-        | <a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CONTRIBUTING.md">{{ translate.Contributing }}</a>
-        | <a href="{{#yaml}}{{source}}/{{/yaml}}">{{ translate.Source }}</a></p>
-				<p><a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}{{citation}}">{{ translate.Cite }}</a> | <a href="mailto:{{#yaml}}{{contact}}{{/yaml}}">{{ translate.Contact }}</a> | <a href="https://carpentries.org/about/">{{ translate.About }}</a></p>
-			</div>
-			<div class="col-md-6">
-        {{#yaml}}{{#license}}
-        <p>{{& translate.MaterialsLicensedUnder }}</p>
-        {{/license}}{{/yaml}}
         <p>{{& translate.TemplateLicense }}</p>
         <p>{{& translate.BuiltWith }}</p>
 			</div>

inst/pkgdown/templates/header.html

@@ -189,23 +189,13 @@
           <a class="nav-link" href="{{#site}}{{root}}{{/site}}key-points.html">{{ translate.KeyPoints }}</a>
         </li>
         {{/overview}}
-        <li class="nav-item">
-          <a class="nav-link" href="{{#site}}{{root}}{{/site}}reference.html#glossary">{{ translate.Glossary }}</a>
-        </li>
         <li class="nav-item">
           <a class="nav-link" href="{{#site}}{{root}}{{/site}}profiles.html">{{ translate.LearnerProfiles }}</a>
         </li>
         {{/instructor}}
-        {{#more}}
-        <li class="nav-item dropdown">
-          <button class="nav-link dropdown-toggle" id="navbarDropdown" data-bs-toggle="dropdown" aria-expanded="false">
-            {{ translate.More }} <i data-feather="chevron-down"></i>
-          </button>
-          <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
-            {{& more }}
-          </ul>
+        <li class="nav-item">
+          <a class="nav-link" href="https://learntodiscover.github.io/L2D-Handbook/" target="_blank" rel="noopener noreferrer">L2D Handbook</a>
         </li>
-        {{/more}}
       </ul>
     </div>
     <!--