@find . -name '*.pyc' -exec rm {} \;
## clean-rmd : clean intermediate R files (that need to be committed to the repo).
-clear-rmd :
+clean-rmd :
@rm -rf ${RMD_DST}
@rm -rf fig/rmd-*
<div class="row">
<div class="col-md-6 copyright" align="left">
{% if site.carpentry == "swc" %}
- Copyright © 2018–{{ 'now' | date: "%Y" }}
- <a href="{{ site.carpentries_site }}">The Carpentries</a>
+ Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2018–{{ 'now' | date: "%Y" }}
+ by <a href="{{ site.carpentries_site }}">The Carpentries</a>
<br>
- Copyright © 2016–2018
- <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
+ Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2016–2018
+ by <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
{% elsif site.carpentry == "dc" %}
- Copyright © 2018–{{ 'now' | date: "%Y" }}
- <a href="{{ site.carpentries_site }}">The Carpentries</a>
+ Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2018–{{ 'now' | date: "%Y" }}
+ by <a href="{{ site.carpentries_site }}">The Carpentries</a>
<br>
- Copyright © 2016–2018
- <a href="{{ site.dc_site }}">Data Carpentry</a>
+ Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2016–2018
+ by <a href="{{ site.dc_site }}">Data Carpentry</a>
{% elsif site.carpentry == "lc" %}
- Copyright © 2016–{{ 'now' | date: "%Y" }}
- <a href="{{ site.lc_site }}">Library Carpentry</a>
+ Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2016–{{ 'now' | date: "%Y" }}
+ by <a href="{{ site.lc_site }}">Library Carpentry</a>
{% elsif site.carpentry == "cp" %}
- Copyright © 2018–{{ 'now' | date: "%Y" }}
- <a href="{{ site.carpentries_site }}">The Carpentries</a>
+ Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2018–{{ 'now' | date: "%Y" }}
+ by <a href="{{ site.carpentries_site }}">The Carpentries</a>
{% endif %}
</div>
<div class="col-md-6 help-links" align="right">
--- /dev/null
+<a href="//calendar.google.com/calendar/render?action=TEMPLATE&text={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop&dates={{ page.startdate | replace: "-", "" }}/{{ page.enddate | replace: "-", "" | plus: 0}}&trp=false&sprop&sprop=name:&sf=true&output=xml&location={{ page.address }}&details={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop at {{ page.venue }}">Add to your Google Calendar.</a>
---
---
+
+{% comment %}
+When rendering websites locally, `site.github.url` doesn't get resolved
+properly unless GitHub PAT are set up and available in the environment.
+This leads to warnings and errors when trying to serve the site locally.
+To work around this, we use the `jekyll.environment` variable which is set to
+`development` when rendering the site locally, and set to `production` on
+GitHub where `site.github.url` will be defined.
+{% endcomment %}
+
+{% if jekyll.environment == "development" %}
+{% assign search_domain_url = "" %}
+{% elsif jekyll.environment == "production" %}
+{% assign search_domain_url = site.github.url %}
+{% endif %}
+
<!doctype html>
<html lang="en">
<head>
<meta http-equiv="last-modified" content="{{ site.time }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- meta "search-domain" used for google site search function google_search() -->
- <meta name="search-domain" value="{{ site.github.url }}">
+ <meta name="search-domain" value="{{ search_domain_url }}">
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
//----------------------------------------
@mixin cdSetup($color) {
- color: $color;
- border-left: solid 5px $color;
- margin-bottom: 0px;
- border-radius: 4px 0 0 4px;
+ color: $color;
+ border-left: solid 5px $color;
+ margin: 15px;
+ border-radius: 4px 0 0 4px;
}
.error { @include cdSetup($color-error); }
padding-right: 0;
border: 1px solid;
border-color: $color;
+ border-radius: 4px;
padding-bottom: $codeblock-padding;
+ margin: 15px;
+
h2 {
padding-top: $codeblock-padding;
padding-bottom: $codeblock-padding;
font-size: 18px;
}
+blockquote p {
+ margin: 5px;
+}
+
//----------------------------------------
// Override Bootstrap settings.
//----------------------------------------
footer .copyright,
footer .help-links
{
- font-size: 18px;
+ font-size: inherit;
margin-top: 10px;
margin-bottom: 10px;
font-weight: 500;
+++ /dev/null
----
-layout: page
-title: "Contributor Code of Conduct"
----
-As contributors and maintainers of this project,
-we pledge to follow the [Carpentry Code of Conduct][coc].
-
-Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by following our [reporting guidelines][coc-reporting].
-
-{% include links.md %}
training_site: "https://carpentries.github.io/instructor-training"
workshop_repo: "https://github.com/carpentries/workshop-template"
workshop_site: "https://carpentries.github.io/workshop-template"
+cc_by_human: "https://creativecommons.org/licenses/by/4.0/"
# Surveys.
-pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="
-post_survey: "https://www.surveymonkey.com/r/swc_post_workshop_v1?workshop_id="
+swc_pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="
+swc_post_survey: "https://www.surveymonkey.com/r/swc_post_workshop_v1?workshop_id="
training_post_survey: "https://www.surveymonkey.com/r/post-instructor-training"
+dc_pre_survey: "https://www.surveymonkey.com/r/dcpreworkshopassessment?workshop_id="
+dc_post_survey: "https://www.surveymonkey.com/r/dcpostworkshopassessment?workshop_id="
+lc_pre_survey: "https://www.surveymonkey.com/r/lcpreworkshopsurvey?workshop_id="
+lc_post_survey: "https://www.surveymonkey.com/r/lcpostworkshopsurvey?workshop_id="
+instructor_pre_survey: "https://www.surveymonkey.com/r/instructor_training_pre_survey?workshop_id="
+instructor_post_survey: "https://www.surveymonkey.com/r/instructor_training_post_survey?workshop_id="
+
# Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am).
start_time: 0
'.travis.yml',
'AUTHORS',
'CITATION',
- 'CODE_OF_CONDUCT.md',
'CONTRIBUTING.md',
'README.md',
'_config.yml',