Unverified Commit 54fbb572 authored by Raniere Silva's avatar Raniere Silva Committed by GitHub
Browse files

Merge branch 'gh-pages' into add-version-to-footer

parents 30f8cd16 a700bde7

_includes/lesson_footer.html

+9 −1
Original line number Diff line number Diff line
@@ -4,12 +4,20 @@ 
<footer>

  <div class="row">

    <div class="col-md-6 copyright" align="left">

	Copyright &copy; 2016–{{ 'now' | date: "%Y" }}

	{% 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>

	{% endif %}

    </div>

_layouts/base.html

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    <meta http-equiv="last-modified" content="{{ site.time }}">

    <meta name="viewport" content="width=device-width, initial-scale=1">

    <!-- meta "search-domain" used for google site search function google_search() -->

    <meta name="search-domain" value="{{ site.github.html_url }}">

    <meta name="search-domain" value="{{ site.github.url }}">

    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />

    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />

    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />

bin/lesson_initialize.py

+8 −5
Original line number Diff line number Diff line
@@ -194,17 +194,20 @@ repository: <USERNAME>/<PROJECT> 


# Sites.

amy_site: "https://amy.software-carpentry.org/workshops"

carpentries_github: "https://github.com/carpentries"

carpentries_pages: "https://carpentries.github.io"

carpentries_site: "https://carpentries.org/"

dc_site: "http://datacarpentry.org"

example_repo: "https://github.com/swcarpentry/lesson-example"

example_site: "https://swcarpentry.github.com/lesson-example"

lc_site: "https://librarycarpentry.github.io/"

swc_github: "https://github.com/swcarpentry"

swc_site: "https://software-carpentry.org"

swc_pages: "https://swcarpentry.github.io"

lc_site: "https://librarycarpentry.github.io/"

swc_site: "https://software-carpentry.org"

template_repo: "https://github.com/swcarpentry/styles"

example_repo: "https://github.com/swcarpentry/lesson-example"

example_site: "https://swcarpentry.github.com/lesson-example"

training_site: "https://swcarpentry.github.io/instructor-training"

workshop_repo: "https://github.com/swcarpentry/workshop-template"

workshop_site: "https://swcarpentry.github.io/workshop-template"

training_site: "https://swcarpentry.github.io/instructor-training"



# Surveys.

pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="