From 37d67fb1da4ab8af30e926c52ee28c38b45305eb Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 19 Oct 2021 13:53:07 +1100
Subject: [PATCH] Break submenus out into separately included files for reuse
 in sidebars.

---
 www/conservancy/templates/base_about.html     | 12 ++-----
 .../templates/base_conservancy.html           | 33 +++----------------
 .../templates/submenus/learn_partial.html     |  7 ++++
 .../templates/submenus/news_partial.html      |  6 ++++
 .../submenus/what_we_do_partial.html          |  6 ++++
 .../submenus/who_we_are_partial.html          | 10 ++++++
 6 files changed, 35 insertions(+), 39 deletions(-)
 create mode 100644 www/conservancy/templates/submenus/learn_partial.html
 create mode 100644 www/conservancy/templates/submenus/news_partial.html
 create mode 100644 www/conservancy/templates/submenus/what_we_do_partial.html
 create mode 100644 www/conservancy/templates/submenus/who_we_are_partial.html

diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html
index e5df3084..8f0d30ec 100644
--- a/www/conservancy/templates/base_about.html
+++ b/www/conservancy/templates/base_about.html
@@ -3,18 +3,10 @@
     <div id="container">
          <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
             <h2>{% block category %}About{% endblock %}</h2>
-            <ul>
-            <li class="Overview"><a href="/about/index.html">Overview</a></li>
-            <li class="Contact"><a href="/about/contact">Contact</a></li>
-            <li class="Directors"><a href="/about/board/">Directors</a></li>
-            <li class="Staff"><a href="/about/staff/">Staff</a></li>
-            <li class="Eval"><a href="/about/eval-committee/">Evaluation Committee</a></li>
-            <li class="Outside"><a href="/about/outside/">Outside Counsel, et alia</a></li>
-            <li class="Filings"><a href="/about/filings/">Filings</a></li>
-            <li class="License"><a href="/about/license/">License &amp; Sources</a></li>
-            </ul>
+            {% include 'submenus/who_we_are_partial.html' %}
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
    </div>
 {% endblock %}
+g
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index ab49098c..0b49f4f7 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -71,41 +71,16 @@
           </li>
           <li class="home dn db-ns"><a href="/">Home</a></li>
           <li class="what"><a href="#fixme">What we do</a>
-            <ul>
-              <li><a href="/projects/">Member Projects</a></li>
-              <li><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
-              <li><a href="/vizio/">Vizio</a></li>
-              <li><a href="#fixme">FAQs</a></li>
-            </ul>
+            {% include 'submenus/what_we_do_partial.html' %}
           </li>
           <li class="who"><a href="/about/">Who we are</a>
-            <ul>
-              <li><a href="/sponsors/">Sponsors</a></li>
-              <li><a href="/sustainer/">Sustainers</a></li>
-              <li><a href="/about/board/">Board of Directors</a></li>
-              <li><a href="/about/staff/">Staff</a></li>
-              <li><a href="/about/eval-committee/">Evaluation Committee</a></li>
-              <li><a href="/about/outside/">Outside Counsel, et alia</a></li>
-              <li><a href="#fixme">Transparency</a></li>
-              <li><a href="/about/contact/">Contact</a></li>
-            </ul>
+            {% include 'submenus/who_we_are_partial.html' %}
           </li>
           <li class="learn"><a href="#fixme">Learn</a>
-            <ul>
-              <li><a href="/copyleft-compliance/glossary.html">Glossary of Terms</a></li>
-              <li><a href="/press/qanda.html">Q&A</a></li>
-              <li><a href="#fixme">Recommended Resources</a></li>
-              <li><a href="#fixme">In The News</a></li>
-              <li><a href="/about/filings/">Public Filings</a></li>
-            </ul>
+            {% include 'submenus/learn_partial.html' %}
           </li>
           <li class="news"><a href="/news/">News</a>
-            <ul>
-              <li><a href="/news/">News Releases</a></li>
-              <li><a href="/blog/">Blog</a></li>
-              <li><a href="#fixme">In The News</a></li>
-              <li><a href="/press/">Press</a></li>
-            </ul>
+            {% include 'submenus/news_partial.html' %}
           </li>
         </ul>
       </div>
diff --git a/www/conservancy/templates/submenus/learn_partial.html b/www/conservancy/templates/submenus/learn_partial.html
new file mode 100644
index 00000000..1894ad08
--- /dev/null
+++ b/www/conservancy/templates/submenus/learn_partial.html
@@ -0,0 +1,7 @@
+<ul>
+  <li><a href="/copyleft-compliance/glossary.html">Glossary of Terms</a></li>
+  <li><a href="/press/qanda.html">Q&A</a></li>
+  <li><a href="#fixme">Recommended Resources</a></li>
+  <li><a href="#fixme">In The News</a></li>
+  <li><a href="/about/filings/">Public Filings</a></li>
+</ul>
diff --git a/www/conservancy/templates/submenus/news_partial.html b/www/conservancy/templates/submenus/news_partial.html
new file mode 100644
index 00000000..8bc2bfcf
--- /dev/null
+++ b/www/conservancy/templates/submenus/news_partial.html
@@ -0,0 +1,6 @@
+<ul>
+  <li><a href="/news/">News Releases</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li><a href="#fixme">In The News</a></li>
+  <li><a href="/press/">Press</a></li>
+</ul>
diff --git a/www/conservancy/templates/submenus/what_we_do_partial.html b/www/conservancy/templates/submenus/what_we_do_partial.html
new file mode 100644
index 00000000..fa509860
--- /dev/null
+++ b/www/conservancy/templates/submenus/what_we_do_partial.html
@@ -0,0 +1,6 @@
+<ul>
+  <li><a href="/projects/">Member Projects</a></li>
+  <li><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
+  <li><a href="/vizio/">Vizio</a></li>
+  <li><a href="#fixme">FAQs</a></li>
+</ul>
diff --git a/www/conservancy/templates/submenus/who_we_are_partial.html b/www/conservancy/templates/submenus/who_we_are_partial.html
new file mode 100644
index 00000000..8867f1ed
--- /dev/null
+++ b/www/conservancy/templates/submenus/who_we_are_partial.html
@@ -0,0 +1,10 @@
+<ul>
+  <li><a href="/sponsors/">Sponsors</a></li>
+  <li><a href="/sustainer/">Sustainers</a></li>
+  <li><a href="/about/board/">Board of Directors</a></li>
+  <li><a href="/about/staff/">Staff</a></li>
+  <li><a href="/about/eval-committee/">Evaluation Committee</a></li>
+  <li><a href="/about/outside/">Outside Counsel, et alia</a></li>
+  <li><a href="#fixme">Transparency</a></li>
+  <li><a href="/about/contact/">Contact</a></li>
+</ul>