Cleaning up a few more uses of site.url

_config_dev.yml

@@ -6,7 +6,6 @@
 # Start development with › $ jekyll serve --config _config.yml,_config_dev.yml
 
 url: 'http://localhost:4000'
-filesurl: '/files'
 
 sass:
   # http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style

_includes/breadcrumb

@@ -5,13 +5,13 @@
 {% endcomment %}
 
 <nav class="breadcrumbs" role="menubar" aria-label="breadcrumbs">
- <a href="{{ site.url }}">{{ site.data.language.breadcrumb_start }}</a>
+ <a href="{{ site.baseurl }}">{{ site.data.language.breadcrumb_start }}</a>
  {% assign crumbs = page.url | split: '/' %}
    {% for crumb in crumbs offset: 1 %}
     {% if forloop.last %}
         <a class="current">{{ page.title }}</a>
     {% else %}
-        <a href="{{ site.url }}{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' }}{% endfor %}">{{ crumb | replace:'-',' ' }}</a>
+        <a href="{{ site.baseurl }}{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' }}{% endfor %}">{{ crumb | replace:'-',' ' }}</a>
     {% endif %}
   {% endfor %}
 </nav>

_includes/frontpage-widget

@@ -1,5 +1,5 @@
 <div class="medium-4 columns frontpage-widget">
-	{% capture widget_url %}{% if include.widget.url contains 'http' %}{{ include.widget.url }}{% else %}{{ site.url }}{{ site.baseurl }}{{ include.widget.url }}{% endif %}{% endcapture %}
+	{% capture widget_url %}{% if include.widget.url contains 'http' %}{{ include.widget.url }}{% else %}{{ site.baseurl }}{{ include.widget.url }}{% endif %}{% endcapture %}
 	<a href="{{ widget_url }}">
 		{% if include.widget.image %}
 			{%comment%}TODO lazy loading{%endcomment%}
@@ -12,5 +12,5 @@
 	</a>
 	<h2 class="font-size-h3 t10">{{ include.widget.title }}</h2>
 	<p>{{ include.widget.text }}</p>
-	<p><a class="button tiny radius" href="{% if include.widget.url contains 'http' %}{{ include.widget.url }}{% else %}{{ site.url }}{{ site.baseurl }}{{ include.widget.url }}{% endif %}">{{ site.data.language.more }}</a></p>
+	<p><a class="button tiny radius" href="{% if include.widget.url contains 'http' %}{{ include.widget.url }}{% else %}{{ site.baseurl }}{{ include.widget.url }}{% endif %}">{{ site.data.language.more }}</a></p>
 </div>

_includes/meta_information

@@ -18,15 +18,15 @@
   <div id="post-nav" class="row">
     <div class="small-5 columns">
       {% if page.previous.url %}
-      <a class="button small radius prev" href="{{ site.url }}{{page.previous.url}}">&laquo; {{page.previous.title}}</a>
+      <a class="button small radius prev" href="{{ site.baseurl }}{{page.previous.url}}">&laquo; {{page.previous.title}}</a>
     </div>
     {% endif %}
     <div class="small-2 columns text-center">
-      <a class="radius button small" href="{{ site.url }}/blog/archive/" title="Blog {{ site.data.language.archive }}">{{ site.data.language.archive }}</a>
+      <a class="radius button small" href="{{ site.baseurl }}/blog/archive/" title="Blog {{ site.data.language.archive }}">{{ site.data.language.archive }}</a>
     </div>
     <div class="small-5 columns text-right">
       {% if page.next.url %}
-      <a class="button small radius next" href="{{ site.url }}{{page.next.url}}">{{page.next.title}} &raquo;</a>
+      <a class="button small radius next" href="{{ site.baseurl }}{{page.next.url}}">{{page.next.title}} &raquo;</a>
       {% endif %}
     </div>
   </div>

_includes/navigation

@@ -3,7 +3,7 @@
   <nav class="top-bar" role="navigation" data-topbar>
     <ul class="title-area">
       <li class="name">
-      <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}"> {{ site.title }}</a></h1>
+      <h1 class="show-for-small-only"><a href="{{ site.baseurl }}"> {{ site.title }}</a></h1>
     </li>
        <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
       <li class="toggle-topbar menu-icon"><a href="#"><span>Navigation</span></a></li>

