Removed the base html tag

Page bases are now set to the actual pages. Links in the templates are now generated so they are relative to the page they are rendering
ipfs-inactive · Apr 24, 2015 · b43caf3 · b43caf3
1 parent 2c0b3a2
commit b43caf3
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 33 deletions.
diff --git a/src/ipfs.io/docs/api/index.html b/src/ipfs.io/docs/api/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ../../
+baseurl: ../..
 site: ipfs
 template: tmpl/layouts/ipfs.html
 tagline: API Reference
@@ -18,7 +18,7 @@
 
 # API Reference
 
-[Every command](docs/commands/) usable from the cli is also available through
+[Every command](../commands/) usable from the cli is also available through
 the HTTP API. For example:
 
 ```sh

diff --git a/src/ipfs.io/docs/commands/index.html b/src/ipfs.io/docs/commands/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ../../
+baseurl: ../..
 site: ipfs
 template: tmpl/layouts/ipfs.html
 tagline: Command Reference

diff --git a/src/ipfs.io/docs/examples/index.html b/src/ipfs.io/docs/examples/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ../../
+baseurl: ../..
 site: ipfs
 template: tmpl/layouts/ipfs.html
 ---

diff --git a/src/ipfs.io/docs/getting-started/index.html b/src/ipfs.io/docs/getting-started/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ../../
+baseurl: ../..
 site: ipfs
 template: tmpl/layouts/ipfs.html
 tagline: Getting Started
@@ -21,7 +21,7 @@
 
 # Getting Started
 
-If you haven't done so, [install ipfs](docs/install).
+If you haven't done so, [install ipfs](../install).
 
 ## init the repo
 

diff --git a/src/ipfs.io/docs/index.html b/src/ipfs.io/docs/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ../
+baseurl: ..
 site: ipfs
 template: tmpl/layouts/ipfs.html
 tagline:
@@ -12,10 +12,10 @@
 
 ## Documentation
 
-- [Install](docs/install)
-- [Getting Started](docs/getting-started)
-- [Command Reference](docs/commands)
-- [API Reference](docs/api)
+- [Install](install)
+- [Getting Started](getting-started)
+- [Command Reference](commands)
+- [API Reference](api)
 
 ## Code
 

diff --git a/src/ipfs.io/docs/install/index.html b/src/ipfs.io/docs/install/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ../../
+baseurl: ../..
 site: ipfs
 template: tmpl/layouts/ipfs.html
 ---
@@ -42,7 +42,7 @@
 
 That's it!
 
-<a class="btn btn-success btn-lg" href="docs/getting-started" role="button">
+<a class="btn btn-success btn-lg" href="../getting-started" role="button">
   Getting Started with IPFS &nbsp;&nbsp;<i class="fa fa-arrow-right"></i>
 </a>
 
@@ -59,9 +59,9 @@
 
 Dependencies:
 
-- [Install Go 1.4](https://golang.org/doc/install) (to compile. [make sure it's 1.4](docs/install#check-go-version))
+- [Install Go 1.4](https://golang.org/doc/install) (to compile. [make sure it's 1.4](#check-go-version))
 - [Install Git](http://git-scm.com/) (to download dependencies)
-- *Optionally*, install [FUSE](docs/install#install-fuse) (for mounting / advanced use)
+- *Optionally*, install [FUSE](#install-fuse) (for mounting / advanced use)
 
 Then run:
 
@@ -78,7 +78,7 @@
 
 That's it!
 
-<a class="btn btn-success btn-lg" href="docs/getting-started" role="button">
+<a class="btn btn-success btn-lg" href="../getting-started" role="button">
   Getting Started with IPFS &nbsp;&nbsp;<i class="fa fa-arrow-right"></i>
 </a>
 
@@ -91,7 +91,7 @@
 #### Help!
 
 If you have any problems, come get live help at
-[#ipfs](docs/#community) or via [the mailing list](docs/#community).
+[#ipfs](../#community) or via [the mailing list](../#community).
 
 #### Check Go Version
 

diff --git a/src/ipfs.io/index.html b/src/ipfs.io/index.html
@@ -1,5 +1,5 @@
 ---
-baseurl: ./
+baseurl: .
 site: ipfs
 title: IPFS is a new peer-to-peer hypermedia protocol.
 ---

diff --git a/tmpl/layouts/ipfs.html b/tmpl/layouts/ipfs.html
@@ -4,7 +4,7 @@
 <meta property="og:title" content="IPFS is a new peer-to-peer hypermedia protocol." />
 <meta property="og:name" content="IPFS" />
 <meta property="og:url" content="http://ipfs.io" />
-<meta property="og:image" content="./styles/img/ipfs-cover.png" />
+<meta property="og:image" content="{{ baseurl }}/styles/img/ipfs-cover.png" />
 {% endblock %}
 
 {% block analytics %}

diff --git a/tmpl/layouts/white.html b/tmpl/layouts/white.html
@@ -6,31 +6,27 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
 
-    {% if baseurl %}
-    <base href="{{ baseurl }}" />
-    {% endif %}
-
-    <link rel="icon" href="./styles/img/ipfs-logo-512-ice.png" type="image/png" />
+    <link rel="icon" href="{{ baseurl }}/styles/img/ipfs-logo-512-ice.png" type="image/png" />
 
     <title>{{ title }}</title>
 
     {% block socialgraph %}
     {% endblock %}
 
     <!-- Bootstrap core CSS -->
-    <link href="./styles/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="{{ baseurl }}/styles/bootstrap/bootstrap.min.css" rel="stylesheet" />
 
     <!-- font-awesome -->
-    <link href="./styles/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="{{ baseurl }}/styles/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
 
     <!-- Bootstrap core CSS -->
-    <link href="./styles/style.css" rel="stylesheet" />
+    <link href="{{ baseurl }}/styles/style.css" rel="stylesheet" />
 
-    <script type="text/javascript" src="./styles/jquery/jquery.min.js"></script>
+    <script type="text/javascript" src="{{ baseurl }}/styles/jquery/jquery.min.js"></script>
 
     <!-- site specific css -->
     <!--{% if site %}-->
-      <link href="./styles/{{site}}.css" rel="stylesheet" />
+      <link href="{{ baseurl }}/styles/{{site}}.css" rel="stylesheet" />
     <!--{% endif %}-->
 
 

diff --git a/tmpl/partials/pagenav.html b/tmpl/partials/pagenav.html
@@ -37,10 +37,10 @@
 <div class="row ipw-page-nav">
   <div class="col-xs-12 col-md-8 col-md-offset-2" style="text-align: center;">
     <ul class="nav nav-justified">
-      <li {{ active(pgns, 'about') }}><a href="./">About</a></li>
-      <li {{ active(pgns, 'install') }}><a href="./docs/install">Install</a></li>
-      <li {{ active(pgns, 'examples') }}><a href="./docs/examples">Examples</a></li>
-      <li {{ active(pgns, 'docs') }}><a href="./docs">Project</a></li>
+      <li {{ active(pgns, 'about') }}><a href="{{ baseurl }}/">About</a></li>
+      <li {{ active(pgns, 'install') }}><a href="{{ baseurl }}/docs/install">Install</a></li>
+      <li {{ active(pgns, 'examples') }}><a href="{{ baseurl }}/docs/examples">Examples</a></li>
+      <li {{ active(pgns, 'docs') }}><a href="{{ baseurl }}/docs">Project</a></li>
       <!-- <li {{ active(pgns, 'ecosystem') }}><a href="./docs/ecosystem">Ecosystem</a></li> -->
       <!-- <li {{ active(pgns, 'roadmap') }}><a href="./docs/roadmap">Roadmap</a></li> -->
     </ul>