This closes #15.
diff --git a/_layouts/base.html b/_layouts/base.html
index b4c4b02..9bc6600 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -34,6 +34,10 @@
<li class="dropdown{% if page.navgroup == navgroup.id %} active{% endif %}">
<a href="{{site.url}}{{navgroup.page.url}}">{{navgroup.title}}</a>
<ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="{{site.url}}{{navgroup.page.url}}">{{navgroup.title_in_menu}}</a>
+ </li>
+ <li class="divider"></li>
{% for child in navgroup.page.menu2 %}
<li>
<a href="{{site.url}}{{child.reference.url}}">{{child.reference.title}}</a>
diff --git a/_plugins/site_structure.rb b/_plugins/site_structure.rb
index b3f3bb6..903d0cf 100644
--- a/_plugins/site_structure.rb
+++ b/_plugins/site_structure.rb
@@ -9,6 +9,9 @@
navgroups = site.pages.detect { |page| page.path == SiteStructure::ROOT }.data['navgroups']
navgroups.each do |ng|
ng['page'] = site.pages.detect { |page| page.path == ng['page'] }
+ if not ng['title_in_menu']
+ ng['title_in_menu'] = ng['title'].capitalize
+ end
end
site.data['navgroups'] = navgroups
site.data['structure'] = gen_structure(site, SiteStructure::ROOT, nil, navgroups)
@@ -46,7 +49,13 @@
page.data['parent'] = parent
if page.data['children']
page.data['children'].each do |c|
- c['reference'] = gen_structure(site, c['path'], page, navgroups)
+ if c['path']
+ # links to another Jekyll-managed page
+ c['reference'] = gen_structure(site, c['path'], page, navgroups)
+ elsif c['link']
+ # links to a not-Jekyll-managed page on this site
+ c['reference'] = { 'url' => c['link'], 'title' => c['title'] }
+ end
end
end
diff --git a/documentation.md b/documentation.md
index 3734912..f68b12a 100644
--- a/documentation.md
+++ b/documentation.md
@@ -2,6 +2,7 @@
layout: normal
title: Documentation
children:
+- { link: v/0.7.0-M1, title: User Manual (0.7.0-M1) }
- { path: glossary.md }
- { path: documentation/install-on-server.md }
---
diff --git a/index.md b/index.md
index ffff6df..2193329 100644
--- a/index.md
+++ b/index.md
@@ -11,9 +11,9 @@
navgroups:
- { id: learnmore, page: learnmore.md, title: learn more }
- { id: download, page: download.md, title: download }
-- { id: getstarted, page: quickstart/index.md, title: get started }
-- { id: documentation, page: documentation.md, title: documentation }
-- { id: community, page: community/index.md, title: community }
+- { id: getstarted, page: quickstart/index.md, title: get started, title_in_menu: Get started }
+- { id: documentation, page: documentation.md, title: documentation, title_in_menu: All documentation }
+- { id: community, page: community/index.md, title: community, title_in_menu: Community home }
---
<div class="jumbotron">
diff --git a/quickstart/policies-and-catalogs.md b/quickstart/policies-and-catalogs.md
index 49489df..06c0d73 100644
--- a/quickstart/policies-and-catalogs.md
+++ b/quickstart/policies-and-catalogs.md
@@ -1,5 +1,5 @@
---
-title: Getting Started - Policies and Catalogs
+title: Policies and Catalogs
layout: normal
---
