From aa2219fc09cf7225b293c21b01942268074515df Mon Sep 17 00:00:00 2001
From: Daniel Pono Takamori <pono@apache.org>
Date: Mon, 18 Oct 2021 21:32:02 -0700
Subject: [PATCH] temporarily(?) remove FAQs, Recommended Resources

---
 www/conservancy/static/press/kit.html                     | 5 ++++-
 www/conservancy/templates/base_learn.html                 | 2 +-
 www/conservancy/templates/news/pressrelease_list.html     | 8 ++++++++
 www/conservancy/templates/submenus/learn_partial.html     | 1 -
 .../templates/submenus/what_we_do_partial.html            | 1 -
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/www/conservancy/static/press/kit.html b/www/conservancy/static/press/kit.html
index b6bfb02a..47495f6a 100644
--- a/www/conservancy/static/press/kit.html
+++ b/www/conservancy/static/press/kit.html
@@ -1,9 +1,12 @@
-{% extends "base_press.html" %}
+{% extends "base_learn.html" %}
 {% block subtitle %}Press Kit - {% endblock %}
 {% block submenuselection %}Press Kit{% endblock %}
 {% block content %}
 <h1 id="PressInformation">Press Kit</h1>
 
+<p>Here's a collection of documents (collated and individual) for distribution
+   and reference.</p>
+
 <p><a href="#fixme">Full Press Kit</a></p>
 <p><a href="#fixme">Press Release</a></p>
 <p><a href="#fixme">Glossary</a></p>
diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html
index 504774d3..5c6e0e0e 100644
--- a/www/conservancy/templates/base_learn.html
+++ b/www/conservancy/templates/base_learn.html
@@ -4,7 +4,7 @@
          <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
             <h2>Learn</h2>
             {% include 'submenus/learn_partial.html' %}
-                  <h2>Resources for Journalists</h2>
+            <h2>Resources for Journalists</h2>
             <ul>
             <li class="Vizio"><a href="/vizio">Vizio</a></li>
             <li class="News"><a href="/news/">News</a></li>
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index abb784e8..53204c7f 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -8,6 +8,14 @@
          <ul>
          {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
          </ul>
+         <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">
            <div class="breadcrumbs">
diff --git a/www/conservancy/templates/submenus/learn_partial.html b/www/conservancy/templates/submenus/learn_partial.html
index 9b6837b3..014f8ceb 100644
--- a/www/conservancy/templates/submenus/learn_partial.html
+++ b/www/conservancy/templates/submenus/learn_partial.html
@@ -1,6 +1,5 @@
 <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>
 </ul>
diff --git a/www/conservancy/templates/submenus/what_we_do_partial.html b/www/conservancy/templates/submenus/what_we_do_partial.html
index fa509860..4c2bd4a8 100644
--- a/www/conservancy/templates/submenus/what_we_do_partial.html
+++ b/www/conservancy/templates/submenus/what_we_do_partial.html
@@ -2,5 +2,4 @@
   <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>