Merge pull request #312 from devanooga/forums-link

Add "Forums" link to header

Author: brb3

Gemfile.lock

@@ -5,20 +5,20 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     ffi (1.16.3)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.10.1)
-      rdoc
-      reline (>= 0.3.8)
+    io-console (0.7.2)
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
@@ -46,38 +46,39 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.7.1)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     power_assert (2.0.3)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (5.0.5)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.6.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    regexp_parser (2.8.3)
-    reline (0.4.1)
+    regexp_parser (2.9.2)
+    reline (0.5.7)
       io-console (~> 0.5)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (3.30.0)
     rubocop (1.42.0)
       json (~> 2.3)
@@ -89,8 +90,8 @@ GEM
       rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -101,9 +102,10 @@ GEM
     sassc (2.4.0)
       ffi (~> 1.9)
     stringio (3.1.0)
+    strscan (3.1.0)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    test-unit (3.6.1)
+    test-unit (3.6.2)
       power_assert
     unicode-display_width (1.8.0)
     webrick (1.8.1)

_includes/navigation.html

@@ -6,7 +6,7 @@
       {% for page in pages %}
         {% if page.menu_group > 0 %}
         <li data-menu-group="{{ page.menu_group }}">
-          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+          <a class="page-link" href="{% if page.external_url %}{{ page.external_url }}{% else %}{{ page.url | prepend: site.baseurl }}{% endif %}">{{ page.title }}</a>
         </li>
         {% endif %}
       {% endfor %}

_pages/forums.md

@@ -0,0 +1,6 @@
+---
+title: Forums
+external_url: https://forums.devanooga.com/
+menu_group: 1
+menu_sort: 4
+---

_pages/outreach.html

@@ -3,7 +3,7 @@
 layout_modifier: wrapper--members_page wide
 title: Outreach
 permalink: /outreach/
-menu_group: 1
+menu_group: 0
 menu_sort: 1
 ---
 <p class="sidebar-blurb">The following members are open providing discounted or free services for Not-For-Profit organizations and charities. Feel free to contact them using the method that they have provided.</p>

_pages/slack.md

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Join us
+title: Slack
 permalink: /slack/
 menu_group: 1
 menu_sort: 3