Commit d0b3cf47 authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch 'gh-pages' into adding-jquery-debugging

parents cf5d4174 37a3a11b

_includes/all_keypoints.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  {% unless episode.break %}

    <tr>

      <td class="col-md-3">

        <a href="{{ site.github.url }}{{ episode.url }}">{{ episode.title }}</a>

        <a href="{{ page.root }}{{ episode.url }}">{{ episode.title }}</a>

      </td>

      <td class="col-md-9">

        <ul>

_includes/carpentries.html

+2 −2
Original line number Diff line number Diff line 
<div class="row">

  <div class="col-md-2" align="center">

    <a href="{{ site.swc_site }}"><img src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>

    <a href="{{ site.swc_site }}"><img src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>

  </div>

  <div class="col-md-8">

    Since 1998,
@@ -14,7 +14,7 @@ 
<br/>

<div class="row">

  <div class="col-md-2" align="center">

    <a href="{{ site.dc_site }}"><img src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>

    <a href="{{ site.dc_site }}"><img src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>

  </div>

  <div class="col-md-8">

    <a href="{{ site.dc_site }}">Data Carpentry</a> develops and teaches workshops on the fundamental data skills needed to conduct research.

_includes/episode_break.html

+13 −2
Original line number Diff line number Diff line 
{% comment %}

  Display information about a break.

    Display a break's timings in a box similar to a learning episode's.

{% endcomment %}

<p>Break: {{page.break}} min</p>
 
<blockquote class="objectives">

  <h2>Overview</h2>



  <div class="row">

    <div class="col-md-3">

      <strong>Break:</strong> {{ page.break }} min

    </div>

    <div class="col-md-9">

    </div>

  </div>



</blockquote>

_includes/episode_navbar.html

0 → 100644
+44 −0
Original line number Diff line number Diff line 
{% comment %}

  Find previous and next episodes (if any).

{% endcomment %}

{% for episode in site.episodes  %}

  {% if episode.url == page.url %}

    {% unless forloop.first %}

      {% assign prev_episode = prev %}

    {% endunless %}

    {% unless forloop.last %}

      {% assign next_episode = site.episodes[forloop.index] %}

    {% endunless %}

  {% endif %}

  {% assign prev = episode %}

{% endfor %}



{% comment %}

  Display title and prev/next links.

{% endcomment %}

<div class="row">

  <div class="col-md-1">

    <h3>

      {% if prev_episode %}

      <a href="{{ page.root }}{{ prev_episode.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">

    {% if include.episode_navbar_title %}

    <h3 class="maintitle"><a href="{{ page.root }}/">{{ site.title }}</a></h3>

    <h1 class="maintitle">{{ page.title }}</h1>

    {% endif %}

  </div>

  <div class="col-md-1">

    <h3>

      {% if next_episode %}

      <a href="{{ page.root }}{{ next_episode.url }}"><span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span><span class="sr-only">next 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>

_includes/episode_overview.html

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  <div class="row">

    <div class="col-md-3">

      <strong>Teaching:</strong> {{ page.teaching }} min

      </br>

      <br/>

      <strong>Exercises:</strong> {{ page.exercises }} min

    </div>

    <div class="col-md-9">