Merge remote-tracking branch 'origin/master'

# Conflicts: # .DS_Store # css/styles.css
suhasadhav · Feb 10, 2016 · 2253dc6 · 2253dc6
2 parents a4293a0 + c9ebf42
commit 2253dc6
Show file tree

Hide file tree

Showing 28 changed files with 188 additions and 1,443 deletions.
diff --git a/_includes/.DS_Store → .DS_Store b/_includes/.DS_Store → .DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 
 .DS_Store
+
+_includes/.DS_Store
diff --git a/_config.yml b/_config.yml
@@ -4,7 +4,7 @@ kramdown:
   input: GFM
   html_to_native: true
   hard_wrap: false
-  use_coderay: true
+  enable_coderay: true
 baseurl: /
 
 safe: false
@@ -18,9 +18,28 @@ defaults:
       layout: "docwithnav"
   -
     scope:
-      path: "v1.2"
+      path: "v1.1"
     values:
-      version: "v1.2"
+      version: "v1.1"
       versionfilesafe: "v1_1"
-
+  -
+    scope:
+      path: "v1.1/reference"
+    values:
+      section: "reference"
+  -
+    scope:
+      path: "v1.1/guides"
+    values:
+      section: "guides"
+  -
+    scope:
+      path: "v1.1/support"
+    values:
+      section: "support"
+  -
+    scope:
+      path: "v1.1/samples"
+    values:
+      section: "samples"
 permalink: pretty
diff --git a/_data/v1_1/reference.yml b/_data/v1_1/reference.yml
@@ -4,7 +4,7 @@ toc:
   section:
   - title: Kubernetes API Overview
     path: http://kubernetes.io/v1.1/docs/api.html
-  - title: Kubernetes API Reference (pretend the child nodes are here)
+  - title: Kubernetes API Reference
     path: http://kubernetes.io/v1.1/api-ref.html
 
 - title: kubectl

diff --git a/_includes/tree.html b/_includes/tree.html
@@ -1,45 +1,6 @@
-
-<ul {% if subsection %}style="display: none; opacity: 0; margin-left: 15px;"{% endif %}>
-  {% for item in tree %}
-
-    {% if item.status %}
-      {% capture statusHTML %} <sup style="color: red">{{item.status}}</sup>{% endcapture %}
-    {% else %}
-      {% assign statusHTML = "" %}
-    {% endif %}
-
-    {% if item.section %}
-      {% capture sectionHTML %}<a class="tlw-control tlw-collapsed">▸</a>{% endcapture %}
-    {% else %}
-      {% assign sectionHTML = "" %}
-    {% endif %}
-
-
-    {% if item.path %}
-      {% if page.url | remove: ".html" | remove "index" == item.path %}
-        {% capture tocItemColor %}style="color:red;"{% endcapture %}
-      {% else %}
-        {% capture tocItemColor %}{% endcapture %}
-      {% endif %}
-      <li {{ tocItemColor }}>{{ sectionHTML }}<a href="{{ item.path }}" title="{{ item.title }}" data-title="{{ item.title }} - {{ item.path }}"><span>{{ item.title }} {{ statusHTML }}</span></a></li>
-    {% else %}
-      {% if item.include %}
-        {% assign tree = site.data[item.include].toc %}
-        {% assign subsection=false %}
-        {% include tree.html %}
-      {% else %}
-        <li>{{ sectionHTML }}<span class="tlw-title tlw-control-title" data-title="{{ item.title }}">{{ item.title }}{{ statusHTML }}</span></li>
-      {% endif %}
-    {% endif %}
-
-    {% if item.break %}
-      <hr>
-    {% endif %}
-
-    {% if item.section %}
-      {% assign tree = item.section %}
-      {% assign subsection=true %}
-      {% include tree.html %}
-    {% endif %}
-  {% endfor %}
-</ul>
+{% for item in tree %}{% if item.section %}
+<div class="item" data-title="{{ item.title }}">
+  <div class="container">{% assign tree = item.section %}{% include tree.html %}
+  </div>
+</div>{% else %}
+    <a class="item" data-title="{{ item.title }}" href="{{ item.path }}" ></a>{% endif %}{% endfor %}
diff --git a/_layouts/docwithnav.html b/_layouts/docwithnav.html
@@ -7,66 +7,26 @@ <h1>{{ page.title }}</h1>
 	<h5>{{ page.abstract }}</h5>
 	<div id="vendorStrip" class="light-text">
 		<ul>
