Skip to content
This repository was archived by the owner on Aug 14, 2024. It is now read-only.

Commit 4030b74

Browse files
author
Greg Wilson
authored
Merge pull request #108 from gvwilson/library-carpentry
Starting to incorporate Library Carpentry materials
2 parents 60900b8 + cfac061 commit 4030b74

File tree

9 files changed

+109
-13
lines changed

9 files changed

+109
-13
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7373

7474
## Trademark
7575

76-
"Software Carpentry" an "Data Carpentry" and their respective logos
76+
"Software Carpentry" and "Data Carpentry" and their respective logos
7777
are registered trademarks of [NumFOCUS][numfocus].
7878

7979
[cc-by-human]: https://creativecommons.org/licenses/by/4.0/

_includes/lesson_footer.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
<div class="col-md-6" align="left">
44
<h4>
55
Copyright &copy; 2016
6-
{% if site.carpentry == "swc" %}<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>{% endif %}
7-
{% if site.carpentry == "dc" %}<a href="{{ site.dc_site }}">Data Carpentry</a>{% endif %}
6+
{% if site.carpentry == "swc" %}
7+
<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
8+
{% elsif site.carpentry == "dc" %}
9+
<a href="{{ site.dc_site }}">Data Carpentry</a>
10+
{% elsif site.carpentry == "lc" %}
11+
<a href="{{ site.lc_site }}">Library Carpentry</a>
12+
{% endif %}
813
</h4>
914
</div>
1015
<div class="col-md-6" align="right">
@@ -13,7 +18,9 @@ <h4>
1318
/
1419
<a href="{{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md">Contributing</a>
1520
/
16-
<a href="mailto:{{ site.email }}">Contact</a>
21+
<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>
22+
/
23+
<a href="{{ site.contact }}">Contact</a>
1724
</h4>
1825
</div>
1926
</div>

_includes/navbar.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<a href="{{ site.dc_site }}" class="pull-left">
1818
<img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
1919
</a>
20+
{% elsif page.carpentry == "lc" %}
21+
<a href="{{ site.lc_site }}" class="pull-left">
22+
<img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />
23+
</a>
2024
{% elsif site.carpentry == "swc" %}
2125
<a href="{{ site.swc_site }}" class="pull-left">
2226
<img class="navbar-logo" src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />
@@ -25,6 +29,10 @@
2529
<a href="{{ site.dc_site }}" class="pull-left">
2630
<img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
2731
</a>
32+
{% elsif site.carpentry == "lc" %}
33+
<a href="{{ site.lc_site }}" class="pull-left">
34+
<img class="navbar-logo" src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" />
35+
</a>
2836
{% endif %}
2937

3038
{% comment %} Always show link to home page. {% endcomment %}

_layouts/base.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
1515
{% if site.carpentry == "swc" %}
1616
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
17-
{% endif %}
18-
{% if site.carpentry == "dc" %}
17+
{% elsif site.carpentry == "dc" %}
1918
<link rel="shortcut icon" type="image/x-icon" href="/favicon-dc.ico" />
19+
{% elsif site.carpentry == "lc" %}
20+
<link rel="shortcut icon" type="image/x-icon" href="/favicon-lc.ico" />
2021
{% endif %}
2122
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
2223
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

_layouts/workshop.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
<link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
3131
{% if site.carpentry == "swc" %}
3232
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
33-
{% endif %}
34-
{% if site.carpentry == "dc" %}
33+
{% elsif site.carpentry == "dc" %}
3534
<link rel="shortcut icon" type="image/x-icon" href="/favicon-dc.ico" />
35+
{% elsif site.carpentry == "lc" %}
36+
<link rel="shortcut icon" type="image/x-icon" href="/favicon-lc.ico" />
3637
{% endif %}
3738
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
3839
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

assets/img/lc-icon-black.svg

Lines changed: 76 additions & 0 deletions
Loading

bin/lesson_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,9 @@ def check_config(reporter, source_dir):
151151
config_file = os.path.join(source_dir, '_config.yml')
152152
config = load_yaml(config_file)
153153
reporter.check_field(config_file, 'configuration', config, 'kind', 'lesson')
154-
reporter.check_field(config_file, 'configuration', config, 'carpentry', ('swc', 'dc'))
154+
reporter.check_field(config_file, 'configuration', config, 'carpentry', ('swc', 'dc', 'lc'))
155155
reporter.check_field(config_file, 'configuration', config, 'title')
156-
reporter.check_field(config_file, 'configuration', config, 'email')
156+
reporter.check_field(config_file, 'configuration', config, 'contact')
157157

158158
reporter.check({'values': {'root': '..'}} in config.get('defaults', []),
159159
'configuration',

bin/lesson_initialize.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,16 @@
175175
# Values for this lesson.
176176
#------------------------------------------------------------
177177
178-
# Which carpentry is this ("swc" or "dc")?
178+
# Which carpentry is this ("swc", "dc", or "lc")?
179179
carpentry: "swc"
180180
181181
# Overall title for pages.
182182
title: "Lesson Title"
183183
184-
# Contact email address.
185-
184+
# Contact. This *must* include the protocol: if it's an email
185+
# address, it must look like "mailto:[email protected]",
186+
# or if it's a URL, "https://gitter.im/username/ProjectName".
187+
contact: "mailto:[email protected]"
186188
187189
#------------------------------------------------------------
188190
# Generic settings (should not need to change).
@@ -201,6 +203,7 @@
201203
swc_github: "https://github.com/swcarpentry"
202204
swc_site: "https://software-carpentry.org"
203205
swc_pages: "https://swcarpentry.github.io"
206+
lc_site: "http://librarycarpentry.github.io/"
204207
template_repo: "https://github.com/swcarpentry/styles"
205208
example_repo: "https://github.com/swcarpentry/lesson-example"
206209
example_site: "https://swcarpentry.github.com/lesson-example"

favicon-lc.ico

1.24 KB
Binary file not shown.

0 commit comments

Comments
 (0)