introduced drop-down menu, reorganized nav

Governance · Aug 6, 2014 · fe35da4 · fe35da4
1 parent ba168ad
commit fe35da4
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 1,200 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,4 +1,4 @@
-navigation:
+nav:
  - title: S-RAMP
    url: /s-ramp
  - title: Design Time Governance
@@ -7,13 +7,25 @@ navigation:
    url: /rtgov
  - title: API Management
    url: /apiman
- - title: Contribute
-   url: /contribute.html
- - title: Blog
-   url: http://jboss-overlord.blogspot.com
- - title: Forum
-   url: https://community.jboss.org/en/overlord
- - title: Chat
-   url: /chat.html
- - title: CI (Jenkins)
-   url: https://overlord.ci.cloudbees.com
+ - title: Get Involved
+   url: /getinvolved
+   subnav:
+    - title: Contribute
+      url: /community/contribute.html
+    - title: Report a Bug
+      url: https://issues.jboss.org
+    - title: Chat
+      url: /community/chat.html
+    - title: Forum
+      url: https://community.jboss.org/en/overlord
+ - title: Follow Us
+   url: /followus
+   subnav:
+    - title: Blog
+      url: http://jboss-overlord.blogspot.com
+    - title: "@OverlordSRAMP"
+      url: https://twitter.com/OverlordSRAMP
+    - title: "@OverlordDTGov"
+      url: https://twitter.com/OverlordDTGov
+    - title: "@OverlordRTGov"
+      url: https://twitter.com/OverlordRTGov
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -12,10 +12,10 @@ <h4>Overlord Projects</h4>
           <div class="col-lg-3">
             <h4>Get Involved</h4>
             <ul>
-                <li><a href="https://community.jboss.org/en/overlord">Forum Discussions</a></li>
-                <li><a href="#">Chat on IRC</a></li>
+                <li><a href="/contribute.html">Contribute</a></li>
                 <li><a href="https://issues.jboss.org">Report a Bug</a></li>
-                <li><a href="https://github.com/Governance">Contribute Code</a></li>
+                <li><a href="#">Chat on IRC</a></li>
+                <li><a href="https://community.jboss.org/en/overlord">Forum Discussions</a></li>
             </ul>
           </div>
           <div class="col-lg-3">

diff --git a/_includes/header.html b/_includes/header.html
@@ -17,6 +17,9 @@
       <script src="/js/html5shiv.js"></script>
       <script src="/js/respond.min.js"></script>
     <![endif]-->
+
+    <script src="/js/jquery-1.11.1.min.js"></script>
+    <script src="/lib/bootstrap-3.1.1/js/bootstrap.js"></script>
   </head>
 
   <body>
@@ -27,7 +30,7 @@
         <a href="https://github.com/Governance/{{ page.subproject }}"><img style="position: absolute; top: 0; right: 0; border: 0;" src="/img/forkme_right_red_aa0000.png" alt=""></a>
       </div>
 
-	  <ul class="nav nav-pills">
+	  <ul class="nav nav-tabs">
 	    {% assign active = nil %}
         {% if page.url == "/index.html" %}
           {% assign active = 'active' %}
@@ -36,13 +39,24 @@
           <a href="/">Home</a>
         </li>
 
-	    {% for link in site.navigation %}
+	    {% for navElement in site.nav %}
 	      {% assign active = nil %}
-	      {% if page.url contains link.url %}
+	      {% if page.url contains navElement.url %}
 	        {% assign active = 'active' %}
 	      {% endif %}
 	      <li class="{{ active }}">
-	        <a href="{{ link.url }}">{{ link.title }}</a>
+	        {% if navElement.subnav == nil %}
+	          <a href="{{ navElement.url }}">{{ navElement.title }}</a>
+	        {% else %}
+	          <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ navElement.title }} <span class="caret"></span></a>
+	          <ul class="dropdown-menu">
+	            {% for subnavElement in navElement.subnav %}
+	              <li>
+	                <a href="{{ subnavElement.url }}">{{ subnavElement.title }}</a>
+	              </li>
+	            {% endfor %}
+	          </ul>
+	        {% endif %}
 	      </li>
 	    {% endfor %}
 	  </ul>

diff --git a/css/overlord-web.css b/css/overlord-web.css
@@ -75,10 +75,6 @@ h1.page-heading {
   padding-left: 3px;
 }
 
-.nav-pills li a {
-  border-radius: 6px 6px 0px 0px;
-}
-
 .nav a {
   color: #fff;
   font-size: 14px;
@@ -93,7 +89,7 @@ h1.page-heading {
   text-shadow: none;
 }
 
-.nav-pills li.active a, .nav-pills li.active a:hover {
+.nav .active a, .nav .active a:hover, .nav .dropdown-menu a, .nav .dropdown-menu a:hover {
   color: rgb(78, 101, 125); /* Same as container bg */
   background: rgb(238, 238, 238) !important;
   text-shadow: none;

diff --git a/chat.html → getinvolved/chat.html b/chat.html → getinvolved/chat.html
diff --git a/contribute.html → getinvolved/contribute.html b/contribute.html → getinvolved/contribute.html
diff --git a/js/jquery-1.11.1.min.js b/js/jquery-1.11.1.min.js