adding commotion logo and menu to header template.

test.commotion/_config.yml

@@ -1,11 +1,10 @@
 name: "Commotion Wireless"
-description: "description goes here"
+description: "Commotion is an open-source communication tool that uses mobile phones, computers, and other wireless devices to create decentralized mesh networks."
 
 encoding: utf-8
 
 url: "test.commotionwireless.net"
 port: 80
 
-paginate: 10
 
 permalink: pretty 

test.commotion/_includes/footer.html

@@ -1,5 +1,5 @@
 <footer id="section-footer" class="section section-footer">
- <div id="zone-footer-wrapper" class="zone-wrapper zone-footer-wrapper clearfix">  
+ <div class="footer-wrapper">  
   <div id="zone-footer" class="zone zone-footer clearfix container-12">
     <div class="grid-4 prefix-8 region region-postscript-first" id="region-postscript-first">
       <div class="region-inner region-postscript-first-inner">
@@ -32,7 +32,9 @@
  </div>  
 </div>
 </footer>
-
 </div> <!-- end container -->
+</div> <!-- end contentcontainer -->
+<script src="https://code.jquery.com/jquery.js"></script>
+<script src="/js/bootstrap.js"></script>
   </body> 
 </html>

test.commotion/_includes/header.html

@@ -31,21 +31,76 @@
       </div> 
     </div>
   </div>
-<!--
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target="v-collapse"> 
-	<span class="icon-bar"></span> 
-	<span class="icon-bar"></span> 
-	<span class="icon-bar"></span> </a> 
-      <a class="brand" href="#">{{ site.name }}</a> 
-	<div class="nav-collapse collapse"> 
-	<ul class="nav"> 
-	<li class="active"><a href="/">Home</a></li> 
-	</ul> 
-        </div> 
-     </div> 
-  </div> 
--->
 </div>
 <div class="container">
+  <div style="float: left; max-width:300px;">
+    <a href="/"><img src="/images/commotion_kbabout_measure-03_0_0.png" alt="Commotion Wireless logo" style="float:left; position:relative; z-index: 1000; max-width:350px; height: 12em; margin-left: .5em; margin-right: .5em;" /></a>
+  </div>
+  <div style="float: right; width: 70%;">
+    <ul class="nav nav-pills">
+      <li class="dropdown">
+	<a id="aboutMenu" href="#" data-toggle="dropdown" role="button">
+	About
+	<b class="caret"></b>
+	</a>
+	<ul id="aboutMenu" class="dropdown-menu" aria-labelledby="aboutMenu" role="menu">
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/about">About Commotion</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/about/faq">FAQ</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/about/guiding-principles">Guiding Principles</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/about/where-its-used">Where It&#039;s Used</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/about/press">Press</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/about/license-privacy">License &amp; Privacy</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/jobs">Jobs</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-1" href="/contact">Contact</a></li>
+	</ul>
+	</li>
+      <li class="static-nodrop"><a href="/blog" title="">Blog</a></li>
+      <li class="dropdown">
+	<a id="getHelpMenu" href="#" data-toggle="dropdown" role="button">
+	Get Help
+	<b class="caret"></b>
+	</a>
+        <ul id="getHelpMenu" class="dropdown-menu" aria-labelledby="getHelpMenu" role="menu">
+	  <li role="presentation"><a role="menuitem" tabindex="-2" href="/docs/get-started">Get Started</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-2" href="/docs/get-involved">Get Involved</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-2" href="/docs/supported-devices">Supported Devices</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-2" href="/docs/cck">Commotion Construction Kit</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-2" href="/docs/localization">Commotion Localization</a></li>
+	</ul>
+      </li>
+      <li class="dropdown">
+	<a id="downloadMenu" href="#" data-toggle="dropdown" role="button">
+	Download
+	<b class="caret"></b>
+	</a>
+	<ul id="downloadMenu" class="dropdown-menu" aria-labelledby="downloadMenu" role="menu">
+	  <li role="presentation"><a role="menuitem" tabindex="-3" href="/download/routers" title="Downloads for supported routers">Routers</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-3" href="/download/android" title="Downloads for supported cellular phones.">Phones</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-3" href="/download/computers">Computers</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-3" href="/download/openbts" title="Downloads for supported cellular network gateways.">Cellular Networks</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-3" href="/download/verify-signatures" title="">Verifying Downloads</a></li>
+	</ul>
+      </li>
+      <li class="dropdown">
+	<a id="developersMenu" href="#" data-toggle="dropdown" role="button">
+	For Developers
+	<b class="caret"></b>
+	</a>
+	<ul id="developersMenu" class="dropdown-menu" aria-labelledby="developersMenu" role="menu">
+	  <li role="presentation"><a role="menuitem" tabindex="-4" href="/developer/resources" title="">Developer Resources</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-4" href="/jobs" title="Read and submit bids for open RFPs on the Commotion Wireless project.">Requests for Proposals</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-4" href="https://wiki.commotionwireless.net" title="">Wiki</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-4" href="https://github.com/organizations/opentechinstitute/dashboard/issues/repos?direction=desc&amp;state=open" title="">Issue Tracker</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-4" href="https://github.com/opentechinstitute" title="">Source Code</a></li>
+	  <li role="presentation"><a role="menuitem" tabindex="-4" href="/developer/hig/introduction">Human Interface Guidelines</a></li>
+	</ul>
+      </li>
+    </ul>
+  </div> 
+ </div>
+</div>
+<div class="promo">
+  <h1>{{ page.title }}</h1>
+</div>
+<div class="containercontent">
+  <div class="container">