-			<li><a href="#">GUIDES</a></li>
-			<li><a href="#">REFERENCE</a></li>
-			<li><a href="#">SAMPLES</a></li>
-			<li><a href="#">SUPPORT</a></li>
+			<li><a href="/{{ page.version }}/guides">GUIDES</a></li>
+			<li><a href="/{{ page.version }}/reference">REFERENCE</a></li>
+			<li><a href="/{{ page.version }}/samples">SAMPLES</a></li>
+			<li><a href="/{{ page.version }}/support">SUPPORT</a></li>
 		</ul>
 		<div class="dropdown">
 			<div class="readout"></div>
-			<a href="#">Version 1.1</a>
-			<a href="#">Version 1.0</a>
+			<a href="/v1.1">Version 1.1</a>
+			<a href="/v1.0">Version 1.0</a>
 		</div>
 		<input type="text" id="search" placeholder="Search the docs">
 	</div>
 </section>
 
 <section id="encyclopedia">
 	<div id="docsToc">
-    	{% comment %} assign tree = site.data[page.toc].toc
-        {% assign tree = site.data[page.versionfilesafe][page.section].toc %}
-		{% include tree.html %}{% endcomment %}
-		<!--
-
-		Here's your API ref for this accordion element:
-
-		Each line is class "item". Use the data-title attribute for the text label.
-		Use a.item for direct links; use div.item to wrap containers.
-
-		A div.container inside a div.item is a nested accordion. The clickable text which toggles the
-		container open/closed is the data-title attribute of the parent div.item.
-
-		-->
-
-		<div class="pi-accordion">
-			<a class="item" data-title="Overview" href="path-to-page"></a>
-
-			<div class="item" data-title="Quickstarts">
-				<div class="container">
-					<a class="item" data-title="Setting Up Your Local Environment" href="path-to-page"></a>
-					<a class="item" data-title="5-minute Quickstart" href="path-to-page"></a>
-					<a class="item" data-title="Kubernetes 101" href="path-to-page"></a>
-					<a class="item" data-title="Kubernetes 201" href="path-to-page"></a>
-				</div>
-			</div> <!-- /quickstarts -->
-
-			<div class="item" data-title="Running Kubernetes">
-				<div class="container">
-					<a class="item" data-title="Running Kubernetes on Your Local Machine" href="path-to-page"></a>
-					<a class="item" data-title="Running Kubernetes on Google Container Engine" href="path-to-page"></a>
-					<div class="item" data-title="Third-level Schtuff">
-						<div class="container">
-							<a class="item" data-title="Third Level One" href="path-to-page"></a>
-							<a class="item" data-title="Third Level Two" href="path-to-page"></a>
-							<a class="item" data-title="Third Level Three" href="path-to-page"></a>
-							<a class="item" data-title="Third Level Four" href="path-to-page"></a>
-						</div>
-					</div>
-					<a class="item" data-title="Running Kubernetes on Turn-Key Cloud Solutions" href="path-to-page"></a>
-					<a class="item" data-title="Running Kubernetes on Custom Solutions" href="path-to-page"></a>
-				</div>
-			</div> <!-- /running kubernetes -->
-		</div> <!-- /pi-accordion -->
+        <div class="pi-accordion">
+            {% assign tree = site.data[page.versionfilesafe][page.section].toc %}
+            {% include tree.html %}
+        </div> <!-- /pi-accordion -->
 	</div> <!-- /docsToc -->
 	<div id="docsContent">
 		{{ content }}

diff --git a/_site/README.md b/_site/README.md
diff --git a/_site/css/styles.css b/_site/css/styles.css
diff --git a/_site/images/github_icon.png b/_site/images/github_icon.png
diff --git a/_site/images/nav_logo.svg b/_site/images/nav_logo.svg