Merge pull request #66 from carpentries/fix-65-beta-footer

fix footer
carpentries · Oct 31, 2022 · 6154d6f · 6154d6f
2 parents 1a0dd87 + 1be7214
commit 6154d6f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: varnish
 Title: Front-end for The Carpentries Lesson Template
-Version: 0.2.7
+Version: 0.2.8
 Authors@R: c(
     person(given = "Zhian N.",
            family = "Kamvar",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# varnish 0.2.8
+
+- Workbench Beta phase "Edit on GitHub" links are now formatted correctly.
+  (reported: @zkamvar, #65; fixed @zkamvar, #66)
+
 # varnish 0.2.7
 
 * Lessons in different phases of the workbench beta phase will now have the URLs

diff --git a/inst/pkgdown/templates/footer.html b/inst/pkgdown/templates/footer.html
@@ -2,19 +2,20 @@
 			<hr/>
 			<div class="col-md-6">
 				<p>This lesson is subject to the <a href="CODE_OF_CONDUCT.html">Code of Conduct</a></p>
-				<p><a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">Edit on Github</a> 
         {{#yaml}}
-        {{^beta-date}}{{^pre-beta-date}}
-        <a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">Edit on GitHub</a></p>
-        {{/pre-beta-date}}{{/beta-date}}
+        <p>
+        {{^old-url}}
+        <a href="{{#yaml}}{{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">Edit on GitHub</a>
+        {{/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}}">Edit on GitHub</a></p>
+        <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}}">Edit on GitHub</a>
         {{/pre-beta-date}}
-        {{#beta-date}}{{^pre-beta-date}}
-        <a href="{{#yaml}}https://carpentries.github.io/workbench/contributor/beta.html?id={{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">Edit on GitHub</a></p>
-        {{/pre-beta-date}}{{/beta-date}}
+        {{#beta-date}}
+        <a href="{{#yaml}}https://carpentries.github.io/workbench/contributor/beta.html?id={{source}}/edit/{{branch}}/{{/yaml}}{{file_source}}{{^file_source}}README.md{{/file_source}}">Edit on GitHub</a>
+        {{/beta-date}}
         {{/yaml}}
-        | <a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CONTRIBUTING.md">Contributing</a> | <a href="{{#yaml}}{{source}}/{{/yaml}}">Source</a></p>
+        | <a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CONTRIBUTING.md">Contributing</a> 
+        | <a href="{{#yaml}}{{source}}/{{/yaml}}">Source</a></p>
 				<p><a href="{{#yaml}}{{source}}/blob/{{branch}}/{{/yaml}}CITATION">Cite</a> | <a href="mailto:{{#yaml}}{{contact}}{{/yaml}}">Contact</a> | <a href="https://carpentries.org/about/">About</a></p>
 			</div>
 			<div class="col-md-6">