reorganized layout of files

_config.yml

@@ -6,5 +6,5 @@ repo: https://github.com/ros2/design
 
 permalink: pretty
 
-markdown: redcarpet
+markdown: maruku
 pygments: true

_includes/footer.html

@@ -11,5 +11,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
+    <script src="{{ site.baseurl }}/js/ros2-design.js"></script>
   </body>
 </html>

_includes/header.html

@@ -33,16 +33,15 @@
         </div>
         <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
-              <li {% if page.title == "Use Cases" %}class="active"{% endif %}>
-                <a href="{{ site.baseurl }}/use_cases">Use Cases</a>
-              </li>
-              <li {% if page.title == "Knowledge Base" %}class="active"{% endif %}>
-                <a href="{{ site.baseurl }}/knowledge_base">Knowledge Base</a>
-              </li>
-              <li {% if page.title == "Proposals" %}class="active"{% endif %}>
-                <a href="{{ site.baseurl }}/proposals">Proposals</a>
-              </li>
-            </ul>
+          {% for p in site.pages %}
+            {% assign p_split = p.url | split: '/' %}
+            {% if p_split.last and p_split[1] == p_split.last %}
+            <li>
+              <a href="{{ p.url }}">{{ p.title }}</a>
+            </li>
+            {% endif %}
+          {% endfor %}
+          </ul>
         </div><!--/.nav-collapse -->
       </div>
     </div>

_layouts/default.html

@@ -1,9 +1,12 @@
 {% include header.html %}
 
 <div class="row">
-  <div class="col-md-10 col-md-offset-1">
+  <div class="content-container col-md-9">
     {{ content }}
   </div>
+  <div class="sidebar-container col-md-3">
+    {% include sidebar.html %}
+  </div>
 </div>
 
 {% include footer.html %}

contribute.md

@@ -0,0 +1,8 @@
+---
+layout: default
+title: Contribute
+---
+
+# How to Get Involved!
+
+asdfasdfa

css/ros2-design.css

@@ -1,6 +1,17 @@
 body {
     padding-top: 60px;
-    background-color: #eee;
+    background-color: #ddd;
+}
+
+/*This allows h2's which are linked to in toc to not get covered by the navbar*/
+h2 {
+    padding-top: 60px;
+    margin-top: -50px;
+}
+
+.content-container {
+    border-radius: 3px;
+    background-color: #fff;
 }
 
 .tbmargin {
@@ -10,3 +21,29 @@ body {
 hr {
     border-top-color: #aaa;
 }
+
+div.maruku_toc p {
+    padding: 5px 5px 0 5px;
+    margin: 0;
+    background-color: #aaa;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    border-bottom: 1px solid #333;
+}
+
+div.maruku_toc {
+    float: right !important;
+    width: 300px;
+    background-color: #ddd;
+    margin-top: 20px;
+    border-radius: 3px;
+}
+
+.maruku_toc ul {
+    margin-top: 10px;
+    list-style: disc !important;
+}
+
+.maruku_toc ul ul {
+    display: none;
+}

index.md

@@ -3,10 +3,17 @@ layout: default
 title: ROS2 Design
 ---
 
-# Design
+# ROS 2.0 Design
 
-Damage report! I will obey your orders. I will serve this ship as First Officer. And in an attack against the Enterprise, I will die with this crew. But I will not break my oath of loyalty to Starfleet. Ensign Babyface! Smooth as an android's bottom, eh, Data? Fear is the true enemy, the only enemy. Now, how the hell do we defeat an enemy that knows us better than we know ourselves? Congratulations - you just destroyed the Enterprise. Is it my imagination, or have tempers become a little frayed on the ship lately? The Federation's gone; the Borg is everywhere! Then maybe you should consider this: if anything happens to them, Starfleet is going to want a full investigation. Some days you get the bear, and some days the bear gets you. Maybe if we felt any human loss as keenly as we feel one of those close to us, human history would be far less bloody. Maybe if we felt any human loss as keenly as we feel one of those close to us, human history would be far less bloody. Yesterday I did not know how to eat gagh. The look in your eyes, I recognize it. You used to have it for me. Mr. Worf, you do remember how to fire phasers? Sure. You'd be surprised how far a hug goes with Geordi, or Worf. I recommend you don't fire until you're within 40,000 kilometers. Your head is not an artifact! When has justice ever been as simple as a rule book? When has justice ever been as simple as a rule book? Well, I'll say this for him - he's sure of himself. The Enterprise computer system is controlled by three primary main processor cores, cross-linked with a redundant melacortz ramistat, fourteen kiloquad interface modules. We could cause a diplomatic crisis. Take the ship into the Neutral Zone What? We're not at all alike! I'd like to think that I haven't changed those things, sir. A lot of things can change in twelve years, Admiral.
+This site is repository of articles which are designed to inform and guide the ROS 2.0 design efforts.
+The goal of the ROS 2.0 project is to leverage what is great about ROS 1.x and improve what isn't.
 
-## Sub Heading
+# Articles
 
-Some days you get the bear, and some days the bear gets you. I recommend you don't fire until you're within 40,000 kilometers. Captain, why are we out here chasing comets? Mr. Worf, you do remember how to fire phasers? I'll alert the crew. and attack the Romulans. My oath is between Captain Kargan and myself. Your only concern is with how you obey my orders. Or do you prefer the rank of prisoner to that of lieutenant? I guess it's better to be lucky than good. You're going to be an interesting companion, Mr. Data. I think you've let your personal feelings cloud your judgement. The Enterprise computer system is controlled by three primary main processor cores, cross-linked with a redundant melacortz ramistat, fourteen kiloquad interface modules. I suggest you drop it, Mr. Data. Well, that's certainly good to know. What's a knock-out like you doing in a computer-generated gin joint like this? A surprise party? Mr. Worf, I hate surprise parties. I would *never* do that to you. Yes, absolutely, I do indeed concur, wholeheartedly! Now we know what they mean by 'advanced' tactical training. Maybe we better talk out here; the observation lounge has turned into a swamp. I'm afraid I still don't understand, sir. Computer, belay that order. I can't. As much as I care about you, my first duty is to the ship. Worf, It's better than music. It's jazz.
+Here is a list of the articles (white papers) we have written which should serve as an excellent entry point for anyone wanting to join the conversation about any of the topics below:
+
+{% for p in site.pages %}
+    {% if p.url contains 'articles/' %}
+- <a href="{{ p.url }}">{{ p.title }}</a>
+    {% endif %}
+{% endfor %}

js/ros2-design.js

@@ -0,0 +1,3 @@
+$( document ).ready(function() {
+    $( 'div.maruku_toc' ).prepend('<p><strong>Table of Contents</strong></p>');
+});