From: Mark Otto <otto@github.com>
Date: Sat, 27 Jul 2013 07:28:23 +0000 (-0700)
Subject: fixes for hella broken links on account of jekyll and twbs.github.com links
X-Git-Tag: v3.0.0-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94df8090a7771b463c7661b7b0aeecac328b00f4;p=thirdparty%2Fbootstrap.git

fixes for hella broken links on account of jekyll and twbs.github.com links
---

diff --git a/_includes/footer.html b/_includes/footer.html
index 6130efacf4..2e880f0482 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,13 +1,13 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ page.base_url }}/assets/js/jquery.js"></script>
-<script src="{{ page.base_url }}/dist/js/bootstrap.js"></script>
+<script src="{{ page.base_url }}assets/js/jquery.js"></script>
+<script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-<script src="{{ page.base_url }}/assets/js/holder.js"></script>
+<script src="{{ page.base_url }}assets/js/holder.js"></script>
 
-<script src="{{ page.base_url }}/assets/js/application.js"></script>
+<script src="{{ page.base_url }}assets/js/application.js"></script>
 
 {% unless site.port != "9001" %}
   <!-- Analytics
diff --git a/_includes/header.html b/_includes/header.html
index 3efbb8d7d7..81de5f7ebd 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -12,13 +12,11 @@
 </title>
 
 <!-- Bootstrap core CSS -->
-<link href="{{ page.base_url }}/dist/css/bootstrap.css" rel="stylesheet">
+<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
 
-{% if page.layout != "example" %}
 <!-- Documentation extras -->
-<link href="/assets/css/docs.css" rel="stylesheet">
-<link href="/assets/css/pygments-manni.css" rel="stylesheet">
-{% endif %}
+<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet">
+<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet">
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
@@ -27,11 +25,11 @@
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}/assets/ico/apple-touch-icon-144-precomposed.png">
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ page.base_url }}/assets/ico/apple-touch-icon-114-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ page.base_url }}/assets/ico/apple-touch-icon-72-precomposed.png">
-                <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}/assets/ico/apple-touch-icon-57-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}/assets/ico/favicon.png">
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
+<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ page.base_url }}assets/ico/apple-touch-icon-114-precomposed.png">
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ page.base_url }}assets/ico/apple-touch-icon-72-precomposed.png">
+                <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
 
 {% unless site.port != "9001" %}
   <script type="text/javascript">
diff --git a/_includes/nav-main.html b/_includes/nav-main.html
index 28c1e05a51..d7f5a0eec2 100644
--- a/_includes/nav-main.html
+++ b/_includes/nav-main.html
@@ -1,6 +1,6 @@
 <div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav">
   <div class="container">
-    <a href="/" class="navbar-brand">Bootstrap 3 RC1</a>
+    <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC1</a>
     <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
       <span class="icon-bar"></span>
       <span class="icon-bar"></span>
@@ -9,19 +9,19 @@
     <div class="nav-collapse collapse bs-navbar-collapse">
       <ul class="nav navbar-nav">
         <li{% if page.slug == "getting-started" %} class="active"{% endif %}>
-          <a href="/getting-started">Getting started</a>
+          <a href="{{ page.base_url }}getting-started">Getting started</a>
         </li>
         <li{% if page.slug == "css" %} class="active"{% endif %}>
-          <a href="/css">CSS</a>
+          <a href="{{ page.base_url }}css">CSS</a>
         </li>
         <li{% if page.slug == "components" %} class="active"{% endif %}>
-          <a href="/components">Components</a>
+          <a href="{{ page.base_url }}components">Components</a>
         </li>
         <li{% if page.slug == "js" %} class="active"{% endif %}>
-          <a href="/javascript">JavaScript</a>
+          <a href="{{ page.base_url }}javascript">JavaScript</a>
         </li>
         <li{% if page.slug == "customize" %} class="active"{% endif %}>
-          <a href="/customize">Customize</a>
+          <a href="{{ page.base_url }}customize">Customize</a>
         </li>
       </ul>
     </div>
diff --git a/components.html b/components.html
index e612caff55..1f685c2db7 100644
--- a/components.html
+++ b/components.html
@@ -13,7 +13,7 @@ base_url: "../"
     <div class="page-header">
       <h1 id="dropdowns">Dropdown menus</h1>
     </div>
-    <p class="lead">Toggleable, contextual menu for displaying lists of links. Made interactive with the <a href="/javascript/#dropdowns">dropdown JavaScript plugin</a>.</p>
+    <p class="lead">Toggleable, contextual menu for displaying lists of links. Made interactive with the <a href="../javascript/#dropdowns">dropdown JavaScript plugin</a>.</p>
 
     <h3 id="dropdowns-example">Example</h3>
     <p>Wrap the dropdown's trigger and the dropdown menu within <code>.dropdown</code>, or another element that declares <code>position: relative;</code>. Then add the menu's HTML.</p>
