From d4115b6c6d22770763c708b29e8d9a380c6ea50d Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@sfconservancy.org>
Date: Wed, 20 Oct 2021 11:34:24 -0700
Subject: [PATCH] Repair menu highlighting, both for main menu and submenus

During the recent improvements made on the website, the menus and
submenu highlighting for selected menus fell into disarray.
Correction requires changes to the CSS and templates both, because
Django doesn't really have a convenient way to set variables in
templates to use to solve this.

There are still a few submenu items highlighting not working even
after this commit.  More work needs  to be done.
---
 www/conservancy/static/activities/index.html  | 21 +++++---
 .../static/copyleft-compliance/about.html     |  2 +-
 .../static/copyleft-compliance/vizio.html     |  4 +-
 .../vmware-code-similarity.html               |  2 +-
 .../vmware-lawsuit-appeal.html                |  2 +-
 .../vmware-lawsuit-faq.html                   |  2 +-
 www/conservancy/static/css/conservancy.css    | 22 ++++++---
 www/conservancy/static/press/kit.html         |  2 +-
 www/conservancy/static/press/qanda.html       |  4 +-
 www/conservancy/templates/base_about.html     |  5 +-
 www/conservancy/templates/base_blog.html      |  2 +-
 .../templates/base_compliance.html            |  8 +--
 .../templates/base_conservancy.html           | 12 ++---
 www/conservancy/templates/base_learn.html     |  3 +-
 www/conservancy/templates/base_news.html      |  2 +-
 www/conservancy/templates/base_press.html     |  2 +-
 www/conservancy/templates/base_projects.html  |  2 +-
 www/conservancy/templates/base_vizio.html     | 49 +++++++++++++++++++
 www/conservancy/templates/frontpage.html      |  2 +-
 .../templates/news/pressrelease_list.html     |  2 +-
 .../submenus/what_we_do_partial.html          |  4 +-
 .../submenus/who_we_are_partial.html          | 14 +++---
 22 files changed, 116 insertions(+), 52 deletions(-)
 create mode 100644 www/conservancy/templates/base_vizio.html

diff --git a/www/conservancy/static/activities/index.html b/www/conservancy/static/activities/index.html
index 5842181b..0cc0eb3d 100644
--- a/www/conservancy/static/activities/index.html
+++ b/www/conservancy/static/activities/index.html
@@ -1,6 +1,7 @@
 {% extends "base_conservancy.html" %}
 {% load cache %}
 {% load humanize %}
+{% block category %}WhatWeDo{% endblock %}
 {% block head %}
 <link href="/jquery-ui.css" rel="stylesheet" type="text/css"/>
 <link href="/forms.css" rel="stylesheet" type="text/css"/>
@@ -10,17 +11,21 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
-            <h2>Our Copyleft {% block category %}Compliance{% endblock %} Projects</h2>
+            <h2>Vizio Lawsuit</h2>
             <ul>
-            <li class="AboutCompliance"><a href="/copyleft-compliance/about.html">About</a></li>
-            <li class="EnforcementStrategy"><a href="/copyleft-compliance/enforcement-strategy.html">Strategic GPL Enforcement Initiative</a></li>
-            <li class="CopyleftPrinciples"><a href="/copyleft-compliance/principles.html">Principles of Community-Oriented GPL Enforcement</a></li>
-            <li class="LiberateFirmware"><a href="/copyleft-compliance/firmware-liberation.html">Liberate IoT Firmware via GPL Enforcement</a></li>
-            <li class="PastLawsuits"><a href="/copyleft-compliance/past-lawsuits.html">Previous Copyleft Litigation</a></li>
-            <li class="CopyleftOrg"><a href="https://copyleft.org/">copyleft.org</a></li>
+            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
+            <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
+            <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
+            <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
+            </ul>
+            <h2>Resources for Journalists on Vizio</h2>
+            <ul>
+            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
+            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
+            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
          </div>
          <div id="mainContent">
diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/conservancy/static/copyleft-compliance/about.html
index 81b1dcf0..424767d8 100644
--- a/www/conservancy/static/copyleft-compliance/about.html
+++ b/www/conservancy/static/copyleft-compliance/about.html
@@ -1,6 +1,6 @@
 {% extends "base_compliance.html" %}
 {% block subtitle %}Copyleft Compliance Projects - {% endblock %}