_includes/pagination

@@ -11,13 +11,13 @@
   <div class="row">
     <div class="small-12 columns b60">
       <p class="subheadline"><span class="subheader">{% if post.categories %}{{ post.categories | join: ' &middot; ' }}{% endif %}</span> – {% if post.subheadline %}{{ post.subheadline }}{% endif %}</p>
-      <h2><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></h2>
+      <h2><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h2>
       <p>
-        {% if post.image.thumb %}<a href="{{ site.url }}{{ post.url }}" title="{{ post.title escape_once }}"><img src="{{ site.filesurl }}{{ post.image.thumb }}" class="alignleft" width="150" height="150" alt="{{ page.title escape_once }}"></a>{% endif %}
+        {% if post.image.thumb %}<a href="{{ site.baseurl }}{{ post.url }}" title="{{ post.title escape_once }}"><img src="{{ site.filesurl }}{{ post.image.thumb }}" class="alignleft" width="150" height="150" alt="{{ page.title escape_once }}"></a>{% endif %}
 
         {% if post.meta_description %}{{ post.meta_description | strip_html | escape }}{% elsif post.teaser %}{{ post.teaser | strip_html | escape }}{% endif %}
 
-        <a href="{{ site.url }}{{ post.url }}" title="{{ site.data.language.read }} {{ post.title escape_once }}"><strong>{{ site.data.language.read_more }}</strong></a>
+        <a href="{{ site.baseurl }}{{ post.url }}" title="{{ site.data.language.read }} {{ post.title escape_once }}"><strong>{{ site.data.language.read_more }}</strong></a>
       </p>
     </div><!-- /.small-12.columns -->
   </div><!-- /.row -->
@@ -27,16 +27,16 @@
 <nav id="pagination">
     {% if paginator.previous_page %}
       {% if paginator.previous_page == 1 %}
-      <a class="radius button small" href="{{ site.url }}/blog/" title="{{ site.data.language.previous_posts }}">&laquo; {{ site.data.language.previous_posts }}</a>
+      <a class="radius button small" href="{{ site.baseurl }}/blog/" title="{{ site.data.language.previous_posts }}">&laquo; {{ site.data.language.previous_posts }}</a>
       {% else %}
-      <a class="radius button small" href="{{ site.url }}/blog/page{{ paginator.previous_page }}/" title="{{ site.data.language.previous_posts }}">&laquo; {{ site.data.language.previous }}</a>
+      <a class="radius button small" href="{{ site.baseurl }}/blog/page{{ paginator.previous_page }}/" title="{{ site.data.language.previous_posts }}">&laquo; {{ site.data.language.previous }}</a>
       {% endif %}
     {% endif %}
 
-    <a class="radius button small" href="{{ site.url }}/blog/archive/" title="{{ site.data.language.blog_archive }}">{{ site.data.language.blog_archive }}</a>
+    <a class="radius button small" href="{{ site.baseurl }}/blog/archive/" title="{{ site.data.language.blog_archive }}">{{ site.data.language.blog_archive }}</a>
 
     {% if paginator.next_page %}
-    <a class="radius button small" href="{{ site.url }}/blog/page{{ paginator.next_page }}/" title="{{ site.data.language.next_posts }}">{{ site.data.language.next }} &raquo;</a>
+    <a class="radius button small" href="{{ site.baseurl }}/blog/page{{ paginator.next_page }}/" title="{{ site.data.language.next_posts }}">{{ site.data.language.next }} &raquo;</a>
     {% endif %}
   </nav>
 

_posts/2012/06/2012-06-27-a-supercomputing-drivers-license.html

@@ -7,6 +7,3 @@
 category: ["Community", "Education"]
 ---
 <p>Software Carpentry and the Software Sustainability Institute are working together to develop a "driver's licence" for researchers who wish to use the DiRAC integrated supercomputing facility. The aim is to assess whether a researcher has the programming skills needed to use DiRAC productively, and if not, give them feedback on what further training they need. The hour-long test, which will include writing, coding, and interactive elements, will focus on fundamental skills including version control, unit testing, writing maintainable code, using Makefiles, and code review. Trials will begin this summer, and the completed test will be presented to DiRAC in September 2012.</p>
