cleanup url mess

Author: mkaput

_includes/footer.html

@@ -12,7 +12,7 @@ <h2 class="footer-heading">{{ site.title }}</h2>
       <div class="footer-col footer-col-2">
         <p>
           <a href="https://github.com/intellij-rust/intellij-rust.github.io" class="icon-fork"></a>
-          <a href="{{ '/feed.xml' | prepend: site.baseurl }}" class="icon-rss"></a>
+          <a href="{{ site.github.url }}/feed.xml" class="icon-rss"></a>
         </p>
       </div>
     </div>

_includes/head.html

@@ -6,7 +6,7 @@
   <title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
   <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-  <link rel="stylesheet" href="{{ "/assets/main.css" | prepend: site.baseurl }}">
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.github.url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.github.url }}">
+  <link rel="stylesheet" href="{{ site.github.url }}/assets/main.css">
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.github.url }}">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.github.url }}">
 </head>

_includes/header.html

@@ -1,12 +1,12 @@
 <header class="site-header">
   <div class="wrapper">
-    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+    <a class="site-title" href="{{ site.github.url }}/">{{ site.title }}</a>
     <nav class="site-nav">
       <a href="#" class="menu-icon icon-three-bars"></a>
       <div class="trigger">
-        <a class="page-link" href="{{ site.baseurl }}/thisweek/">What's New</a>
-        <a class="page-link" href="{{ site.baseurl }}/features/">Features</a>
-        <a class="page-link" href="{{ site.baseurl }}/docs/">Docs</a>
+        <a class="page-link" href="{{ site.github.url }}/thisweek/">What's New</a>
+        <a class="page-link" href="{{ site.github.url }}/features/">Features</a>
+        <a class="page-link" href="{{ site.github.url }}/docs/">Docs</a>
       </div>
     </nav>
   </div>

_layouts/base.html

@@ -11,7 +11,7 @@
 
     {% include footer.html %}
 
-    <script src="/assets/main.js"></script>
+    <script src="{{ site.github.url }}/assets/main.js"></script>
 
   </body>
 

_layouts/doc.html

@@ -8,7 +8,7 @@
         {% assign sorted_pages = (site.docs | sort: 'order', 'last') %}
         {% for page in sorted_pages %}
           <li>
-            <a href="{{ page.url | site.baseurl }}">{{ page.title }}</a>
+            <a href="{{ site.github.url }}{{ page.url }}">{{ page.title }}</a>
           </li>
         {% endfor %}
       </ul>

features.markdown

@@ -10,7 +10,7 @@ class: features-page
 {% include h title="Code Completion<abbr class=\"wip\" title=\"Work In Progress\">WIP</abbr>" %}
 
 intellij-rust features built from scratch code completion, leveraging IntelliJ
-Platform capabilities. <kbd>Ctrl+Space</kbd> invokes completion. We [do not](https://intellij-rust.github.io/docs/faq.html#racer)
+Platform capabilities. <kbd>Ctrl+Space</kbd> invokes completion. We [do not]({{ site.github.url }}/docs/faq.html#racer)
 plan to use `racer`. A decent amount of completion intelligence is already implemented,
 but there is definitely a lot more to do. Here are some examples of what works and
 what does not work (as of **June 20**).

feed.xml

@@ -6,8 +6,8 @@ layout: null
   <channel>
     <title>{{ site.title | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.github.url }}{{ site.baseurl }}/</link>
-    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.github.url }}" rel="self" type="application/rss+xml"/>
+    <link>{{ site.github.url }}/</link>
+    <atom:link href="{{ "/feed.xml" | prepend: site.github.url }}" rel="self" type="application/rss+xml"/>
     <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>
@@ -16,8 +16,8 @@ layout: null
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
         <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
-        <link>{{ post.url | prepend: site.baseurl | prepend: site.github.url }}</link>
-        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.github.url }}</guid>
+        <link>{{ post.url | prepend: site.github.url }}</link>
+        <guid isPermaLink="true">{{ post.url | prepend: site.github.url }}</guid>
         {% for tag in post.tags %}
         <category>{{ tag | xml_escape }}</category>
         {% endfor %}

index.html

@@ -15,7 +15,7 @@ <h1>{{ site.title }}</h1>
     <p class="desc">{{ site.description }}<sup>*</sup></p>
     <p class="preview-note"><sup>*</sup>work-in-progress, expect bugs and missing features</p>
     <div id="download">
-      <a id="download-stable" href="{{ site.base.url }}/install.html">Install</a>
+      <a id="download-stable" href="{{ site.github.url }}/install.html">Install</a>
       <div id="install-pane">
         {{ install-content[2] | markdownify }}
         <a id="install-pane-close" href="#">&times;</a>
@@ -30,8 +30,8 @@ <h1>{{ site.title }}</h1>
   <div class="wrapper">
     <h1 class="square">What is intellij-rust</h1>
     <div class="showcase-pic">
-      <img src="/assets/ir-completion.png" class="completion"/>
-      <img src="/assets/ir-intention.png" class="intention">
+      <img src="{{ site.github.url }}/assets/ir-completion.png" class="completion"/>
+      <img src="{{ site.github.url }}/assets/ir-intention.png" class="intention">
     </div>
     <section>
       <h2>Intelligent Rust</h2>
@@ -46,8 +46,8 @@ <h2>Corroded IDEA</h2>
     </section>
 
     <ul class="fancy-link-row">
-      <li><a href="/features/" class="fancy-link">All Features</a></li>
-      <li><a href="/docs/quick-start.html" class="fancy-link">Quick Start</a></li>
+      <li><a href="{{ site.github.url }}/features/" class="fancy-link">All Features</a></li>
+      <li><a href="{{ site.github.url }}/docs/quick-start.html" class="fancy-link">Quick Start</a></li>
     </ul>
   </div>
 </div>
@@ -57,9 +57,9 @@ <h2>Corroded IDEA</h2>
     <h1 class="square">What's new</h1>
     {% assign post = site.posts.first %}
     <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
-    <h2><a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h2>
+    <h2><a class="post-link" href="{{ post.url | prepend: site.github.url }}">{{ post.title }}</a></h2>
     <article>{{ post.content }}</article>
-    <div class="center"><a href="/thisweek/" class="fancy-link">Previous editions</a>
+    <div class="center"><a href="{{ site.github.url }}/thisweek/" class="fancy-link">Previous editions</a>
     </div>
   </div>
 </div>

thisweek.html

@@ -9,7 +9,7 @@
   {% for post in site.posts %}
     <tr>
       <td><time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: "%-d %b %Y" }}</time></td>
-      <td><h2><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h2></td>
+      <td><h2><a href="{{ post.url | prepend: site.github.url }}">{{ post.title }}</a></h2></td>
     </tr>
   {% endfor %}
 </table>