-{% block submenuselection %}AboutCompliance{% endblock %}
+{% block submenuselection %}CopyleftCompliance{% endblock %}
 {% block content %}
 <h1 id="ourwork">Conservancy's Copyleft Compliance Projects</h1>
 
diff --git a/www/conservancy/static/copyleft-compliance/vizio.html b/www/conservancy/static/copyleft-compliance/vizio.html
index f48fc5ea..3bb5ec47 100644
--- a/www/conservancy/static/copyleft-compliance/vizio.html
+++ b/www/conservancy/static/copyleft-compliance/vizio.html
@@ -1,6 +1,6 @@
-{% extends "base_compliance.html" %}
+{% extends "base_vizio.html" %}
 {% block subtitle %}Copyleft Compliance Projects - {% endblock %}
-{% block submenuselection %}Vizio{% endblock %}
+{% block submenuselection %}VizioMain{% endblock %}
 {% block content %}
 
 <h1>Software Freedom Conservancy files right-to-repair lawsuit against California TV manufacturer Vizio Inc. for alleged GPL violations</h1>
diff --git a/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html b/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html
index 4e433aaf..ce3d7063 100644
--- a/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html
+++ b/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html
@@ -1,6 +1,6 @@
 {% extends "base_compliance.html" %}
 {% block subtitle %}Copyleft Compliance Projects - {% endblock %}
-{% block submenuselection %}VMwareCodeSimilarity{% endblock %}
+{% block submenuselection %}PastLawsuits{% endblock %}
 {% block content %}
 
 <h1 id="contribution-and-similarity-analysis-of-christoph-hellwigs-linux-code-as-found-in-vmware-esxi-5.5">Contribution and Similarity Analysis of Christoph Hellwig's Linux Code as found in VMware ESXi 5.5</h1>
diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
index c1d6e72c..5a54a0da 100644
--- a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
+++ b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
@@ -1,6 +1,6 @@
 {% extends "base_compliance.html" %}
 {% block subtitle %}Copyleft Compliance Projects - {% endblock %}
-{% block submenuselection %}VMwareLawsuitAppeal{% endblock %}
+{% block submenuselection %}PastLawsuits{% endblock %}
 {% block content %}
 <h2>The time has come to stand up for the GPL.</h2>
 
diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
index 06df596f..0e9406fb 100644
--- a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
+++ b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
@@ -1,6 +1,6 @@
 {% extends "base_compliance.html" %}
 {% block subtitle %}Copyleft Compliance Projects - {% endblock %}
-{% block submenuselection %}VMwareLawsuitFAQ{% endblock %}
+{% block submenuselection %}PastLawsuits{% endblock %}
 {% block content %}
 <h1>Frequently Asked Questions about Christoph Hellwig's VMware Lawsuit</h1>
 
diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css
index b5015854..803787f0 100644
--- a/www/conservancy/static/css/conservancy.css
+++ b/www/conservancy/static/css/conservancy.css
@@ -364,6 +364,7 @@ body > header {
 }
 #container #sidebar li a:hover { background: #577632; color: #fff; }
 
+#container #sidebar.Sponsors ul li.Sponsors,
 #container #sidebar.Directors ul li.Directors,
 #container #sidebar.Eval ul li.Eval,
 #container #sidebar.Overview ul li.Overview,
