Unverified Commit a26b7625 authored by François Michonneau's avatar François Michonneau Committed by GitHub

Merge branch 'gh-pages' into update-template

parents 1ec43fb3 7958f5fe
......@@ -4,6 +4,8 @@ Please delete the text below before submitting your contribution.
Thanks for contributing! If this contribution is for instructor training, please send an email to checkout@carpentries.org with a link to this contribution so we can record your progress. You’ve completed your contribution step for instructor checkout just by submitting this contribution.
If this issue is about a specific episode within a lesson, please provide its link or filename.
Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum. If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact Kate Hertweck (k8hertweck@gmail.com).
---
......@@ -4,7 +4,7 @@ title: "Licenses"
---
## Instructional Material
All Software Carpentry and Data Carpentry instructional material is
All Software Carpentry, Data Carpentry, and Library Carpentry instructional material is
made available under the [Creative Commons Attribution
license][cc-by-human]. The following is a human-readable summary of
(and not a substitute for) the [full legal text of the CC BY 4.0
......
# workshop-template
This repository is [Software Carpentry][swc-site] and [Data Carpentry][dc-site]'s
This repository is The Carpentries' ([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]'s)
template for creating websites for workshops.
1. Please *do not fork this repository directly on GitHub.*
......@@ -265,3 +265,4 @@ or [mail us][email].
[rubygems]: https://rubygems.org/pages/download/
[self-organized-workshop-form]: https://amy.software-carpentry.org/workshops/submit/
[swc-site]: http://software-carpentry.org
[lc-site]: https://librarycarpentry.org
......@@ -35,10 +35,10 @@ amy_site: "https://amy.software-carpentry.org/workshops"
carpentries_github: "https://github.com/carpentries"
carpentries_pages: "https://carpentries.github.io"
carpentries_site: "https://carpentries.org/"
dc_site: "http://datacarpentry.org"
dc_site: "https://datacarpentry.org"
example_repo: "https://github.com/carpentries/lesson-example"
example_site: "https://carpentries.github.io/lesson-example"
lc_site: "https://librarycarpentry.github.io/"
lc_site: "https://librarycarpentry.org/"
swc_github: "https://github.com/swcarpentry"
swc_pages: "https://swcarpentry.github.io"
swc_site: "https://software-carpentry.org"
......
{% comment %}
General description of Software and Data Carpentry.
General description of Software, Data, and Library Carpentry.
{% endcomment %}
{% include base_path.html %}
......@@ -10,11 +10,14 @@
</div>
<div class="col-md-8">
<p><a href="{{ site.carpentries_site }}">The Carpentries</a> comprises
Software Carpentry and Data Carpentry, communities of Instructors, Trainers,
Software Carpentry, Data Carpentry, and Library Carpentry communities of Instructors, Trainers,
Maintainers, helpers, and supporters who share a mission to teach
foundational coding and data science skills to researchers. In January,
foundational coding and data science skills to researchers and people
working in library- and information-related roles. In January,
2018, The Carpentries was formed by the merger of Software Carpentry and
Data Carpentry.</p>
Data Carpentry. Library Carpentry became an official Carpentries Lesson Program
in November 2018.</p>
<p>While individual lessons and workshops continue to be run under each
lesson project, The Carpentries provide overall staffing and governance, as
......@@ -59,9 +62,7 @@
<a href="{{ site.lc_site }}"><img src="{{ relative_root_path }}/assets/img/lc-icon-black.png" alt="Library Carpentry logo" /></a>
</div>
<div class="col-md-8">
<p><a href="{{ site.lc_site }}">Library Carpentry</a> is in discussions with
The Carpentries to be a Lesson Project, like Software Carpentry*
and Data Carpentry. Library Carpentry develops lessons and
<p><a href="{{ site.lc_site }}">Library Carpentry</a> develops lessons and
teaches workshops for and with people working in library- and
information-related roles. Its goal is to create an on-ramp to empower this
community to use software and data in their own work, as well as be
......
<p>
<a href="{{site.lc_site}}">Library Carpentry</a>
is made by librarians, for librarians to help you:
is made by people working in library- and information-related roles to help you:
</p>
<ul>
<li>automate repetitive, boring, error-prone tasks</li>
......
<p id="who">
<strong>Who:</strong>
The course is for librarians, archivists, and other information workers.
The course is for people working in library- and information-related roles.
<strong>
You don't need to have any previous knowledge of the tools that
will be presented at the workshop.
......
......@@ -18,7 +18,7 @@
[jekyll-windows]: http://jekyll-windows.juthilo.com/
[jekyll]: https://jekyllrb.com/
[jupyter]: https://jupyter.org/
[lc-lessons]: https://librarycarpentry.org/#portfolio
[lc-lessons]: https://librarycarpentry.org/lessons/
[lesson-example]: https://carpentries.github.io/lesson-example/
[mit-license]: https://opensource.org/licenses/mit-license.html
[morea]: https://morea-framework.github.io/
......
<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>
<a href="//calendar.google.com/calendar/render?action=TEMPLATE&text={% if page.carpentry == "swc" %}Software{% elsif page.carpentry == "lc" %}Library{% 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 == "lc" %}Library{% elsif page.carpentry == "dc" %}Data{% endif %} Carpentry Workshop at {{ page.venue }}">Add to your Google Calendar.</a>
......@@ -20,6 +20,7 @@
<meta name="instructor" content="{{page.instructor|join:'|'}}" />
<meta name="helper" content="{{page.helper|join:'|'}}" />
<meta name="contact" content="{{page.email}}" />
<meta name="carpentry" content="{{site.carpentry}}"
{% if page.redirect %}
<meta http-equiv="refresh" content="0; url={{page.redirect}}" />
{% endif %}
......
# Contributing
[Software Carpentry][swc-site] and [Data Carpentry][dc-site] are open source projects,
[The Carpentries][c-site] ([Software Carpentry][swc-site], [Data Carpentry][dc-site], and [Library Carpentry][lc-site]) are open source projects,
and we welcome contributions of all kinds:
new lessons,
fixes to existing material,
......@@ -14,7 +14,7 @@ you agree that we may redistribute your work under [our license](LICENSE.md).
In exchange,
we will address your issues and/or assess your change proposal as promptly as we can,
and help you become a member of our community.
Everyone involved in [Software Carpentry][swc-site] and [Data Carpentry][dc-site]
Everyone involved in [The Carpentries][c-site]
agrees to abide by our [code of conduct](CODE_OF_CONDUCT.md).
## How to Contribute
......@@ -73,8 +73,8 @@ and submitting [bug reports][issues]
about things that don't work, aren't clear, or are missing.
If you are looking for ideas, please see the 'Issues' tab for
a list of issues associated with this repository,
or you may also look at the issues for [Data Carpentry][dc-issues]
and [Software Carpentry][swc-issues] projects.
or you may also look at the issues for [Data Carpentry][dc-issues],
[Software Carpentry][swc-issues], and [Library Carpentry][lc-issues] projects.
Comments on issues and reviews of pull requests are just as welcome:
we are smarter together than we are on our own.
......@@ -146,3 +146,6 @@ You can also [reach us by email][email].
[swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
[swc-lessons]: https://software-carpentry.org/lessons/
[swc-site]: https://software-carpentry.org/
[c-site]: https://carpentries.org/
[lc-site]: https://librarycarpentry.org/
[lc-issues]: https://github.com/issues?q=user%3Alibrarycarpentry
......@@ -15,22 +15,22 @@
xmlHttp[i] = new XMLHttpRequest();
xmlHttp[i].episode = lesson_episodes[i]; /* To enable use this later. */
xmlHttp[i].onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
var article_here = document.getElementById(this.episode);
var parser = new DOMParser();
var htmlDoc = parser.parseFromString(this.responseText,"text/html");
var htmlDocArticle = htmlDoc.getElementsByTagName("article")[0];
article_here.innerHTML = htmlDocArticle.innerHTML;
if (this.readyState == 4 && this.status == 200) {
var article_here = document.getElementById(this.episode);
var parser = new DOMParser();
var htmlDoc = parser.parseFromString(this.responseText,"text/html");
var htmlDocArticle = htmlDoc.getElementsByTagName("article")[0];
article_here.innerHTML = htmlDocArticle.innerHTML;
}
}
episode_url = "{{ relative_root_path }}" + lesson_episodes[i];
var episode_url = "{{ relative_root_path }}" + lesson_episodes[i];
xmlHttp[i].open("GET", episode_url);
xmlHttp[i].send(null);
}
}
</script>
{% comment %}
Create anchor for each one of the episodes.
Create an anchor for every episode.
{% endcomment %}
{% for episode in site.episodes %}
<article id="{{ episode.url }}"></article>
......
......@@ -18,7 +18,7 @@ EVENTBRITE_PATTERN = r'\d{9,10}'
URL_PATTERN = r'https?://.+'
# Defaults.
CARPENTRIES = ("dc", "swc")
CARPENTRIES = ("dc", "swc", "lc", "cp")
DEFAULT_CONTACT_EMAIL = 'admin@software-carpentry.org'
USAGE = 'Usage: "workshop_check.py path/to/root/directory"'
......@@ -91,7 +91,7 @@ def check_layout(layout):
@look_for_fixme
def check_carpentry(layout):
'''"carpentry" in YAML header must be "dc" or "swc".'''
'''"carpentry" in YAML header must be "dc", "swc", "lc", or "cp".'''
return layout in CARPENTRIES
......@@ -117,7 +117,7 @@ def check_humandate(date):
and 4-digit year. Examples include 'Feb 18-20, 2025' and 'Feb 18
and 20, 2025'. It may be in languages other than English, but the
month name should be kept short to aid formatting of the main
Software Carpentry web site.
Carpentries web site.
"""
if ',' not in date:
......@@ -390,7 +390,7 @@ def check_config(reporter, filename):
kind)
carpentry = config.get('carpentry', None)
reporter.check(carpentry in ('swc', 'dc'),
reporter.check(carpentry in ('swc', 'dc', 'lc', 'cp'),
filename,
'Missing or unknown carpentry: {0}',
carpentry)
......
---
layout: workshop # DON'T CHANGE THIS.
carpentry: "FIXME" # what kind of Carpentry (must be either "lc" or "dc" or "swc")
carpentry: "FIXME" # what kind of Carpentry (must be either "lc" or "dc" or "swc").
# Be sure to update the Carpentry type in _config.yml as well.
venue: "FIXME" # brief name of host site without address (e.g., "Euphoric State University")
address: "FIXME" # full street address of workshop (e.g., "Room A, 123 Forth Street, Blimingen, Euphoria")
country: "FIXME" # lowercase two-letter ISO country code such as "fr" (see https://en.wikipedia.org/wiki/ISO_3166-1)
......@@ -491,7 +492,7 @@ and our administrator may contact you if we need any extra information.</h4>
</p>
<p>
Others editors that you can use are
<a href="https://www.barebones.com/products/textwrangler/">Text Wrangler</a> or
<a href="https://www.barebones.com/products/bbedit/">BBEdit</a> or
<a href="https://www.sublimetext.com/">Sublime Text</a>.
</p>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment