Ensure proposals show up on the jekyll site.

src/jekyll/Makefile

@@ -2,15 +2,14 @@
 # Exceptions. See /LICENSE for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-all: site
+all: build
 
-# Indirection for the dot-dir.
-site: .gen-site
-
-.gen-site:
+.gen-site: site theme
 	bundle exec jekyll build
 
-run:
+build: .gen-site
+
+run: site theme
 	bundle exec jekyll server --watch
 
 clean:

src/jekyll/_config.yml

@@ -27,7 +27,6 @@ defaults:
     values:
       layout: "page"
       search: true
-      sidebar: sidebar
       topnav: topnav
 
 plugins:

src/jekyll/site/proposals

@@ -0,0 +1 @@
+../../../proposals/

src/jekyll/theme/_data/sidebars/sidebar.yml → src/jekyll/theme/_data/sidebar.yml

@@ -25,6 +25,7 @@ entries:
             url: /docs/project/commenting_guidelines.html
           - title: Roadmap process
             url: /docs/project/roadmap_process.html
+      - title: Proposals
       - title: Misc
         folderitems:
           - title: Groups

src/jekyll/theme/_includes/sidebar.html

@@ -1,8 +1,5 @@
-{% assign sidebar = site.data.sidebars[page.sidebar].entries %}
-
 <ul id="mysidebar" class="nav">
-  <li class="sidebarTitle">{{sidebar[0].product}} {{sidebar[0].version}}</li>
-  {% for entry in sidebar %} {% for folder in entry.folders %}
+  {% for entry in site.data.sidebar.entries %} {% for folder in entry.folders %}
   <li>
     <a title="{{folder.title}}" href="#">{{folder.title}}</a>
     <ul>
@@ -67,6 +64,24 @@
         </ul>
       </li>
       {% endfor %} {% endfor %}
+      <!-- Add proposals to the proposals folder. -->
+      {% if folder.title == "Proposals" %}
+        {% for proposal in site.pages %}
+          {% assign path = proposal.url | split: "/" %}
+          {% if path[1] == "proposals" %}
+          {% unless path[2] contains "template" %}
+            {% assign active = "" %}
+            {% if page.url == proposal.url %}
+              {% assign active = "active" %}
+            {% endif %}
+            <li class="{{active}}">
+              <a title="{{proposal.title}}"
+                 href="{{proposal.url}}">{{proposal.title}}</a>
+            </li>
+          {% endunless %}
+          {% endif %}
+        {% endfor %}
+      {% endif %}
     </ul>
   </li>
   {% endfor %} {% endfor %}