diff --git a/LICENSE.md b/LICENSE.md index e6a3398..3b70def 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,7 +5,7 @@ root: . --- ## Instructional Material -All Software Carpentry, Data Carpentry, and Library Carpentry instructional material is +This 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 @@ -13,8 +13,8 @@ license][cc-by-legal]. You are free: -* to **Share**---copy and redistribute the material in any medium or format -* to **Adapt**---remix, transform, and build upon the material +* to **Share** --- copy and redistribute the material in any medium or format +* to **Adapt** --- remix, transform, and build upon the material for any purpose, even commercially. @@ -23,19 +23,18 @@ license terms. Under the following terms: -* **Attribution**---You must give appropriate credit (mentioning that - your work is derived from work that is Copyright © Software - Carpentry and, where practical, linking to - http://software-carpentry.org/), provide a [link to the - license][cc-by-human], and indicate if changes were made. You may do - so in any reasonable manner, but not in any way that suggests the - licensor endorses you or your use. +* **Attribution** --- You must give appropriate credit (mentioning that your + work is derived from this lesson, provide a link to it + (<{{ site.url }}>), and + for official lessons to the relevant lesson program (i.e., + , , or + ), provide a [link to the license][cc-by-human], + and indicate if changes were made). You may do so in any reasonable manner, but + not in any way that suggests the licensor endorses you or your use. -**No additional restrictions**---You may not apply legal terms or -technological measures that legally restrict others from doing -anything the license permits. With the understanding that: - -Notices: +**No additional restrictions** --- You may not apply legal terms or + technological measures that legally restrict others from doing anything the + license permits. With the understanding that: * You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an @@ -44,11 +43,11 @@ Notices: permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material. - + ## Software Except where otherwise noted, the example programs and other software -provided by Software Carpentry and Data Carpentry are made available under the +provided in this lesson are made available under the [OSI][osi]-approved [MIT license][mit-license]. diff --git a/_includes/carpentries-commons.html b/_includes/carpentries-commons.html new file mode 100644 index 0000000..e0ec80d --- /dev/null +++ b/_includes/carpentries-commons.html @@ -0,0 +1,34 @@ +{% if site.carpentry == "swc" or site.carpentry == "dc" or + site.carpentry == "lc" or site.carpentry == "cp" %} + +{% comment %} +We have no notice for official lessons +{% endcomment %} + +{% elsif site.carpentry == "incubator" %} + + + + +{% elsif site.carpentry == "lab" %} + +{% comment %} +Should we add a notice for Carpentries Lab? +{% endcomment %} + +{% else %} + + + + +{% endif %} diff --git a/_includes/favicons.html b/_includes/favicons.html index 8a50b4d..75abe04 100644 --- a/_includes/favicons.html +++ b/_includes/favicons.html @@ -8,6 +8,8 @@ {% assign carpentry = 'Library Carpentry' %} {% elsif site.carpentry == 'cp' %} {% assign carpentry = 'The Carpentries' %} +{% elsif site.carpentry == 'incubator' %} +{% assign carpentry = 'The Carpentries Incubator' %} {% endif %} diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html index c010d0d..99ddb4c 100644 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@ -26,6 +26,8 @@ {% elsif site.carpentry == "cp" %} Licensed under CC-BY 4.0 2018–{{ 'now' | date: "%Y" }} by The Carpentries + {% elsif site.carpentry == "incubator" %} + Licensed under CC-BY 4.0 {{ 'now' | date: "%Y" }} by the authors. {% endif %}
@@ -46,11 +48,7 @@ Contact
-
-
-

- Using The Carpentries theme — Site last built on: {{ site.time }}. -

-
-
+

+ Using The Carpentries theme — Site last built on: {{ site.time }}. +

