Changeset - 09a4b021c1f5
[Not reviewed]
0 21 1
Bradley M. Kuhn - 2 years ago 2021-10-21 15:39:47
bkuhn@sfconservancy.org
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.
22 files changed with 116 insertions and 52 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/activities/index.html
Show inline comments
...
 
@@ -3,2 +3,3 @@
 
{% load humanize %}
 
{% block category %}WhatWeDo{% endblock %}
 
{% block head %}
...
 
@@ -12,13 +13,17 @@
 
    <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>
www/conservancy/static/copyleft-compliance/about.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Copyleft Compliance Projects - {% endblock %}
 
{% block submenuselection %}AboutCompliance{% endblock %}
 
{% block submenuselection %}CopyleftCompliance{% endblock %}
 
{% block content %}
www/conservancy/static/copyleft-compliance/vizio.html
Show inline comments
 
{% extends "base_compliance.html" %}
 
{% extends "base_vizio.html" %}
 
{% block subtitle %}Copyleft Compliance Projects - {% endblock %}
 
{% block submenuselection %}Vizio{% endblock %}
 
{% block submenuselection %}VizioMain{% endblock %}
 
{% block content %}
www/conservancy/static/copyleft-compliance/vmware-code-similarity.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Copyleft Compliance Projects - {% endblock %}
 
{% block submenuselection %}VMwareCodeSimilarity{% endblock %}
 
{% block submenuselection %}PastLawsuits{% endblock %}
 
{% block content %}
www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Copyleft Compliance Projects - {% endblock %}
 
{% block submenuselection %}VMwareLawsuitAppeal{% endblock %}
 
{% block submenuselection %}PastLawsuits{% endblock %}
 
{% block content %}
www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Copyleft Compliance Projects - {% endblock %}
 
{% block submenuselection %}VMwareLawsuitFAQ{% endblock %}
 
{% block submenuselection %}PastLawsuits{% endblock %}
 
{% block content %}
www/conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -366,2 +366,3 @@ body > header {
 

	
 
#container #sidebar.Sponsors ul li.Sponsors,
 
#container #sidebar.Directors ul li.Directors,
...
 
@@ -377,15 +378,18 @@ body > header {
 
#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 */
 
{
...
 
@@ -531,3 +535,7 @@ span.subsubsectionToc { padding-left: 6em;}
 

	
 
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,
www/conservancy/static/press/kit.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Press Kit - {% endblock %}
 
{% block submenuselection %}Press Kit{% endblock %}
 
{% block submenuselection %}PressKit{% endblock %}
 
{% block content %}
www/conservancy/static/press/qanda.html
Show inline comments
 
{% extends "base_compliance.html" %}
 
{% extends "base_vizio.html" %}
 
{% block subtitle %}Press - {% endblock %}
 
{% block submenuselection %}Press{% endblock %}
 
{% block submenuselection %}VizioQandA{% endblock %}
 
{% block content %}
www/conservancy/templates/base_about.html
Show inline comments
 
{% 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' %}
www/conservancy/templates/base_blog.html
Show inline comments
...
 
@@ -10,3 +10,3 @@
 
 <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
<h2>Authors</h2>
www/conservancy/templates/base_compliance.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block category %}WhatWeDo{% endblock %}
 
{% load cache %}
...
 
@@ -12,3 +13,3 @@
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
...
 
@@ -17,3 +18,3 @@
 
            <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>
...
 
@@ -28,5 +29,4 @@
 
            </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>
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -29,3 +29,3 @@
 

	
 
  <body class="conservancy-{% block category %}other{% endblock %}">
 
  <body class="conservancy-{% block category %}{% endblock %}">
 
    <header>
...
 
@@ -71,13 +71,13 @@
 
          </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' %}
www/conservancy/templates/base_learn.html
Show inline comments
 
{% 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>
www/conservancy/templates/base_news.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 

	
 
{% block category %}news{% endblock %}
 
{% block category %}News{% endblock %}
 

	
www/conservancy/templates/base_press.html
Show inline comments
...
 
@@ -12,3 +12,3 @@
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
www/conservancy/templates/base_projects.html
Show inline comments
...
 
@@ -3,3 +3,3 @@
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
www/conservancy/templates/base_vizio.html
Show inline comments
 
new file 100644
 
{% 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 %}
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -3,3 +3,3 @@
 
{% load static %}
 

	
 
{% block category %}Home{% endblock %}
 
{% block head %}
www/conservancy/templates/news/pressrelease_list.html
Show inline comments
...
 
@@ -5,3 +5,3 @@
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
         <h2>News Index by Year</h2>
www/conservancy/templates/submenus/what_we_do_partial.html
Show inline comments
 
<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>
www/conservancy/templates/submenus/who_we_are_partial.html
Show inline comments
 
<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>
0 comments (0 inline, 0 general)