Merge remote-tracking branch 'swc-styles/gh-pages' into 9.5 (1cbe7072) · Commits · NDIP / Nova Packages / Nova Carpentry Tutorial

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@
		.sass-cache
		__pycache__
		_site
		.Rproj.user

LICENSE.md

+2 −2

Original line number	Diff line number	Diff line
		@@ -76,6 +76,6 @@ 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
		[mit-license]: https://opensource.org/licenses/mit-license.html
		[ci]: http://communityin.org/
		[osi]: http://opensource.org
		[osi]: https://opensource.org

Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -88,16 +88,16 @@ ${RMD_DST} : ${RMD_SRC}
		@bin/knit_lessons.sh ${RMD_SRC}

		## lesson-check : validate lesson Markdown.
		lesson-check :
		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} -r _includes/links.md -l -w
		@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 :

_includes/favicons.html

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		{% 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" />

_includes/lesson_footer.html

+20 −7

Original line number	Diff line number	Diff line
		@@ -3,20 +3,28 @@
		{% endcomment %}
		<footer>
		<div class="row">
		<div class="col-md-6" align="left">
		<h4>
		Copyright © 2016–{{ 'now' \| date: "%Y" }}
		<div class="col-md-6 copyright" align="left">
		{% if site.carpentry == "swc" %}
		Copyright © 2018–{{ 'now' \| date: "%Y" }}
		<a href="{{ site.carpentries_site }}">The Carpentries</a>
		<br>
		Copyright © 2016–2018
		<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
		{% elsif site.carpentry == "dc" %}
		Copyright © 2018–{{ 'now' \| date: "%Y" }}
		<a href="{{ site.carpentries_site }}">The Carpentries</a>
		<br>
		Copyright © 2016–2018
		<a href="{{ site.dc_site }}">Data Carpentry</a>
		{% elsif site.carpentry == "lc" %}
		Copyright © 2016–{{ 'now' \| date: "%Y" }}
		<a href="{{ site.lc_site }}">Library Carpentry</a>
		{% elsif site.carpentry == "cp" %}
		Copyright © 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>
		@@ -32,7 +40,12 @@
		<a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>
		/
		<a href="mailto:{{ site.email }}">Contact</a>
		</h4>
		</div>
		</div>
		<div class="row">
		<div class="col-md-12" align="center">
		Using <a href="https://github.com/swcarpentry/styles/">The Carpentries style</a>
		version <a href="https://github.com/swcarpentry/styles/releases/tag/v9.4.0">9.4.0</a>.
		</div>
		</div>
		</footer>