Skip to content

Commit e25e10e

Browse files
authored
Merge pull request #61 from carpentries/update-for-workbench-beta
update workbench beta message:
2 parents 85363d9 + b06cdcd commit e25e10e

File tree

4 files changed

+34
-7
lines changed

4 files changed

+34
-7
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: varnish
22
Title: Front-end for The Carpentries Lesson Template
3-
Version: 0.2.4
3+
Version: 0.2.5
44
Authors@R: c(
55
person(given = "Zhian N.",
66
family = "Kamvar",

NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# varnish 0.2.5
2+
3+
* Workbench Beta messaging has been modified to be more visible and to link back
4+
to the original lesson if possible.
5+
- The icon for lessons in "alpha" has been updated so it has a yellow background
6+
with a grey glyph so that the icon shows up better.
7+
18
# varnish 0.2.4
29

310
* Callout block titles have been improved: The underline height for titles have

inst/pkgdown/templates/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
var _paq = window._paq = window._paq || [];
3636
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
3737
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
38-
_paq.push(["setDomains", ["*.lessons.carpentries.org","*.datacarpentry.github.io","*.datacarpentry.org","*.librarycarpentry.github.io","*.librarycarpentry.org","*.swcarpentry.github.io", "*.carpentries.github.io"]]);
38+
_paq.push(["setDomains", ["*.preview.carpentries.org","*.datacarpentry.github.io","*.datacarpentry.org","*.librarycarpentry.github.io","*.librarycarpentry.org","*.swcarpentry.github.io", "*.carpentries.github.io"]]);
3939
_paq.push(["setDoNotTrack", true]);
4040
_paq.push(["disableCookies"]);
4141
_paq.push(['trackPageView']);

inst/pkgdown/templates/header.html

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<abbr class="icon" title="This lesson is in the pre-alpha phase, which means that it is in early development, but has not yet been taught." style="text-decoration: unset">
1010
&nbsp;
1111
<a href="https://cdh.carpentries.org/the-lesson-life-cycle.html#early-development-pre-alpha-through-alpha" class="alert-link" style="color: #383838">Pre-Alpha
12-
<i aria-hidden="true" class="icon" data-feather="alert-octagon" style="color: #FF4955"></i>
12+
<i aria-hidden="true" class="icon" data-feather="alert-octagon" style="color: #FF4955; border-radius: 5px"></i>
1313
</a>
1414
<span class="visually-hidden">This lesson is in the pre-alpha phase, which means that it is in early development, but has not yet been taught.</span>
1515
</abbr>
@@ -18,7 +18,7 @@
1818
<abbr class="icon" title="This lesson is in the alpha phase, which means that it has been taught once and lesson authors are iterating on feedback." style="text-decoration: unset">
1919
&nbsp;
2020
<a href="https://cdh.carpentries.org/the-lesson-life-cycle.html#field-testing-alpha-stage" class="alert-link" style="color: #383838">Alpha
21-
<i aria-hidden="true" class="icon" data-feather="alert-triangle" style="color: #FFC700"></i>
21+
<i aria-hidden="true" class="icon" data-feather="alert-triangle" style="background: #FFC700; border-radius: 5px"></i>
2222
</a>
2323
<span class="visually-hidden">This lesson is in the alpha phase, which means that it has been taught once and lesson authors are iterating on feedback.</span>
2424
</abbr>
@@ -27,7 +27,7 @@
2727
<abbr class="icon" title="This lesson is in the beta phase, which means that it is ready for teaching by instructors outside of the original author team." style="text-decoration: unset">
2828
&nbsp;
2929
<a href="https://cdh.carpentries.org/the-lesson-life-cycle.html#polishing-beta-stage" class="alert-link" style="color: #383838">Beta
30-
<i aria-hidden="true" class="icon" data-feather="alert-circle" style="color: #001483"></i>
30+
<i aria-hidden="true" class="icon" data-feather="alert-circle" style="color: #001483; border-radius: 5px"></i>
3131
</a>
3232
<span class="visually-hidden">This lesson is in the beta phase, which means that it is ready for teaching by instructors outside of the original author team.</span>
3333
</abbr>
@@ -38,10 +38,30 @@
3838
<div class="selector-container ">
3939
{{#yaml}}{{#workbench-beta}}
4040
<div class="beta-alert alert alert-light alert-dismissable fade show" role="alert">
41+
{{#pre-beta-date}}
42+
<abbr class="icon" title="This lesson is in the Workbench Beta Phase (pre-beta stage) and is a snapshot of {{&title}} from {{pre-beta-date}}. Editing this page will have no effect on the lesson. Click here to go back to the styles version." style="text-decoration: unset">
43+
<span class="visually-hidden">This lesson is in the Workbench Beta Phase (pre-beta stage) and is a snapshot of {{&title}} from {{pre-beta-date}}. Editing this page will have no effect on the lesson.</span>
44+
<a href="{{old-url}}" class="alert-link" style="color: #383838">
45+
<i aria-hidden="true" class="icon" data-feather="alert-triangle" style="background: #FFC700; border-radius: 5px"></i>
46+
<span class="visually-hidden">Visit the styles version of the lesson</span>
47+
</a>
48+
</abbr>
49+
{{/pre-beta-date}}
50+
{{#beta-date}}
51+
<abbr class="icon" title="This lesson is in the Workbench Beta Phase (beta stage). Click here to visit a snapshot of the styles version from {{beta-date}}." style="text-decoration: unset">
52+
<span class="visually-hidden">This lesson is in the Workbench Beta Phase (beta stage).</span>
53+
<a href="{{old-url}}" class="alert-link" style="color: #383838">
54+
<i aria-hidden="true" class="icon" data-feather="alert-circle" style="background: #719eff; border-radius: 5px"></i>
55+
<span class="visually-hidden">Visit a snapshot of the styles version from {{beta-date}}</span>
56+
</a>
57+
</abbr>
58+
{{/beta-date}}
59+
{{^beta-date}}{{^pre-beta-date}}
4160
<i aria-hidden="true" class="icon" data-feather="alert-circle" style="color: #5bbad5"></i>
61+
{{/pre-beta-date}}{{/beta-date}}
4262
Workbench Beta |
43-
<a href="https://github.com/carpentries/workbench/discussions" class="alert-link">Give Feedback</a> |
44-
<a href="https://carpentries.github.io/workbench" class="alert-link">Learn More</a>
63+
<a href="https://github.com/carpentries/workbench/discussions" class="alert-link" style="text-decoration: wavy overline">Give Feedback</a> |
64+
<a href="https://carpentries.github.io/workbench/beta-phase.html" class="alert-link">Learn More</a>
4565
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
4666
</div>
4767
{{/workbench-beta}}{{/yaml}}

0 commit comments

Comments
 (0)