@@ -375,19 +376,22 @@ body > header {
 #container #sidebar.Current ul li.Current,
 #container #sidebar.Services ul li.Services,
 #container #sidebar.Applying ul li.Applying,
-#container #sidebar.PastLawsuits ul li.PastLawsuits,
-#container #sidebar.VizioAbout ul li.VizioAbout,
+#container #sidebar.VizioTopBar ul li.VizioTopBar,
+#container #sidebar.VizioMain ul li.VizioMain,
 #container #sidebar.VizioPressRelease ul li.VizioPressRelase,
-#container #sidebar.VizioComplaint ul li.VizioPressComplaint,
+#container #sidebar.VizioComplaint ul li.VizioComplaint,
+#container #sidebar.VizioQandA ul li.VizioQandA,
 #container #sidebar.VizioPressKit ul li.VizioPressKit,
 #container #sidebar.VizioPhotoAssets ul li.VizioPhotoAssets,
-#container #sidebar.VizioQandA ul li.VizioQandA,
 #container #sidebar.Glossary ul li.Glossary,
-#container #sidebar.CopyleftPrinciples ul li.CopyleftPrinciples,
-#container #sidebar.AboutCompliance ul li.AboutCompliance,
+#container #sidebar.CopyleftCompliance ul li.CopyleftCompliance,
 #container #sidebar.HelpComply ul li.HelpComply,
+#container #sidebar.CopyleftPrinciples ul li.CopyleftPrinciples,
 #container #sidebar.EnforcementStrategy ul li.EnforcementStrategy,
-#container #sidebar.LiberateFirmware ul li.LiberateFirmware
+#container #sidebar.CopyleftCompliance ul li.CopyleftCompliance,
+#container #sidebar.LiberateFirmware ul li.LiberateFirmware,
+#container #sidebar.PastLawsuits ul li.PastLawsuits,
+#container #sidebar.CopyleftOrg ul li.CopyleftOrg /* Never put a comma here */
 {
     color: #000033;
     font-weight: bold;
@@ -529,7 +533,11 @@ span.subsectionToc { padding-left: 4em; }
 span.subsubsectionToc { padding-left: 6em;}
 .js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; }
 
+body.conservancy-Home #navbar ul li.Home > a,
 body.conservancy-Projects #navbar ul li.Projects > a,
+body.conservancy-WhoWeAre #navbar ul li.WhoWeAre > a,
+body.conservancy-WhatWeDo #navbar ul li.WhatWeDo > a,
+body.conservancy-Learn #navbar ul li.Learn > a,
 body.conservancy-news #navbar ul li.news > a,
 body.conservancy-blog #navbar ul li.blog > a,
 body.conservancy-About #navbar ul li.About > a,
diff --git a/www/conservancy/static/press/kit.html b/www/conservancy/static/press/kit.html
index 47495f6a..3c8e2cca 100644
--- a/www/conservancy/static/press/kit.html
+++ b/www/conservancy/static/press/kit.html
@@ -1,6 +1,6 @@
 {% extends "base_learn.html" %}
 {% block subtitle %}Press Kit - {% endblock %}
-{% block submenuselection %}Press Kit{% endblock %}
+{% block submenuselection %}PressKit{% endblock %}
 {% block content %}
 <h1 id="PressInformation">Press Kit</h1>
 
diff --git a/www/conservancy/static/press/qanda.html b/www/conservancy/static/press/qanda.html
index fd4ac430..81a89f68 100644
--- a/www/conservancy/static/press/qanda.html
+++ b/www/conservancy/static/press/qanda.html
@@ -1,6 +1,6 @@
-{% extends "base_compliance.html" %}
+{% extends "base_vizio.html" %}
 {% block subtitle %}Press - {% endblock %}
-{% block submenuselection %}Press{% endblock %}
+{% block submenuselection %}VizioQandA{% endblock %}
 {% block content %}
 <h1 id="QandA">Vizio Lawsuit Q &amp; A</h1>
 
diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html
index 4948e9d2..61d1a13a 100644
--- a/www/conservancy/templates/base_about.html
+++ b/www/conservancy/templates/base_about.html
@@ -1,8 +1,9 @@
 {% extends "base_conservancy.html" %}
+{% block category %}WhoWeAre{% endblock %}
 {% block outercontent %}
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
-            <h2>{% block category %}Who We Are{% endblock %}</h2>
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
+            <h2>Who We Are</h2>
             {% include 'submenus/who_we_are_partial.html' %}
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
diff --git a/www/conservancy/templates/base_blog.html b/www/conservancy/templates/base_blog.html
index fdb9e5d4..1db733a1 100644
--- a/www/conservancy/templates/base_blog.html
+++ b/www/conservancy/templates/base_blog.html
@@ -8,7 +8,7 @@
 
 {% block outercontent %}
  <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 <h2>Authors</h2>
 <ul>
 {% for author in all_authors %}
diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html
index ba571445..6fb144fe 100644
--- a/www/conservancy/templates/base_compliance.html
+++ b/www/conservancy/templates/base_compliance.html
@@ -1,4 +1,5 @@
 {% extends "base_conservancy.html" %}
+{% block category %}WhatWeDo{% endblock %}
 {% load cache %}
 {% load humanize %}
 {% block head %}
@@ -10,12 +11,12 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
             <h2>Vizio Lawsuit</h2>
             <ul>
-            <li class="VizioAbout"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
+            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
             <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
             <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
             <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
@@ -26,9 +27,8 @@
             <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
-            <h2>More About Copyleft Compliance&hellip;</h2>
+            <h2>More About Copyleft Compliance</h2>
             <ul>
-            <li class="AboutCompliance"><a href="/copyleft-compliance/about.html">About</a></li>
             <li class="HelpComply"><a href="/copyleft-compliance/help.html">How To Help</a></li>
             <li class="EnforcementStrategy"><a href="/copyleft-compliance/enforcement-strategy.html">Strategic GPL Enforcement Initiative</a></li>
             <li class="CopyleftPrinciples"><a href="/copyleft-compliance/principles.html">Principles of Community-Oriented GPL Enforcement</a></li>
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 080287bc..bac808e5 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -27,7 +27,7 @@
     {% block head %}{% endblock %}
   </head>
 
-  <body class="conservancy-{% block category %}other{% endblock %}">
+  <body class="conservancy-{% block category %}{% endblock %}">
     <header>
       <div class="flex-ns center mw8">
         <div class="w-60-ns">
@@ -69,17 +69,17 @@
               </button>
     </form>
           </li>
-          <li class="home dn db-ns"><a href="/">Home</a></li>
-          <li class="what"><a href="/activities">What we do</a>
+          <li class="Home dn db-ns"><a href="/">Home</a></li>
+          <li class="WhatWeDo"><a href="/activities">What we do</a>
             {% include 'submenus/what_we_do_partial.html' %}
           </li>
-          <li class="who"><a href="/about/">Who we are</a>
+          <li class="WhoWeAre"><a href="/about/">Who we are</a>
             {% include 'submenus/who_we_are_partial.html' %}
           </li>
-          <li class="learn"><a href="/learn">Learn</a>
+          <li class="Learn"><a href="/learn">Learn</a>
             {% include 'submenus/learn_partial.html' %}
           </li>
-          <li class="news"><a href="/news/">News</a>
+          <li class="News"><a href="/news/">News</a>
             {% include 'submenus/news_partial.html' %}
           </li>
         </ul>
diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html
index d782df20..d7d15396 100644
--- a/www/conservancy/templates/base_learn.html
+++ b/www/conservancy/templates/base_learn.html
@@ -1,7 +1,8 @@
 {% extends "base_conservancy.html" %}
+{% block category %}Learn{% endblock %}
 {% block outercontent %}
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>Learn</h2>
             {% include 'submenus/learn_partial.html' %}
             <h2>Resources for Journalists</h2>
diff --git a/www/conservancy/templates/base_news.html b/www/conservancy/templates/base_news.html
index b9b2f350..8dd263c9 100644
--- a/www/conservancy/templates/base_news.html
+++ b/www/conservancy/templates/base_news.html
@@ -1,6 +1,6 @@
 {% extends "base_standard.html" %}
 
-{% block category %}news{% endblock %}
+{% block category %}News{% endblock %}
 
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/news/" />
diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html
index f3be5c07..a33023ed 100644
--- a/www/conservancy/templates/base_press.html
+++ b/www/conservancy/templates/base_press.html
@@ -10,7 +10,7 @@
 {% block outercontent %}
 <div class="content-with-donate-sidebar">
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
             <h2>Resources for Journalists</h2>
diff --git a/www/conservancy/templates/base_projects.html b/www/conservancy/templates/base_projects.html
index ea66251d..39d99668 100644
--- a/www/conservancy/templates/base_projects.html
+++ b/www/conservancy/templates/base_projects.html
@@ -1,7 +1,7 @@
 {% extends "base_conservancy.html" %}
 {% block outercontent %}
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
             {% include 'submenus/what_we_do_partial.html' %}
             <h2>{% block category %}Projects{% endblock %} &amp; Services</h2>
diff --git a/www/conservancy/templates/base_vizio.html b/www/conservancy/templates/base_vizio.html
new file mode 100644
index 00000000..c88f6f38
--- /dev/null
+++ b/www/conservancy/templates/base_vizio.html
@@ -0,0 +1,49 @@
+{% extends "base_conservancy.html" %}
+{% load cache %}
+{% load humanize %}
+{% block category %}WhatWeDo{% endblock %}
+{% block head %}
+<link href="/jquery-ui.css" rel="stylesheet" type="text/css"/>
+<link href="/forms.css" rel="stylesheet" type="text/css"/>
+
+{% endblock %}
+
+{% block outercontent %}
+<div class="content-with-donate-sidebar">
+    <div id="container">
+         <div id="sidebar" class="VizioTopBar {% block submenuselection %}{% endblock %}">
+            <h2>What We Do</h2>
+            {% include 'submenus/what_we_do_partial.html' %}
+            <h2>Vizio Lawsuit</h2>
+            <ul>
+            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
+            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
+            <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
+            <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
+            </ul>
+            <h2>Resources for Journalists</h2>
+            <ul>
+            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
+            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
+            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
+            </ul>
+            <h2><ul><li class="ComplianceMain"><a href="/copyleft-compliance/index.html">More About Copyleft Compliance</a></li></ul></h2>
+         </div>
+               <div id="mainContent">{% block content %}{% endblock %}
+               </div>
+    </div>
+    <div class="donate-sidebar">
+  <details>
+    <summary>Support Now!</summary>
+
+    <h3>Support Copyleft Enforcement Now!</h3>
+
+    <p>
+      To support our copyleft compliance &amp; enforcement work,
+      please <a href="/sustainer/#annual"><span class="donate-box-highlight">become a Conservancy
+      Sustainer <strong>right now</strong></span></a>.  We can't sustain
+      this work without ongoing support from donors like you!</p>
+  </details>
+</div>
+</div>
+{% endblock %}
diff --git a/www/conservancy/templates/frontpage.html b/www/conservancy/templates/frontpage.html
index 0080bebc..95e939a8 100644
--- a/www/conservancy/templates/frontpage.html
+++ b/www/conservancy/templates/frontpage.html
@@ -1,7 +1,7 @@
 {% extends "base_conservancy.html" %}
 {% load date_within %}
 {% load static %}
-
+{% block category %}Home{% endblock %}
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="Software Freedom Conservancy Complete Feed" href="/feeds/omnibus/" />
 <link rel="alternate" type="application/rss+xml" title="Software Freedom Conservancy News" href="/feeds/news/" />
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index 17ef2772..c670cad0 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -3,7 +3,7 @@
 
 {% block outercontent %}
     <div id="container">
-         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
          <h2>News Index by Year</h2>
          <ul>
          {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
diff --git a/www/conservancy/templates/submenus/what_we_do_partial.html b/www/conservancy/templates/submenus/what_we_do_partial.html
index 98394154..f7bfc077 100644
--- a/www/conservancy/templates/submenus/what_we_do_partial.html
+++ b/www/conservancy/templates/submenus/what_we_do_partial.html
@@ -1,6 +1,6 @@
 <ul>
-  <li class="AboutCompliance"><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
-  <li class="VizioAbout"><a href="/vizio/">Vizio Lawsuit</a></li>
+  <li class="CopyleftCompliance"><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
+  <li class="VizioTopBar"><a href="/copyleft-compliance/vizio.html">Vizio Lawsuit</a></li>
   <li class="FIXME"><a href="/projects/">Member Projects</a></li>
   <li class="Outreachy"><a href="https://outreachy.org">Outreachy</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
index 8ac1683d..2a3a2dec 100644
--- a/www/conservancy/templates/submenus/who_we_are_partial.html
+++ b/www/conservancy/templates/submenus/who_we_are_partial.html
@@ -1,10 +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 class="Sponsors"><a href="/sponsors/">Sponsors</a></li>
+  <li class="Sustainers"><a href="/sustainer/">Sustainers</a></li>
+  <li class="Directors"><a href="/about/board/">Board of Directors</a></li>
+  <li class="Staff"><a href="/about/staff/">Staff</a></li>
+  <li clas="Eval"><a href="/about/eval-committee/">Evaluation Committee</a></li>
+  <li clas="Outside"><a href="/about/outside/">Outside Counsel, et alia</a></li>
   <li class="Transparency"><a href="/about/transparency">Transparency</a></li>
-  <li><a href="/about/contact/">Contact</a></li>
+  <li class="Contact"><a href="/about/contact/">Contact</a></li>
 </ul>