Commit 791dcc3e authored by Rémi Emonet's avatar Rémi Emonet
Browse files

Switch to relative: use page.root in most templates

parent 4f08a692

_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/javascript.html

+3 −3
Original line number Diff line number Diff line 
<script src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/js/jquery.min.js"></script>

<script src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/js/bootstrap.min.js"></script>

<script src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/js/lesson.js"></script>
 
<script src="{{ page.root }}/assets/js/jquery.min.js"></script>

<script src="{{ page.root }}/assets/js/bootstrap.min.js"></script>

<script src="{{ page.root }}/assets/js/lesson.js"></script>

_includes/main_title.html

+1 −1
Original line number Diff line number Diff line 
<h1 class="maintitle"><a href="{{ site.github.url }}/">{{ site.title }}</a>{% if page.title %}: {{ page.title }}{% endif %}</h1>
 
<h1 class="maintitle"><a href="{{ page.root }}/">{{ site.title }}</a>{% if page.title %}: {{ page.title }}{% endif %}</h1>

_includes/navbar.html

+13 −13
Original line number Diff line number Diff line
@@ -11,41 +11,41 @@ 
      {% comment %} Select what logo to display. {% endcomment %}

      {% if page.carpentry == "swc" %}

      <a href="{{ site.swc_site }}" class="pull-left">

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

        <img class="navbar-logo" src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />

      </a>

      {% elsif page.carpentry == "dc" %}

      <a href="{{ site.dc_site }}" class="pull-left">

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

        <img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />

      </a>

      {% elsif site.carpentry == "swc" %}

      <a href="{{ site.swc_site }}" class="pull-left">

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

        <img class="navbar-logo" src="{{ page.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />

      </a>

      {% elsif site.carpentry == "dc" %}

      <a href="{{ site.dc_site }}" class="pull-left">

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

        <img class="navbar-logo" src="{{ page.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />

      </a>

      {% endif %}



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

      <a class="navbar-brand" href="{{ site.github.url }}/">Home</a>

      <a class="navbar-brand" href="{{ page.root }}/">Home</a>



    </div>

    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

      <ul class="nav navbar-nav">



	{% comment %} Always show code of conduct. {% endcomment %}

        <li><a href="{{ site.github.url }}/conduct/">Code of Conduct</a></li>

        <li><a href="{{ page.root }}/conduct/">Code of Conduct</a></li>



	{% comment %} Show setup instructions, reference guide, and lesson episodes for lessons. {% endcomment %}

        {% if site.kind == "lesson" %}

        <li><a href="{{ site.github.url }}/setup/">Setup</a></li>

        <li><a href="{{ site.github.url }}/reference/">Reference</a></li>

        <li><a href="{{ page.root }}/setup/">Setup</a></li>

        <li><a href="{{ page.root }}/reference/">Reference</a></li>

        <li class="dropdown">

          <a href="{{ site.github.url }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>

          <a href="{{ page.root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>

          <ul class="dropdown-menu">

            {% for episode in site.episodes %}

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

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

            {% endfor %}

          </ul>

        </li>
@@ -54,17 +54,17 @@ 
	{% comment %} Show extras for lessons or if this is the main workshop-template repo (where they contain documentation). {% endcomment %}

	{% if site.kind == "lesson" or site.github.repository_name == "workshop-template" %}

        <li class="dropdown">

          <a href="{{ site.github.url }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>

          <a href="{{ page.root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>

          <ul class="dropdown-menu">

            {% for extra in site.extras %}

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

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

            {% endfor %}

          </ul>

        </li>

	{% endif %}



	{% comment %} Always show license. {% endcomment %}

        <li><a href="{{ site.github.url }}/license/">License</a></li>

        <li><a href="{{ page.root }}/license/">License</a></li>

      </ul>

      <form class="navbar-form navbar-right" role="search" id="search" onsubmit="google_search(); return false;">

        <div class="form-group">