test.commotion/config.json

@@ -0,0 +1,53 @@
+{
+  "vars": {},
+  "css": [
+    "print.less",
+    "type.less",
+    "code.less",
+    "grid.less",
+    "tables.less",
+    "forms.less",
+    "buttons.less",
+    "glyphicons.less",
+    "button-groups.less",
+    "input-groups.less",
+    "navs.less",
+    "navbar.less",
+    "breadcrumbs.less",
+    "pagination.less",
+    "pager.less",
+    "labels.less",
+    "badges.less",
+    "jumbotron.less",
+    "thumbnails.less",
+    "alerts.less",
+    "progress-bars.less",
+    "media.less",
+    "list-group.less",
+    "panels.less",
+    "wells.less",
+    "close.less",
+    "dropdowns.less",
+    "tooltip.less",
+    "popovers.less",
+    "modals.less",
+    "carousel.less",
+    "utilities.less",
+    "responsive-utilities.less",
+    "component-animations.less"
+  ],
+  "js": [
+    "alert.js",
+    "button.js",
+    "carousel.js",
+    "dropdown.js",
+    "modal.js",
+    "tooltip.js",
+    "popover.js",
+    "tab.js",
+    "affix.js",
+    "collapse.js",
+    "scrollspy.js",
+    "transition.js"
+  ]
+}

test.commotion/css/bootstrap.css

@@ -3486,7 +3486,7 @@ input[type="button"].btn-block {
   margin: 2px 0 0;
   font-size: 14px;
   list-style: none;
-  background-color: #ffffff;
+  background-color: #00FFCF;
   border: 1px solid #cccccc;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 4px;
@@ -3521,7 +3521,7 @@ input[type="button"].btn-block {
 .dropdown-menu > li > a:focus {
   color: #262626;
   text-decoration: none;
-  background-color: #f5f5f5;
+  background-color: #E8FF00;
 }
 
 .dropdown-menu > .active > a,
@@ -4079,8 +4079,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 
 .nav > li > a:hover,
 .nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eeeeee;
+  color: #000000;
+  background-color: #FFFFFF;
+  border-bottom: 3px solid #E8FF00;
+  margin-bottom: 0;
 }
 
 .nav > li.disabled > a {
@@ -4098,8 +4100,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .nav .open > a,
 .nav .open > a:hover,
 .nav .open > a:focus {
-  background-color: #eeeeee;
-  border-color: #428bca;
+  border-color: #FF739C;
 }
 
 .nav .open > a .caret,
@@ -7130,3 +7131,51 @@ td.visible-print {
     width: 5%;
     float: left;
 }
+ul.main-menu  {
+    display: block;
+    float: right;
+    width: 80%;
+    margin-right: 2em;
+    list-style: none;
+    list-style-type: none;
+}
+ul.main-menu li {
+    width: 20%;
+    display: block;
+    float: left;
+}
+ul.main-menu li a {
+    display: block;
+}
+ul.main-menu ul li {
+    list-style: none;
+    list-style-type: none;
+    display: block;
+}
+ul.main-menu li ul {
+    display: none;
+}
+li.dropdown a,
+li.dropdown a:visited,
+li.static-nodrop a,
+li.static-nodrop a:visited {
+    color: #000000;
+    text-decoration: none;
+    text-transform: uppercase;
+}
+.promo {
+    width: 100%;
+    min-height: 10em;
+    position: relative;
+    z-index: 10;
+    margin-top: -5.5em; 
+}
+.contentcontainer {
+  background: url('/images/black_tri.png') center top no-repeat;
+  margin-right: auto;
+  margin-left: auto;
+}
+.footer-wrapper { 
+  background: url('/images/white_tri.png') no-repeat center top #00FFCF;
+  color: #000000;
+}