Skip to content
Snippets Groups Projects
Commit 8748a80b authored by Greg Wilson's avatar Greg Wilson
Browse files

Switching to GitHub-defined variables

parent cf51440b
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 84 deletions
Makefile
+ 2
− 3
View file @ 8748a80b
......@@ -17,17 +17,16 @@ commands :
## serve : run a local server.
serve : lesson-rmd
${JEKYLL} serve --config _config.yml,_config_dev.yml
${JEKYLL} serve
## site : build files but do not run a server.
site : lesson-rmd
${JEKYLL} build --config _config.yml,_config_dev.yml
${JEKYLL} build
# repo-check : check repository settings.
repo-check :
@bin/repo_check.py -s .
## clean : clean up junk files.
clean :
@rm -rf ${DST}
......
_config_dev.yml deleted 100644 → 0
+ 0
− 9
View file @ cf51440b
#------------------------------------------------------------
# This config file is only needed for development. Instead of changing
# the URL everytime you work locally on the project, run a server with
# both configuration files:
#
# jekyll serve --config _config.yml,_config_dev.yml
#------------------------------------------------------------
root: http://localhost:4000
_includes/all_keypoints.html
+ 1
− 1
View file @ 8748a80b
......@@ -7,7 +7,7 @@
{% unless episode.break %}
<tr>
<td class="col-md-3">
<a href="{{ site.root }}{{ episode.url }}">{{ episode.title }}</a>
<a href="{{ site.github.url }}{{ episode.url }}">{{ episode.title }}</a>
</td>
<td class="col-md-9">
<ul>
......
_includes/carpentries.html
+ 2
− 2
View file @ 8748a80b
<div class="row">
<div class="col-md-2" align="center">
<a href="{{ site.swc_site }}"><img src="{{ site.root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" /></a>
<a href="{{ site.swc_site }}"><img src="{{ site.github.url }}/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.root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" /></a>
<a href="{{ site.dc_site }}"><img src="{{ site.github.url }}/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_title.html
+ 5
− 5
View file @ 8748a80b
......@@ -3,22 +3,22 @@
<div class="col-md-1">
<h3>
{% if prev_episode %}
<a href="{{ site.root }}{{ prev_episode.url }}"><span class="glyphicon glyphicon-menu-left"></span></a>
<a href="{{ site.github.url }}{{ prev_episode.url }}"><span class="glyphicon glyphicon-menu-left"></span></a>
{% else %}
<a href="{{ site.root }}"><span class="glyphicon glyphicon-menu-up"></span></a>
<a href="{{ site.github.url }}"><span class="glyphicon glyphicon-menu-up"></span></a>
{% endif %}
</h3>
</div>
<div class="col-md-10">
<h3 class="maintitle"><a href="{{ site.root }}/">{{ site.title }}</a></h3>
<h3 class="maintitle"><a href="{{ site.github.url }}/">{{ site.title }}</a></h3>
<h1 class="maintitle">{{ page.title }}</h1>
</div>
<div class="col-md-1">
<h3>
{% if next_episode %}
<a href="{{ site.root }}{{ next_episode.url }}"><span class="glyphicon glyphicon-menu-right"></span></a>
<a href="{{ site.github.url }}{{ next_episode.url }}"><span class="glyphicon glyphicon-menu-right"></span></a>
{% else %}
<a href="{{ site.root }}"><span class="glyphicon glyphicon-menu-up"></span></a>
<a href="{{ site.github.url }}"><span class="glyphicon glyphicon-menu-up"></span></a>
{% endif %}
</h3>
</div>
......
_includes/javascript.html
+ 3
− 12
View file @ 8748a80b
{% comment %}
If previewing locally, site.root is set in _config_dev.yml.
If site.root is not set, assume we're viewing on the web.
{% endcomment %}
{% if site.root %}
{% assign root = site.root %}
{% else %}
{% assign root = site.github.url %}
{% endif %}
<script src="{{ root }}/assets/js/jquery.min.js"></script>
<script src="{{ root }}/assets/js/bootstrap.min.js"></script>
<script src="{{ root }}/assets/js/lesson.js"></script>
<script src="{{ site.github.url }}/assets/js/jquery.min.js"></script>
<script src="{{ site.github.url }}/assets/js/bootstrap.min.js"></script>
<script src="{{ site.github.url }}/assets/js/lesson.js"></script>
_includes/lesson_footer.html
+ 2
− 2
View file @ 8748a80b
......@@ -10,9 +10,9 @@
</div>
<div class="col-md-6" align="right">
<h4>
<a href="{{ site.repo }}/">Source</a>
<a href="{{ site.github.repository_url }}/">Source</a>
/
<a href="{{ site.repo }}/blob/gh-pages/CONTRIBUTING.md">Contributing</a>
<a href="{{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md">Contributing</a>
/
<a href="mailto:{{ site.email }}">Contact</a>
</h4>
......
_includes/main_title.html
+ 1
− 1
View file @ 8748a80b
<h1 class="maintitle"><a href="{{ site.root }}/">{{ site.title }}</a>{% if page.title %}: {{ page.title }}{% endif %}</h1>
<h1 class="maintitle"><a href="{{ site.github.url }}/">{{ site.title }}</a>{% if page.title %}: {{ page.title }}{% endif %}</h1>
_includes/navbar.html
+ 14
− 23
View file @ 8748a80b
{% comment %}
If previewing locally, site.root is set in _config_dev.yml.
If site.root is not set, assume we're viewing on the web.
{% endcomment %}
{% if site.root %}
{% assign root = site.root %}
{% else %}
{% assign root = site.github.url %}
{% endif %}
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
......@@ -20,60 +11,60 @@
{% comment %} Select what logo to display. {% endcomment %}
{% if page.carpentry == "swc" %}
<a href="{{ site.swc_site }}" class="pull-left">
<img class="navbar-logo" src="{{ root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />
<img class="navbar-logo" src="{{ site.github.url }}/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="{{ root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
<img class="navbar-logo" src="{{ site.github.url }}/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="{{ root }}/assets/img/swc-icon-blue.svg" alt="Software Carpentry logo" />
<img class="navbar-logo" src="{{ site.github.url }}/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="{{ root }}/assets/img/dc-icon-black.svg" alt="Data Carpentry logo" />
<img class="navbar-logo" src="{{ site.github.url }}/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="{{ root }}/">Home</a>
<a class="navbar-brand" href="{{ site.github.url }}/">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="{{ root }}/conduct/">Code of Conduct</a></li>
<li><a href="{{ site.github.url }}/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="{{ root }}/setup/">Setup</a></li>
<li><a href="{{ root }}/reference/">Reference</a></li>
<li><a href="{{ site.github.url }}/setup/">Setup</a></li>
<li><a href="{{ site.github.url }}/reference/">Reference</a></li>
<li class="dropdown">
<a href="{{ root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>
<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>
<ul class="dropdown-menu">
{% for episode in site.episodes %}
<li><a href="{{ root }}{{ episode.url }}">{{ episode.title }}</a></li>
<li><a href="{{ site.github.url }}{{ episode.url }}">{{ episode.title }}</a></li>
{% endfor %}
</ul>
</li>
{% endif %}
{% 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.repository_name == "workshop-template" %}
{% if site.kind == "lesson" or site.github.repository_name == "workshop-template" %}
<li class="dropdown">
<a href="{{ root }}/" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>
<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>
<ul class="dropdown-menu">
{% for extra in site.extras %}
<li><a href="{{ root }}{{ extra.url }}">{{ extra.title }}</a></li>
<li><a href="{{ site.github.url }}{{ extra.url }}">{{ extra.title }}</a></li>
{% endfor %}
</ul>
</li>
{% endif %}
{% comment %} Always show license. {% endcomment %}
<li><a href="{{ root }}/license/">License</a></li>
<li><a href="{{ site.github.url }}/license/">License</a></li>
</ul>
<form class="navbar-form navbar-right" role="search" id="search" onsubmit="google_search(); return false;">
<div class="form-group">
......
_includes/syllabus.html
+ 1
− 1
View file @ 8748a80b
......@@ -34,7 +34,7 @@
{% if multiday %}<td class="col-md-1">{% if episode.start %}Day {{ day }}{% endif %}</td>{% endif %}
<td class="col-md-1">{% if hours < 10 %}0{% endif %}{{ hours }}:{% if minutes < 10 %}0{% endif %}{{ minutes }}</td>
<td class="col-md-3">
<a href="{{ site.root }}{{ episode.url }}">{{ episode.title }}</a>
<a href="{{ site.github.url }}{{ episode.url }}">{{ episode.title }}</a>
</td>
<td class="col-md-7">
{% if episode.break %}
......
_layouts/base.html
+ 4
− 13
View file @ 8748a80b
---
---
{% comment %}
If previewing locally, site.root is set in _config_dev.yml.
If site.root is not set, assume we're viewing on the web.
{% endcomment %}
{% if site.root %}
{% assign root = site.root %}
{% else %}
{% assign root = site.github.url %}
{% endif %}
<!doctype html>
<html lang="en">
<head>
......@@ -16,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="last-modified" content="{{ site.time }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="search-domain" value="{{ root }}">
<link rel="stylesheet" type="text/css" href="{{ root }}/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ root }}/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="{{ root }}/assets/css/lesson.css" />
<meta name="search-domain" value="{{ site.github.url }}">
<link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/lesson.css" />
{% if site.carpentry == "swc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
{% endif %}
......
_layouts/workshop.html
+ 3
− 12
View file @ 8748a80b
---
---
{% comment %}
If previewing locally, site.root is set in _config_dev.yml.
If site.root is not set, assume we're viewing on the web.
{% endcomment %}
{% if site.root %}
{% assign root = site.root %}
{% else %}
{% assign root = site.github.url %}
{% endif %}
<!doctype html>
<html lang="en">
<head>
......@@ -34,9 +25,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="last-modified" content="{{ site.time }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="{{ root }}/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ root }}/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="{{ root }}/assets/css/lesson.css" />
<link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/lesson.css" />
{% if site.carpentry == "swc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
{% endif %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment