Conservancy's Copyleft Compliance Projects
diff --git a/www/conservancy/static/copyleft-compliance/vizio.html b/www/conservancy/static/copyleft-compliance/vizio.html index f48fc5ea1bdc67e082fb6f4ff1ddd5c2feab868b..3bb5ec476feafc6c84fbfc15172b67a043423552 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 %}Software Freedom Conservancy files right-to-repair lawsuit against California TV manufacturer Vizio Inc. for alleged GPL violations
diff --git a/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html b/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html index 4e433aafe5ad6a1278866a15ce63971588715fb5..ce3d7063c1b6e9a3945a707f4650be35297a3dbe 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 %}Contribution and Similarity Analysis of Christoph Hellwig's Linux Code as found in VMware ESXi 5.5
diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html index c1d6e72cb3d79f560d8cb5467d80338984b1c8b3..5a54a0daf66f5decd85133cc15a6330cf8958190 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 %}The time has come to stand up for the GPL.
diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html b/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html index 06df596f4c1a38aef4a9cf89b6655e2ffdcbcf39..0e9406fbf3556bd2b2e899acf00b9fac7d1457fc 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 %}Frequently Asked Questions about Christoph Hellwig's VMware Lawsuit
diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css index b50158543d91b7fb94c303463101a71f05867e85..803787f07175053c4b477ca62c97a391709c4a0e 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 47495f6a54a5d3be11d2bf0cd175a5c20e21156b..3c8e2ccac875ae8244cf7cafc7f7ae9d64d9adc4 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 %}Press Kit
diff --git a/www/conservancy/static/press/qanda.html b/www/conservancy/static/press/qanda.html index fd4ac430bc17ea05e20c4703565b06f273138948..81a89f68a21673ebae44c8e6f640bb77cb4bf74a 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 %}Vizio Lawsuit Q & A
diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html index 4948e9d25bb465cdb79dc9f1abae54aea3a3a35b..61d1a13a970059ab333ff69388e2a41d10aeec84 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 %}
-