From f2f4b10f1c484fd1e2ffdf474d6e1c4fb3e46da3 Mon Sep 17 00:00:00 2001
From: Daniel Pono Takamori <pono@apache.org>
Date: Mon, 18 Oct 2021 21:01:03 -0700
Subject: [PATCH] remove donation sidebar from learn and press pages

---
 www/conservancy/templates/base_learn.html     | 35 +++++--------------
 .../templates/submenus/learn_partial.html     |  1 -
 .../submenus/who_we_are_partial.html          |  1 +
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html
index 527243d6..504774d3 100644
--- a/www/conservancy/templates/base_learn.html
+++ b/www/conservancy/templates/base_learn.html
@@ -1,35 +1,18 @@
 {% extends "base_conservancy.html" %}
-{% load cache %}
-{% load humanize %}
-{% 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="donate-sidebar">
-<table style="background-color:#afe478;width:100%;">
-<tr><td style="text-align:center;padding:10px;padding-bottom:10px;">
-<div id="donate-box" class="toggle-unit"><h1 class="toggle-content">Support
-    Now!</h1></div>
-
-<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>
-</td></tr></table>
-</div>
-<div class="content-with-donate-sidebar">
     <div id="container">
          <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
             <h2>Learn</h2>
             {% include 'submenus/learn_partial.html' %}
-         </div>
+                  <h2>Resources for Journalists</h2>
+            <ul>
+            <li class="Vizio"><a href="/vizio">Vizio</a></li>
+            <li class="News"><a href="/news/">News</a></li>
+            <li class="PressKit"><a href="/press/kit.html">Press Kit</a></li>
+            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
+            </ul>
+   </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
-</div></div>
+</div>
 {% endblock %}
diff --git a/www/conservancy/templates/submenus/learn_partial.html b/www/conservancy/templates/submenus/learn_partial.html
index 1894ad08..9b6837b3 100644
--- a/www/conservancy/templates/submenus/learn_partial.html
+++ b/www/conservancy/templates/submenus/learn_partial.html
@@ -3,5 +3,4 @@
   <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/who_we_are_partial.html b/www/conservancy/templates/submenus/who_we_are_partial.html
index 8867f1ed..78fd125a 100644
--- a/www/conservancy/templates/submenus/who_we_are_partial.html
+++ b/www/conservancy/templates/submenus/who_we_are_partial.html
@@ -6,5 +6,6 @@
   <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/filings/">Public Filings</a></li>
   <li><a href="/about/contact/">Contact</a></li>
 </ul>