@@ -102,7 +102,7 @@ base_url: "../"
     <div class="page-header">
       <h1 id="btn-groups">Button groups</h1>
     </div>
-    <p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="/javascript/#js-buttons">our buttons plugin</a>.</p>
+    <p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="../javascript/#js-buttons">our buttons plugin</a>.</p>
 
     <div class="bs-callout bs-callout-info">
       <h4>Tooltips &amp; popovers in button groups require special setting</h4>
@@ -227,7 +227,7 @@ base_url: "../"
 
     <div class="bs-callout bs-callout-danger">
       <h4>Plugin dependency</h4>
-      <p>Button dropdowns require the <a href="/javascript/#dropdowns">dropdown plugin</a> to be included in your version of Bootstrap.</p>
+      <p>Button dropdowns require the <a href="../javascript/#dropdowns">dropdown plugin</a> to be included in your version of Bootstrap.</p>
     </div>
 
     <h3 id="btn-dropdowns-single">Single button dropdowns</h3>
@@ -591,7 +591,7 @@ base_url: "../"
 
 
     <h2 id="nav-dropdowns">Dropdowns</h2>
-    <p>Add dropdown menus with a little extra HTML and the <a href="/javascript/#dropdowns">dropdowns JavaScript plugin</a>.</p>
+    <p>Add dropdown menus with a little extra HTML and the <a href="../javascript/#dropdowns">dropdowns JavaScript plugin</a>.</p>
 
     <h3>Tabs with dropdowns</h3>
     <div class="bs-example">
@@ -977,7 +977,7 @@ body { padding-bottom: 70px; }
 
     <div class="bs-callout bs-callout-danger">
       <h4>Plugin dependency</h4>
-      <p>The responsive navbar requires the <a href="/javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p>
+      <p>The responsive navbar requires the <a href="../javascript/#collapse">collapse plugin</a> to be included in your version of Bootstrap.</p>
     </div>
 
 
@@ -1383,7 +1383,7 @@ body { padding-bottom: 70px; }
     <div class="page-header">
       <h1 id="thumbnails">Thumbnails</h1>
     </div>
-    <p class="lead">Extend Bootstrap's <a href="/css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
+    <p class="lead">Extend Bootstrap's <a href="../css/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
 
     <h3>Default thumbnails</h3>
     <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
@@ -1483,7 +1483,7 @@ body { padding-bottom: 70px; }
     <div class="page-header">
       <h1 id="alerts">Alerts</h1>
     </div>
-    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="/javascript/#js-alerts">alerts jQuery plugin</a>.</p>
+    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#js-alerts">alerts jQuery plugin</a>.</p>
 
     <h3 id="alerts-default">Default alert</h3>
     <p>Wrap any text and an optional dismiss button in <code>.alert</code> for a basic warning alert message.</p>
diff --git a/customize.html b/customize.html
index cc90d665d8..1a4adaf3dd 100644
--- a/customize.html
+++ b/customize.html
@@ -14,7 +14,7 @@ base_url: "../"
       <button class="btn btn-default toggle" type="button">Toggle all</button>
       <h1 id="less">LESS files</h1>
     </div>
-    <p class="lead">Choose which LESS files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the <a href="/css/">CSS</a> and <a href="/components/">Components</a> pages in the docs</p>
+    <p class="lead">Choose which LESS files to compile into your custom build of Bootstrap. Not sure which files to use? Read through the <a href="../css/">CSS</a> and <a href="/components/">Components</a> pages in the docs</p>
 
     <h3>Basics</h3>
     <div class="row">
@@ -269,7 +269,7 @@ base_url: "../"
       <button class="btn btn-default toggle" type="button">Toggle all</button>
       <h1 id="plugins">jQuery plugins</h1>
     </div>
-    <p class="lead">Choose which jQuery plugins should be included in your custom JavaScript files. Unsure what to include? Read the <a href="/javascript/">JavaScript</a> page in the docs.</p>
+    <p class="lead">Choose which jQuery plugins should be included in your custom JavaScript files. Unsure what to include? Read the <a href="../javascript/">JavaScript</a> page in the docs.</p>
     <div class="row">
       <div class="col-lg-6">
         <h4>Linked to components</h4>
diff --git a/getting-started.html b/getting-started.html
index fc3da38068..ba9ad7be57 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -3,6 +3,7 @@ layout: default
 title: Getting started
 slug: getting-started
 lead: "An overview of Bootstrap, how to download and use, basic templates and examples, and more."
+base_url: "../"
 ---
 
 
diff --git a/javascript.html b/javascript.html
index 6cb6dd11f0..c105a42549 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1618,7 +1618,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
 {% endhighlight %}
 <div class="bs-callout bs-callout-info">
   <h4>Glyphicon Alternative</h4>
-  <p>With <a href="/css/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p>
+  <p>With <a href="{{ site.glyphicons }}">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p>
 </div>
 
     <h3>Optional captions</h3>