From 6c743e11185180203caf051f5b501ea398621c9c Mon Sep 17 00:00:00 2001 From: "Zhian N. Kamvar" Date: Wed, 5 Oct 2022 10:33:16 -0700 Subject: [PATCH 1/3] modify transition workflow/variables 1. The transtion headers will now have a button that can close them (though its not permenent) 2. The third step of the transition will no longer be coded into the yaml here because the third step of the transition will use the workbench version as the default version. This means that no redirect will be needed. 3. All transition dates will be specified 4. Language has been updated to not refer to "Jekyll" as it may not be immediately obvious that Jekyll was used to build the site. --- _includes/check_transition_variables.html | 16 ++++++++++-- _includes/lesson_footer.html | 14 +++++----- _includes/life_cycle.html | 31 +++++++++++------------ _includes/navbar.html | 2 +- _layouts/base.html | 4 --- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/_includes/check_transition_variables.html b/_includes/check_transition_variables.html index 9a1c045f..96c92285 100644 --- a/_includes/check_transition_variables.html +++ b/_includes/check_transition_variables.html @@ -8,9 +8,21 @@ {% endunless %} {% if date == "true" %} -{% unless site.transition_date %} +{% unless site.transition_date_prebeta %}
- you need to specify the variable transition_date + you need to specify the variable transition_date_prebeta + in _config.yml. +
+{% endunless %} +{% unless site.transition_date_beta %} +
+ you need to specify the variable transition_date_beta + in _config.yml. +
+{% endunless %} +{% unless site.transition_date_prerelease %} +
+ you need to specify the variable transition_date_prerelease in _config.yml.
{% endunless %} diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index 08cac1b9..b74e448a 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -28,13 +28,13 @@ {% endif %}
- {% if site.life_cycle contains 'transition-step' %} - Edit on GitHub - {% elsif page.source == "Rmd" %} - Edit on GitHub - {% else %} - Edit on GitHub - {% endif %} + {% if site.life_cycle == 'transition-step-2' %} + Edit on GitHub + {% elsif page.source == "Rmd" %} + Edit on GitHub + {% else %} + Edit on GitHub + {% endif %} / Contributing / diff --git a/_includes/life_cycle.html b/_includes/life_cycle.html index 9720a183..ba160216 100644 --- a/_includes/life_cycle.html +++ b/_includes/life_cycle.html @@ -41,31 +41,30 @@ {% endcomment %} {% elsif site.life_cycle == "transition-step-1" %} -{% include check_transition_variables.html need_transition_date = 'false' %} +{% include check_transition_variables.html need_transition_date = 'true' %}
- A newer version of this lesson is being tested on The Carpentries Workbench: + A snapshot of this lesson from {{ site.transition_date_prebeta }} is being tested on The Carpentries Workbench: {{ site.transition_url }}. - The Jekyll version of this lesson will become deprecated in the near future. +
+ The Workbench version of this lesson will become default on {{ site.transition_date_prerelease }}. +
{% elsif site.life_cycle == "transition-step-2" %} {% include check_transition_variables.html need_transition_date = 'true' %} -
- A newer version of this lesson is available from: - {{ site.transition_url }}. - The Jekyll version of this lesson will become deprecated on - {{ site.transition_date }}. -
- -{% elsif site.life_cycle == "transition-step-3" %} -{% include check_transition_variables.html need_transition_date = 'false' %} - -
- You are veiwing a deprecated version of this lesson. An updated version is - available from: + {% endif %} diff --git a/_includes/navbar.html b/_includes/navbar.html index d713b836..ac9f06bb 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -94,7 +94,7 @@ {% comment %} Always show license. {% endcomment %}
  • License
    • - {% if site.life_cycle contains 'transition-step' %} + {% if site.life_cycle == 'transition-step-1' %}
  • Improve this page
    • {% elsif page.source == "Rmd" %}
  • Improve this page
    • diff --git a/_layouts/base.html b/_layouts/base.html index 4195ca75..67b6d7af 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -23,10 +23,6 @@ {% include favicons.html %} - {% if site.life_cycle == 'transition-step-3' %} - - {% endif %} -