From d6f23f86a36b9acfe36ff9f588775b52839bed15 2021-10-19 02:53:07
From: Ben Sturmfels <ben@sturm.com.au>
Date: 2021-10-19 02:53:07
Subject: [PATCH] Break submenus out into separately included files for reuse in sidebars.

---

diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html
index e5df308455b6ec784821918f20f1be5fbb84dd56..8f0d30ecd405d123a3846d097045c97316d1f4d7 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 ab49098c3836e830a884bff6d9849713e9572f59..0b49f4f7614f41ff32bfa127755548560c276b1a 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 0000000000000000000000000000000000000000..1894ad08e64653a4a5d74e629506a802e8cf110d
--- /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 0000000000000000000000000000000000000000..8bc2bfcfa1df42b1e791234a8d798b48ec99134e
--- /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 0000000000000000000000000000000000000000..fa5098600166ee36ce2b76ce9019e39365f4ac8e
--- /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 0000000000000000000000000000000000000000..8867f1ed46e1f9ddbe93156a4743ecc8ef4f656d
--- /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>