-<p>DiRAC: <a href="http://www.stfc.ac.uk/Our+Research/24711.aspx">http://www.stfc.ac.uk/Our+Research/24711.aspx</a><br />
-Software Carpentry: <a href="{{site.site_url}}">{{site.site_url}}</a><br />
-The Software Sustainability Institute: <a href="http://www.software.ac.uk">http://www.software.ac.uk</a></p>

_posts/2012/10/2012-10-10-dark-matter-public-health-and-scientific-computing.html

@@ -66,4 +66,4 @@
 <p>The first thing you can do is host a workshop. A growing number of our alumni have become instructors in their own right&mdash;there are even a few here in the audience today. They're all volunteers, so the only cost is a couple of plane tickets, a couple of hotel rooms, and a few pots of coffee. If you're willing to book a room and do some advertising, we can send people to you to get things started. This will particularly help those of you in support roles: the people who've been through workshops probably won't ask fewer questions, but they'll certainly ask better ones.</p>
 <p>The second thing you can do is teach a workshop yourself. All of our materials are open license, and we will help teach you how to use them, and how to teach more effectively in general.</p>
 <p>Finally, you can help shine some light on the "dark matter" of scientific computing. There's a lot of discussion now about requiring scientists to share their software. What I'd like even more is for scientists to share their computational practices. I'd like every paper I review to include a few lines telling me where the version control repository holding the code is, what percentage of the code is exercised by unit tests, whether the analyses we're being shown were automated or done by hand, and so on. I'm not suggesting that we should require people to meet any particular targets&mdash;not yet, anyway&mdash;but the first step in any public health campaign has to be finding out how many people are sick with what.</p>
-<p>To conclude, it isn't really a choice between increasing the productivity of the top 5% of scientists ten-fold or doubling the productivity of the other 95%. It's really a choice between seeing your best ideas left on the shelf because they're out of most scientists' reach, or raising up a generation of scientists who can <em>all</em> do the things we think are exciting? A few months shy of my fiftieth birthday, with a wonderful little girl at home who's going to inherit all the problems we didn't get around to solving, and my sister eight months dead from cancer, I know which matters more to me. If you'd like to help, please visit our web site at <a href="{{site.site_url}}">{{site.site_url}}</a> or mail us at <a href="mailto:{{site.contact}}">{{site.contact}}</a>. We look forward to hearing from you.</p>
+<p>To conclude, it isn't really a choice between increasing the productivity of the top 5% of scientists ten-fold or doubling the productivity of the other 95%. It's really a choice between seeing your best ideas left on the shelf because they're out of most scientists' reach, or raising up a generation of scientists who can <em>all</em> do the things we think are exciting? A few months shy of my fiftieth birthday, with a wonderful little girl at home who's going to inherit all the problems we didn't get around to solving, and my sister eight months dead from cancer, I know which matters more to me. If you'd like to help, please visit our web site or mail us at <a href="mailto:{{site.contact}}">{{site.contact}}</a>. We look forward to hearing from you.</p>

_posts/2015/01/2015-01-22-call-for-elixir-node-coordinators.html

@@ -23,7 +23,7 @@
 <ul>
   <li>
     (ideally) be a person who already is familiar with
-    the <a href="{{site.site_url}}">Software</a>
+    the <a href="{{site.baseurl}}">Software</a>
     and <a href="http://datacarpentry.org/">Data Carpentry</a>
     initiatives;
   </li>

_posts/2015/03/2015-03-17-and-now-we-are-three.html

@@ -39,7 +39,7 @@
   from the Hacker Within,
   <a href="{{site.github_io_url}}/2014-04-14-wise/advanced/python/testing/index.html">these notes</a>
   from one of last year's WiSE workshops,
-  or <a href="{{site.site_url}}/v4/test/index.html">our Version 4 notes</a>
+  or <a href="{{site.baseurl}}/v4/test/index.html">our Version 4 notes</a>
   from five years ago.
   I think we should try once again to combine this with material on code review
   to create a half-day lesson on QA for the working scientist.

_posts/2015/06/2015-06-21-research-based-course-design.html

@@ -67,7 +67,7 @@
   i.e.,
   introduced arrays early (like <a href="{{page.github_io_url}}/python-novice-inflammation">our current Python lesson</a>)
   or deferred them until learners had seen lists, loops, and functions