diff --git a/_includes/navbar.html b/_includes/navbar.html index cc9b884..86d86b4 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -31,6 +31,10 @@ + {% elsif site.carpentry == "incubator" %} + + + {% endif %} {% comment %} Always show link to home page. {% endcomment %} diff --git a/_layouts/base.html b/_layouts/base.html index b099bd5..4c88bde 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -32,12 +32,14 @@ - {% include life_cycle.html %}
{% include navbar.html %} -{{ content }} + {% include carpentries-commons.html %} + + {{ content }} + {% if site.kind == "workshop" %} {% include workshop_footer.html %} {% else %} diff --git a/assets/favicons/incubator/apple-touch-icon-114x114.png b/assets/favicons/incubator/apple-touch-icon-114x114.png new file mode 100644 index 0000000..afd6ac8 Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-114x114.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-120x120.png b/assets/favicons/incubator/apple-touch-icon-120x120.png new file mode 100644 index 0000000..4b79d9d Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-120x120.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-144x144.png b/assets/favicons/incubator/apple-touch-icon-144x144.png new file mode 100644 index 0000000..3255f05 Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-144x144.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-152x152.png b/assets/favicons/incubator/apple-touch-icon-152x152.png new file mode 100644 index 0000000..1286386 Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-152x152.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-57x57.png b/assets/favicons/incubator/apple-touch-icon-57x57.png new file mode 100644 index 0000000..153e4ee Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-57x57.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-60x60.png b/assets/favicons/incubator/apple-touch-icon-60x60.png new file mode 100644 index 0000000..e4319e8 Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-60x60.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-72x72.png b/assets/favicons/incubator/apple-touch-icon-72x72.png new file mode 100644 index 0000000..ebef580 Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-72x72.png differ diff --git a/assets/favicons/incubator/apple-touch-icon-76x76.png b/assets/favicons/incubator/apple-touch-icon-76x76.png new file mode 100644 index 0000000..9c6706f Binary files /dev/null and b/assets/favicons/incubator/apple-touch-icon-76x76.png differ diff --git a/assets/favicons/incubator/favicon-128.png b/assets/favicons/incubator/favicon-128.png new file mode 100644 index 0000000..b6d1d0c Binary files /dev/null and b/assets/favicons/incubator/favicon-128.png differ diff --git a/assets/favicons/incubator/favicon-16x16.png b/assets/favicons/incubator/favicon-16x16.png new file mode 100644 index 0000000..9c9a8a1 Binary files /dev/null and b/assets/favicons/incubator/favicon-16x16.png differ diff --git a/assets/favicons/incubator/favicon-196x196.png b/assets/favicons/incubator/favicon-196x196.png new file mode 100644 index 0000000..8c9dd6f Binary files /dev/null and b/assets/favicons/incubator/favicon-196x196.png differ diff --git a/assets/favicons/incubator/favicon-32x32.png b/assets/favicons/incubator/favicon-32x32.png new file mode 100644 index 0000000..aa9ba8c Binary files /dev/null and b/assets/favicons/incubator/favicon-32x32.png differ diff --git a/assets/favicons/incubator/favicon-96x96.png b/assets/favicons/incubator/favicon-96x96.png new file mode 100644 index 0000000..b4d41be Binary files /dev/null and b/assets/favicons/incubator/favicon-96x96.png differ diff --git a/assets/favicons/incubator/favicon.ico b/assets/favicons/incubator/favicon.ico new file mode 100644 index 0000000..6d30f8a Binary files /dev/null and b/assets/favicons/incubator/favicon.ico differ diff --git a/assets/favicons/incubator/mstile-144x144.png b/assets/favicons/incubator/mstile-144x144.png new file mode 100644 index 0000000..3255f05 Binary files /dev/null and b/assets/favicons/incubator/mstile-144x144.png differ diff --git a/assets/favicons/incubator/mstile-150x150.png b/assets/favicons/incubator/mstile-150x150.png new file mode 100644 index 0000000..bb960ea Binary files /dev/null and b/assets/favicons/incubator/mstile-150x150.png differ diff --git a/assets/favicons/incubator/mstile-310x150.png b/assets/favicons/incubator/mstile-310x150.png new file mode 100644 index 0000000..a7b5f4e Binary files /dev/null and b/assets/favicons/incubator/mstile-310x150.png differ diff --git a/assets/favicons/incubator/mstile-310x310.png b/assets/favicons/incubator/mstile-310x310.png new file mode 100644 index 0000000..30100a3 Binary files /dev/null and b/assets/favicons/incubator/mstile-310x310.png differ diff --git a/assets/favicons/incubator/mstile-70x70.png b/assets/favicons/incubator/mstile-70x70.png new file mode 100644 index 0000000..b6d1d0c Binary files /dev/null and b/assets/favicons/incubator/mstile-70x70.png differ diff --git a/assets/img/incubator-logo-blue.svg b/assets/img/incubator-logo-blue.svg new file mode 100644 index 0000000..ef31873 --- /dev/null +++ b/assets/img/incubator-logo-blue.svg @@ -0,0 +1,91 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + +