Merge branch 'master' of github.com:scala/scala.github.com into tweak-859

Author: heathermiller

_includes/books.html

@@ -5,7 +5,7 @@
       <div class="book-item-header">
         <a href="{{book.link}}">
           <div class="content-img-boook">
-            <img src="{{book.image}}" alt="{{book.title}}">
+            <img src="{{site.baseurl}}{{book.image}}" alt="{{book.title}}">
           </div>
           <h3>{{book.title}}</h3>
         </a>

_includes/footer.html

@@ -5,7 +5,7 @@
           <ul class="{{item.class}}">
             <li><h3>{{item.title}}</h3></li>
             {% for link in item.links %}
-              <li><a href="{{link.url}}">{{link.title}}</a></li>
+              <li><a href="{% if link.url contains '://' %}{{link.url}}{% else %}{{site.baseurl}}{{link.url}}{% endif %}">{{link.title}}</a></li>
             {% endfor %}
           </ul>
         {% endfor %}

_includes/masthead-documentation.html

@@ -6,7 +6,7 @@
           <div class="section">
             <h2 class="frontpage">{{ section.title }}</h2>
             {% for link in section.links %}
-  					<a href="{{link.link}}" class="doc-item">
+  					<a href="{% if link.link contains '://' %}{{link.link}}{% else %}{{site.baseurl}}{{link.link}}{% endif %}" class="doc-item">
   						<div class="doc-item-header">
   							<i class="{{link.icon}}"></i>
   							<h5>{{link.title}}</h5>
@@ -22,7 +22,7 @@ <h5>{{link.title}}</h5>
               <span class="heading">More Resources: </span>
               <ul>
               {% for resource in section.more-resources %}
-                <li><a href="{{ resource.url }}">{{ resource.title }}</a></li>
+                <li><a href="{{ site.baseurl }}{{ resource.url }}">{{ resource.title }}</a></li>
               {% endfor %}
               </ul>
             {% endif %}

_includes/navbar-inner.html

@@ -10,7 +10,7 @@
       <ul class="navigation-menu">
         {% for navItem in site.data.nav-header %}
             <li class="navigation-menu-item">
-              <a href="{{navItem.url}}/" {% if page.url contains navItem.url %}class="active"{% endif %}>{{navItem.title}}</a>
+              <a href="{% if navItem.url contains '://' %}{{navItem.url}}{% else %}{{site.baseurl}}{{navItem.url}}{% endif %}" {% if page.url contains navItem.url %}class="active"{% endif %}>{{navItem.title}}</a>
             </li>
         {% endfor %}
       </ul>
@@ -29,12 +29,12 @@
       <ul class="navigation-menu">
         {% for navItem in site.data.doc-nav-header %}
             <li class="navigation-menu-item">
-              <a href="{{navItem.url}}" id="{{ navItem.title | downcase | strip }}" {% if page.url contains navItem.url %}class="active"{% endif %}>{{navItem.title}}</a>
+              <a href="{% if navItem.url contains '://' or navItem.url == '#'  %}{{navItem.url}}{% else %}{{site.baseurl}}{{navItem.url}}{% endif %}" id="{{ navItem.title | downcase | strip }}" {% if page.url contains navItem.url %}class="active"{% endif %}>{{navItem.title}}</a>
                 {% if navItem.submenu %}
                 <ul class="navigation-dropdown">
                 {% for subItem in navItem.submenu %}
                   <li>
-                    <a href="{{ subItem.url }}">{{ subItem.title }}</a>
+                    <a href="{% if subItem.url contains '://' %}{{ subItem.url }}{% else %}{{ site.baseurl }}{{ subItem.url }}{% endif %}">{{ subItem.title }}</a>
                   </li>
                 {% endfor %}
                 </ul>
@@ -49,7 +49,7 @@
           <ul class="navigation-submenu" id="{{ navItem.title | downcase | strip }}" style="display: none;">
             {% for subItem in navItem.submenu %}
               <li>
-                <a href="{{ subItem.url }}">{{ subItem.title }}</a>
+                <a href="{% if subItem.url contains '://' %}{{subItem.url}}{% else %}{{site.baseurl}}{{subItem.url}}{% endif %}">{{ subItem.title }}</a>
               </li>
             {% endfor %}
           </ul>
@@ -58,7 +58,7 @@
       <ul class="navigation-submenu ellipsis-menu" style="display: none;">
         {% for navItem in site.data.doc-nav-header %}
           {% if forloop.index > 3 %}
-            <li><a href="{{ navItem.url }}">{{ navItem.title }}</a></li>
+            <li><a href="{% if navItem.url contains '://' %}{{navItem.url}}{% else %}{{site.baseurl}}{{navItem.url}}{% endif %}">{{ navItem.title }}</a></li>
           {% endif %}
         {% endfor %}
       </ul>

_includes/sidebar-toc-multipage-overview.html

@@ -25,7 +25,7 @@ <h5 class="contents">Contents</h5>
 
       {% if page.languages %}
         <ul id="available-languages" style="display: none;">
-          <li><a href="{{ page.url }}">English</a></li>
+          <li><a href="{{ site.baseurl }}{{ page.url }}">English</a></li>
           {% for l in page.languages %}
             {% capture intermediate %}{{ page.url | remove_first: l }}{% endcapture %}
             {% capture rootTutorialURL %}{{ intermediate | remove_first: '/' }}{% endcapture %}

_includes/sidebar-toc-singlepage-overview.html

@@ -5,7 +5,7 @@ <h5 class="contents">Contents</h5>
       <div id="toc"></div>
       {% if page.languages %}
         <ul id="available-languages" style="display: none;">
-          <li><a href="{{ page.url }}">English</a></li>
+          <li><a href="{{ site.baseurl }}{{ page.url }}">English</a></li>
           {% for l in page.languages %}
             {% capture intermediate %}{{ page.url | remove_first: l }}{% endcapture %}
             {% capture rootTutorialURL %}{{ intermediate | remove_first: '/' }}{% endcapture %}

_includes/sidebar-toc-tour-overview.html

@@ -33,7 +33,7 @@ <h5 class="contents">Contents</h5>
         </ul>
       {% elsif site.data.translations.tour.languages != empty  %}
         <ul id="available-languages" style="display: none;">
-          <li><a href="{{ page.url }}">English</a></li>
+          <li><a href="{{ site.baseurl }}{{ page.url }}">English</a></li>
           {% for l in site.data.translations.tour.languages %}
             {% capture intermediate %}{{ page.url | remove_first: l }}{% endcapture %}
             {% capture rootTutorialURL %}{{ intermediate | remove_first: '/' }}{% endcapture %}

_layouts/cheatsheet.html

@@ -9,7 +9,7 @@
 				{{content}}
         {% if page.languages %}
           <ul id="available-languages" style="display: none;">
-            <li><a href="{{ page.url }}">English</a></li>
+            <li><a href="{{site.baseurl}}{{ page.url }}">English</a></li>
             {% for l in page.languages %}
               {% capture intermediate %}{{ page.url | remove_first: l }}{% endcapture %}
               {% capture rootTutorialURL %}{{ intermediate | remove_first: '/' }}{% endcapture %}

_overviews/FAQ/index.md

@@ -16,7 +16,7 @@ provided by Daniel Sobral, adapted from his StackOverflow posts.
 <ul>
 {% for overview in overviews %}
   {% if overview.partof == "FAQ" %}
-    <li><a href="{{ overview.url }}">{{ overview.title }}</a></li>
+    <li><a href="{{ site.baseurl }}{{ overview.url }}">{{ overview.title }}</a></li>
   {% endif %}
 {% endfor %}
 </ul>

_overviews/cheatsheets/index.md

@@ -320,7 +320,7 @@ Some(3) match {
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trait T { ... }</code><br /><code class="highlighter-rouge">class C extends T { ... }</code><br /><code class="highlighter-rouge">class C extends D with T { ... }</code></td>
-      <td>traits.<br />interfaces-with-implementation. no constructor params. <a href="/tutorials/tour/mixin-class-composition.html">mixin-able</a>.</td>
+      <td>traits.<br />interfaces-with-implementation. no constructor params. <a href="{{site.baseurl}}/tutorials/tour/mixin-class-composition.html">mixin-able</a>.</td>
     </tr>
     <tr>
       <td><code class="highlighter-rouge">trait T1; trait T2</code><br /><code class="highlighter-rouge">class C extends T1 with T2</code><br /><code class="highlighter-rouge">class C extends D with T1 with T2</code></td>