-  (our <a href="{{site.site_url}}/v4/python/index.html">older material</a>).
+  (our <a href="{{site.baseurl}}/v4/python/index.html">older material</a>).
   I don't have any strong evidence that one is better than another,
   either pedagogically or motivationally,
   but (a) at least I've realized that I should be asking,

_posts/2015/08/2015-08-28-instructor-debriefing-2015-08-18.html

@@ -22,7 +22,7 @@ <h3>Congratulations</h3>
 <p>I like to congratulate instructors that taught the first time for us since doing it isn't as much easy as we would like to be and we need to work on that. If you have suggestions of what we can do to help instructors when they are preparing for the first workshop contact us.</p>
 <p>And we have our first workshop at Indonesia which means less one country for we <a href="https://en.wikipedia.org/wiki/Risk_%28game%29">win the game</a>.</p>
 <h3>Dataset collection for workshops</h3>
-<p>One thing that always got learners more engaged is using dataset from their fields of study at the lessons. Last year I had the pleasure to taught with <a href="{{site.site_url}}/pages/team.html#viana.a">Alex Viana</a> at a <a href="https://acviana.github.io/2014-08-28-ufrgs">workshop</a> that the host provided us with <a href="https://github.com/acviana/2014-08-28-ufrgs/blob/gh-pages/data/estmet/data.txt">some climate data</a> to use and this contribute a lot for the success of the workshop. Unfortunately do it is always a challenge mostly because in the general</p>
+<p>One thing that always got learners more engaged is using dataset from their fields of study at the lessons. Last year I had the pleasure to taught with <a href="{{site.baseurl}}/pages/team.html#viana.a">Alex Viana</a> at a <a href="https://acviana.github.io/2014-08-28-ufrgs">workshop</a> that the host provided us with <a href="https://github.com/acviana/2014-08-28-ufrgs/blob/gh-pages/data/estmet/data.txt">some climate data</a> to use and this contribute a lot for the success of the workshop. Unfortunately do it is always a challenge mostly because in the general</p>
 <ul>
   <li>instructors aren't from the same background of learners,</li>
   <li>workshops have learners from two or three different backgrounds, and</li>

_posts/2015/10/2015-10-28-instructor-debriefing-2015-09-29.html

@@ -66,7 +66,7 @@ <h2>Live log</h2>
 <p>
 The <a href="https://douglatornell.github.io/2015-09-22-ubc/">last workshop at the University of British Columbia</a>
 had a live log of shell commands during the shell and mercurial lessons on a web page.
-<a href="{{site.site_url}}/pages/team/#latornell.d">Doug Latornell</a> allow us to share how they did it:
+<a href="{{site.baseurl}}/pages/team/#latornell.d">Doug Latornell</a> allow us to share how they did it:
 </p>
 <blockquote>
   <p>

_posts/2015/12/2015-12-03-first-workshop-in-venezuala.html

@@ -8,7 +8,7 @@
 ---
 <p>
 Last November Francisco Palm taught the first ever Software Carpentry workshop in Venezuela,
-the second country from Latin America to enter in <a href="{site.site_url}/workshops/previous.html">our list of previous workshops</a>.
+the second country from Latin America to enter in <a href="{site.baseurl}/workshops/previous.html">our list of previous workshops</a>.
 We are very excited with our expansion across Latin America
 and we hope to add more countries to that list next year.
 </p>

blog/archive.html

@@ -17,7 +17,7 @@ <h1>{{ page.title }}</h1>
 	  {{ post.author }} / {{ post.date | date: '%Y-%m-%d' }}
 	  <br/>
           {% if post.meta_description %}{{ post.meta_description | strip_html | escape }}{% elsif post.teaser %}{{ post.teaser | strip_html | escape }}{% elsif post.excerpt %}{{ post.excerpt | strip_html | escape }}{% endif %}
-          <a href="{{ site.url }}{{ post.url }}" title="Read {{ post.title escape_once }}"><strong>{{ site.data.language.read_more }}</strong></a><br><br>
+          <a href="{{ site.baseurl }}{{ post.url }}" title="Read {{ post.title escape_once }}"><strong>{{ site.data.language.read_more }}</strong></a><br><br>
         </div>
       </dd>
       {% endfor %}