Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

extend theme to support lessons in Carpentries Incubator #1

Merged
merged 15 commits into from
Sep 25, 2019
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ 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
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.

Expand All @@ -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.,
<https://software-carpentry.org >, <https://datacarpentry.org>, or
<https://librarycarpentry.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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add missing paren after made.)

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
Expand All @@ -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].

Expand Down
34 changes: 34 additions & 0 deletions _includes/carpentries-commons.html
Original file line number Diff line number Diff line change
@@ -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" %}


<div class="alert alert-info text-center" role="alert">
This lesson is part of
<a href="https://github.com/carpentries-incubator/proposals/#the-carpentries-incubator">
The Carpentries Incubator</a>, a place to share and use each other's
Carpentries-style lessons. <strong>This lesson has not been reviewed by and is
not endorsed by The Carpentries</strong>.
</div>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ErinBecker please confirm that this wording is OK

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @fmichonneau - this is good.


{% elsif site.carpentry == "lab" %}

{% comment %}
Should we add a notice for Carpentries Lab?
{% endcomment %}

{% else %}

<div class="alert alert-danger text-center" role="alert">
Invalid value for variable <code>carpentry</code> defined in
<code>_config.yml</code>. Current value: <code>{{ site.carpentry }}</code>
allowed values: ("swc", "dc", "lc", "cp", "incubator", "lab")
</div>


{% endif %}
2 changes: 2 additions & 0 deletions _includes/favicons.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

<!-- Favicons for everyone -->
Expand Down
12 changes: 5 additions & 7 deletions _includes/lesson_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
{% elsif site.carpentry == "cp" %}
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>
{% elsif site.carpentry == "incubator" %}
Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> {{ 'now' | date: "%Y" }} by <a href="{{ relative_root_path }}{% link CITATION %}">the authors</a>.
{% endif %}
</div>
<div class="col-md-6 help-links" align="right">
Expand All @@ -46,11 +48,7 @@
<a href="mailto:{{ site.email }}">Contact</a>
</div>
</div>
<div class="row">
<div class="col-md-12" align="center">
<p class="text-muted">
<small> Using <a href="https://github.com/carpentries/carpentries-theme/">The Carpentries theme</a> &mdash; Site last built on: {{ site.time }}.</small>
</p>
</div>
</div>
<p class="text-muted text-right">
<small><i>Using <a href="https://github.com/carpentries/carpentries-theme/">The Carpentries theme</a> &mdash; Site last built on: {{ site.time }}.</i></small>
</p>
</footer>
4 changes: 4 additions & 0 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<a href="{{ site.carpentries_site }}" class="pull-left">
<img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/cp-logo-blue.svg %}" alt="The Carpentries logo" />
</a>
{% elsif site.carpentry == "incubator" %}
<a href="{{ relative_root_path }}{% link index.md %}" class="pull-left">
<img class="navbar-logo" src="{{ relative_root_path }}{% link /assets/img/incubator-logo-blue.svg %}" alt="The Carpentries Incubator logo" />
</a>
{% endif %}

{% comment %} Always show link to home page. {% endcomment %}
Expand Down
6 changes: 4 additions & 2 deletions _layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@

</head>
<body>

{% include life_cycle.html %}

<div class="container">
{% include navbar.html %}
{{ content }}
{% include carpentries-commons.html %}

{{ content }}

{% if site.kind == "workshop" %}
{% include workshop_footer.html %}
{% else %}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/favicon-128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/favicon-196x196.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/favicon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/favicon.ico
Binary file not shown.
Binary file added assets/favicons/incubator/mstile-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/mstile-310x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/mstile-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/favicons/incubator/mstile-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 91 additions & 0 deletions assets/img/incubator-logo-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.