Skip to content
This repository has been archived by the owner on Feb 16, 2019. It is now read-only.

Commit

Permalink
merge styles v9.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
fmichonneau committed Jun 20, 2018
2 parents 2de8bce + 2b8a946 commit 981203b
Show file tree
Hide file tree
Showing 134 changed files with 1,653 additions and 1,429 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ GC_Pipe.txt
.sass-cache
__pycache__
_site

.Rproj.user
.Rhistory
.RData
11 changes: 11 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
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 %}
45 changes: 0 additions & 45 deletions CONDUCT.md

This file was deleted.

10 changes: 5 additions & 5 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: page
title: "Licenses"
permalink: /license/
root: .
---
## Instructional Material

Expand Down Expand Up @@ -74,10 +74,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
## Trademark

"Software Carpentry" and "Data Carpentry" and their respective logos
are registered trademarks of [NumFOCUS][numfocus].
are registered trademarks of [Community Initiatives][CI].

[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
[mit-license]: http://opensource.org/licenses/mit-license.html
[numfocus]: http://numfocus.org/
[osi]: http://opensource.org
[mit-license]: https://opensource.org/licenses/mit-license.html
[ci]: http://communityin.org/
[osi]: https://opensource.org
27 changes: 14 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Settings
MAKEFILES=Makefile $(wildcard *.mk)
JEKYLL=jekyll
JEKYLL_VERSION=3.7.3
PARSER=bin/markdown_ast.rb
DST=_site

Expand All @@ -15,6 +16,10 @@ all : commands
commands :
@grep -h -E '^##' ${MAKEFILES} | sed -e 's/## //g'

## docker-serve : use docker to build the site
docker-serve :
docker run --rm -it -v ${PWD}:/srv/jekyll -p 127.0.0.1:4000:4000 jekyll/jekyll:${JEKYLL_VERSION} make serve

## serve : run a local server.
serve : lesson-rmd
${JEKYLL} serve
Expand Down Expand Up @@ -62,42 +67,38 @@ RMD_DST = $(patsubst _episodes_rmd/%.Rmd,_episodes/%.md,$(RMD_SRC))
# Lesson source files in the order they appear in the navigation menu.
MARKDOWN_SRC = \
index.md \
CONDUCT.md \
CODE_OF_CONDUCT.md \
setup.md \
$(wildcard _episodes/*.md) \
$(sort $(wildcard _episodes/*.md)) \
reference.md \
$(wildcard _extras/*.md) \
$(sort $(wildcard _extras/*.md)) \
LICENSE.md

# Generated lesson files in the order they appear in the navigation menu.
HTML_DST = \
${DST}/index.html \
${DST}/conduct/index.html \
${DST}/setup/index.html \
$(patsubst _episodes/%.md,${DST}/%/index.html,$(wildcard _episodes/*.md)) \
$(patsubst _episodes/%.md,${DST}/%/index.html,$(sort $(wildcard _episodes/*.md))) \
${DST}/reference/index.html \
$(patsubst _extras/%.md,${DST}/%/index.html,$(wildcard _extras/*.md)) \
$(patsubst _extras/%.md,${DST}/%/index.html,$(sort $(wildcard _extras/*.md))) \
${DST}/license/index.html

## lesson-rmd : convert Rmarkdown files to markdown
lesson-rmd: $(RMD_SRC)
@bin/knit_lessons.sh $(RMD_SRC)

## lesson-check : validate lesson Markdown.
lesson-check :
@bin/lesson_check.py -s . -p ${PARSER}
lesson-check : lesson-fixme
@bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md

## lesson-check-all : validate lesson Markdown, checking line lengths and trailing whitespace.
lesson-check-all :
@bin/lesson_check.py -s . -p ${PARSER} -l -w

## lesson-figures : re-generate inclusion displaying all figures.
lesson-figures :
@bin/extract_figures.py -p ${PARSER} ${MARKDOWN_SRC} > _includes/all_figures.html
@bin/lesson_check.py -s . -p ${PARSER} -r _includes/links.md -l -w --permissive

## unittest : run unit tests on checking tools.
unittest :
python bin/test_lesson_check.py
@bin/test_lesson_check.py

## lesson-files : show expected names of generated files for debugging.
lesson-files :
Expand Down
4 changes: 2 additions & 2 deletions _includes/carpentries.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
<br/>
<div class="row">
<div class="col-md-2" align="center">
<a href="{{ site.lc_site }}"><img src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" /></a>
<a href="{{ site.lc_site }}"><img src="{{ page.root }}/assets/img/lc-icon-black.png" alt="Library Carpentry logo" /></a>
</div>
<div class="col-md-8">
Library Carpentry is made by librarians to help librarians
<a href="{{ site.lc_site }}">Library Carpentry</a> is made by librarians to help librarians
automate repetitive, boring, error-prone tasks;
create, maintain and analyse sustainable and reusable data;
work effectively with IT and systems colleagues;
Expand Down
10 changes: 5 additions & 5 deletions _includes/episode_navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
Navigation bar for an episode.
{% endcomment %}
<div class="row">
<div class="col-md-1">
<h3>
<div class="col-xs-1">
<h3 class="text-left">
{% if page.previous.url %}
<a href="{{ page.root }}{{ page.previous.url }}"><span class="glyphicon glyphicon-menu-left" aria-hidden="true"></span><span class="sr-only">previous episode</span></a>
{% else %}
<a href="{{ page.root }}/"><span class="glyphicon glyphicon-menu-up" aria-hidden="true"></span><span class="sr-only">lesson home</span></a>
{% endif %}
</h3>
</div>
<div class="col-md-10">
<div class="col-xs-10">
{% if include.episode_navbar_title %}
<h3 class="maintitle"><a href="{{ page.root }}/">{{ site.title }}</a></h3>
{% endif %}
</div>
<div class="col-md-1">
<h3>
<div class="col-xs-1">
<h3 class="text-right">
{% if page.next.url %}
<a href="{{ page.root }}{{ page.next.url }}"><span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span><span class="sr-only">next episode</span></a>
{% else %}
Expand Down
33 changes: 33 additions & 0 deletions _includes/favicons.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{% assign favicon_url = site.baseurl | append: '/assets/favicons/' | append: site.carpentry | prepend: site.url %}

{% if site.carpentry == 'swc' %}
{% assign carpentry = 'Software Carpentry' %}
{% elsif site.carpentry == 'dc' %}
{% assign carpentry = 'Data Carpentry' %}
{% elsif site.carpentry == 'lc' %}
{% assign carpentry = 'Library Carpentry' %}
{% elsif site.carpentry == 'cp' %}
{% assign carpentry = 'The Carpentries' %}
{% endif %}

<!-- Favicons for everyone -->
<link rel="apple-touch-icon-precomposed" sizes="57x57" href="{{ favicon_url }}/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ favicon_url }}/apple-touch-icon-114x114.png" />
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ favicon_url }}/apple-touch-icon-72x72.png" />
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ favicon_url }}/apple-touch-icon-144x144.png" />
<link rel="apple-touch-icon-precomposed" sizes="60x60" href="{{ favicon_url }}/apple-touch-icon-60x60.png" />
<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ favicon_url }}/apple-touch-icon-120x120.png" />
<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ favicon_url }}/apple-touch-icon-76x76.png" />
<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ favicon_url }}/apple-touch-icon-152x152.png" />
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-196x196.png" sizes="196x196" />
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-96x96.png" sizes="96x96" />
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-16x16.png" sizes="16x16" />
<link rel="icon" type="image/png" href="{{ favicon_url }}/favicon-128.png" sizes="128x128" />
<meta name="application-name" content="{{ carpentry }} - {{ site.title }}"/>
<meta name="msapplication-TileColor" content="#FFFFFF" />
<meta name="msapplication-TileImage" content="{{ favicon_url }}/mstile-144x144.png" />
<meta name="msapplication-square70x70logo" content="{{ favicon_url }}/mstile-70x70.png" />
<meta name="msapplication-square150x150logo" content="{{ favicon_url }}/mstile-150x150.png" />
<meta name="msapplication-wide310x150logo" content="{{ favicon_url }}/mstile-310x150.png" />
<meta name="msapplication-square310x310logo" content="{{ favicon_url }}/mstile-310x310.png" />
2 changes: 1 addition & 1 deletion _includes/lc/intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
Library Carpentry introduces you to the fundamentals of computing
and provides you with a platform for further self-directed learning.
For more information on what we teach and why, please see our paper
"<a href="http://doi.org/10.18352/lq.10176">Library Carpentry: software skills training for library professionals</a>".
"<a href="https://doi.org/10.18352/lq.10176">Library Carpentry: software skills training for library professionals</a>".
</em>
</p>
10 changes: 5 additions & 5 deletions _includes/lc/syllabys.html → _includes/lc/syllabus.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h3 id="syllabus-python">Data Intro</h3>
<li>Plain text formats</li>
<li>Naming files</li>
<li>Regular expressions</li>
<li><a href="http://datacarpentry.github.io/library-data-intro/reference/">Reference...</a></li>
<li><a href="https://data-lessons.github.io/library-data-intro/reference/">Reference...</a></li>
</ul>
</div>
<div class="col-md-6">
Expand All @@ -19,7 +19,7 @@ <h3 id="syllabus-shell">The Unix Shell</h3>
<li>Counting and sorting contents in files</li>
<li>Pipes and redirection</li>
<li>Mining or searching in files</li>
<li><a href="http://data-lessons.github.io/library-shell/reference/">Reference...</a></li>
<li><a href="https://data-lessons.github.io/library-shell/reference/">Reference...</a></li>
</ul>
</div>

Expand All @@ -35,7 +35,7 @@ <h3 id="syllabus-git">Version Control with Git</h3>
<li>Viewing state changes with <code>status</code></li>
<li>Working on the web: <code>clone</code>, <code>pull</code>, <code>push</code>, ...</li>
<li>Where to host work, and why</li>
<li><a href="http://data-lessons.github.io/library-git/reference">Reference...</a></li>
<li><a href="https://data-lessons.github.io/library-git/reference">Reference...</a></li>
</ul>
</div>
<div class="col-md-6">
Expand All @@ -46,7 +46,7 @@ <h3 id="syllabus-r">Open Refine</h3>
<li>Importing data</li>
<li>Basic functions</li>
<li>Advanced Functions</li>
<li><a href="http://data-lessons.github.io/library-openrefine/reference">Reference...</a></li>
<li><a href="https://data-lessons.github.io/library-openrefine/reference">Reference...</a></li>
</ul>
</div>
</div>
Expand All @@ -62,7 +62,7 @@ <h3 id="syllabus-sql">SQL Intro</h3>
<li>Filtering with <code>where</code></li>
<li>Combining values using aggregation</li>
<li>Combining information from multiple tables using <code>join</code></li>
<li><a href="http://data-lessons.github.io//library-sql/reference/">Reference...</a></li>
<li><a href="https://data-lessons.github.io//library-sql/reference/">Reference...</a></li>
</ul>
</div>
</div>
Expand Down
29 changes: 21 additions & 8 deletions _includes/lesson_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,28 @@
{% endcomment %}
<footer>
<div class="row">
<div class="col-md-6" align="left">
<h4>
Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
<div class="col-md-6 copyright" align="left">
{% if site.carpentry == "swc" %}
Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
<a href="{{ site.carpentries_site }}">The Carpentries</a>
<br>
Copyright &copy; 2016–2018
<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
{% elsif site.carpentry == "dc" %}
Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
<a href="{{ site.carpentries_site }}">The Carpentries</a>
<br>
Copyright &copy; 2016–2018
<a href="{{ site.dc_site }}">Data Carpentry</a>
{% elsif site.carpentry == "lc" %}
Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
<a href="{{ site.lc_site }}">Library Carpentry</a>
{% elsif site.carpentry == "cp" %}
Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
<a href="{{ site.carpentries_site }}">The Carpentries</a>
{% endif %}
</h4>
</div>
<div class="col-md-6" align="right">
<h4>
<div class="col-md-6 help-links" align="right">
{% if page.source %}
{% if page.source == "Rmd" %}
<a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>
Expand All @@ -31,8 +39,13 @@ <h4>
/
<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>
/
<a href="{{ site.contact }}">Contact</a>
</h4>
<a href="mailto:{{ site.email }}">Contact</a>
</div>
</div>
<div class="row">
<div class="col-md-12" align="center">
Using <a href="https://github.com/carpentries/styles/">The Carpentries style</a>
version <a href="https://github.com/carpentries/styles/releases/tag/v9.5.2">9.5.2</a>.
</div>
</div>
</footer>
37 changes: 21 additions & 16 deletions _includes/links.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,40 @@
[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
[concept-maps]: http://swcarpentry.github.io/instructor-training/08-memory/
[contact]: mailto:[email protected]
[contrib-covenant]: http://contributor-covenant.org/
[ci]: http://communityin.org/
[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#reporting-guidelines
[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html
[concept-maps]: https://carpentries.github.io/instructor-training/05-memory/
[contrib-covenant]: https://contributor-covenant.org/
[contributing]: {{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md
[cran-checkpoint]: https://cran.r-project.org/web/packages/checkpoint/index.html
[cran-knitr]: https://cran.r-project.org/web/packages/knitr/index.html
[cran-stringr]: https://cran.r-project.org/web/packages/stringr/index.html
[cran-checkpoint]: https://cran.r-project.org/package=checkpoint
[cran-knitr]: https://cran.r-project.org/package=knitr
[cran-stringr]: https://cran.r-project.org/package=stringr
[dc-lessons]: http://www.datacarpentry.org/lessons/
[email]: mailto:[email protected]
[github-importer]: https://import.github.com/
[importer]: http://import.github.com/new
[importer]: https://github.com/new/import
[jekyll-collection]: https://jekyllrb.com/docs/collections/
[jekyll-install]: https://jekyllrb.com/docs/installation/
[jekyll-windows]: http://jekyll-windows.juthilo.com/
[jekyll]: https://jekyllrb.com/
[jupyter]: https://jupyter.org/
[mit-license]: http://opensource.org/licenses/mit-license.html
[lc-lessons]: https://librarycarpentry.org/#portfolio
[lesson-example]: https://carpentries.github.io/lesson-example/
[mit-license]: https://opensource.org/licenses/mit-license.html
[morea]: https://morea-framework.github.io/
[numfocus]: http://numfocus.org/
[osi]: http://opensource.org
[numfocus]: https://numfocus.org/
[osi]: https://opensource.org
[pandoc]: https://pandoc.org/
[paper-now]: https://github.com/PeerJ/paper-now
[python-gapminder]: https://swcarpentry.github.io/python-novice-gapminder/
[pyyaml]: https://pypi.python.org/pypi/PyYAML
[r-markdown]: http://rmarkdown.rstudio.com/
[r-markdown]: https://rmarkdown.rstudio.com/
[rstudio]: https://www.rstudio.com/
[ruby-install-guide]: https://www.ruby-lang.org/en/downloads/
[ruby-installer]: http://rubyinstaller.org/
[ruby-installer]: https://rubyinstaller.org/
[rubygems]: https://rubygems.org/pages/download/
[styles]: https://github.com/swcarpentry/styles/
[training]: http://swcarpentry.github.io/instructor-training/
[styles]: https://github.com/carpentries/styles/
[swc-lessons]: https://software-carpentry.org/lessons/
[swc-releases]: https://github.com/swcarpentry/swc-releases
[workshop-repo]: {{ site.workshop_repo }}
[yaml]: http://yaml.org/
[coc]: https://software-carpentry.org/conduct/
[coc-reporting]: https://software-carpentry.org/CoC-reporting/
Loading

0 comments on commit 981203b

Please sign in to comment.