From ab60bc1ffa586f8e0e54a74c9896e6dbad98380e 2021-10-19 12:47:58
From: Daniel Pono Takamori <pono@apache.org>
Date: 2021-10-19 12:47:58
Subject: [PATCH] add /press and make that kit page

fix urls for press and learn
start work on new news partial submenu

---

diff --git a/www/conservancy/static/press/index.html b/www/conservancy/static/press/index.html
index 9ecee0ccf516fd4cf09f1c7d8cea59ca338c3aff..4741bb1b70f2bec8652f211d415d1fe4cc40d7d8 100644
--- a/www/conservancy/static/press/index.html
+++ b/www/conservancy/static/press/index.html
@@ -12,4 +12,14 @@
   non proident, sunt in culpa qui officia deserunt mollit anim id est
   laborum."</p>
 
+<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>
+<p><a href="#fixme">Q&A</a></p>
+<p><a href="#fixme">Quotes</a></p>
+
+
 {% endblock %}
diff --git a/www/conservancy/static/press/inthenews.html b/www/conservancy/static/press/inthenews.html
new file mode 100644
index 0000000000000000000000000000000000000000..5692f75417a7a9b91fbe1a690dc2989f048fb47d
--- /dev/null
+++ b/www/conservancy/static/press/inthenews.html
@@ -0,0 +1,17 @@
+{% extends "base_press.html" %}
+{% block subtitle %}Press - {% endblock %}
+{% block submenuselection %}Press{% endblock %}
+{% block content %}
+<h1 id="PressInformation">Related News Stories</h1>
+
+<p>Here are some news articles related to the work that we do. If you have any
+   suggestions for pieces you think our sustainers would be interested in,
+   please send an email to info@sfconservancy.org.</p>
+
+<h2 id="RightToRepair">Right to Repair</h2>
+
+<p><a href="https://www.vice.com/en/article/88nw54/john-deere-backed-lobbying-groups-host-anti-right-to-repair-conference">Vice - John Deere–Backed Lobbying Groups Host Anti-Right to Repair Conference</a></p>
+
+
+
+{% endblock %}
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 742d584fe8bab75946f0e01831dc3fafc3351d41..7b560c593d87f2edf89875849965ce6132631276 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -75,7 +75,7 @@
           <li class="who"><a href="/about/">Who we are</a>
             {% include 'submenus/who_we_are_partial.html' %}
           </li>
-          <li class="learn"><a href="#fixme">Learn</a>
+          <li class="learn"><a href="/learn">Learn</a>
             {% include 'submenus/learn_partial.html' %}
           </li>
           <li class="news"><a href="/news/">News</a>
diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html
index a883f68857c7b91d0e53ecc3a5e098ff3ec35511..d782df201b37548e8ae9fd47c727e6cdd5e3653e 100644
--- a/www/conservancy/templates/base_learn.html
+++ b/www/conservancy/templates/base_learn.html
@@ -7,7 +7,7 @@
             <h2>Resources for Journalists</h2>
             <ul>
             <li class="News"><a href="/news/">News</a></li>
-            <li class="PressKit"><a href="/press/kit.html">Press Kit</a></li>
+            <li class="PressKit"><a href="/press/">Press Kit</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
    </div>
diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html
index 7d05e0dcd4cf9cc8b1e94fc49a711bb355938966..f3be5c074a1c925a5646cabf488e934a5e6c3dff 100644
--- a/www/conservancy/templates/base_press.html
+++ b/www/conservancy/templates/base_press.html
@@ -16,7 +16,7 @@
             <h2>Resources for Journalists</h2>
             <ul>
             <li class="News"><a href="/news/">News</a></li>
-            <li class="PressKit"><a href="/press/kit.html">Press Kit</a></li>
+            <li class="PressKit"><a href="/press/">Press Kit</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
             </ul>
          </div>
diff --git a/www/conservancy/templates/news/pressrelease_detail.html b/www/conservancy/templates/news/pressrelease_detail.html
index 90ac7fcf9d36ba5a306d4dee2b2d40757dc67973..93cc22b06051f706b280fa428aa3ffbb18946ed3 100644
--- a/www/conservancy/templates/news/pressrelease_detail.html
+++ b/www/conservancy/templates/news/pressrelease_detail.html
@@ -8,6 +8,15 @@
 
 {% block subtitle %}{{ object.headline|striptags|safe }} - {% endblock %}
 
+{% block outercontent %}
+    <div id="container">
+         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
+            <h2>{% block category %}Media Contact{% endblock %}</h2>
+            {% include 'submenus/press_partial.html' %}
+         </div>
+   </div>
+{% endblock %}
+
 {% block content %}
 
 <div id="mainContent">
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index 0c4c1e1561712049c3d10fc6b1a7c36701ed9d3b..17ef2772b176e9ae3544a83a57985538d427cd9c 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -11,7 +11,7 @@
          <h2>Resources for Journalists</h2>
          <ul>
             <li class="News"><a href="/news/">News</a></li>
-            <li class="PressKit"><a href="/press/kit.html">Press Kit</a></li>
+            <li class="PressKit"><a href="/press/">Press Kit</a></li>
             <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
          </ul>
 
diff --git a/www/conservancy/templates/submenus/learn_partial.html b/www/conservancy/templates/submenus/learn_partial.html
index 014f8ceba4cbb90ef645b8fbb368d68a62d91cdc..62ba58c499c882c015daf6a78bfed6b432189ba4 100644
--- a/www/conservancy/templates/submenus/learn_partial.html
+++ b/www/conservancy/templates/submenus/learn_partial.html
@@ -1,5 +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">In The News</a></li>
+  <li><a href="/press/inthenews.html">In The News</a></li>
 </ul>
diff --git a/www/conservancy/templates/submenus/news_partial.html b/www/conservancy/templates/submenus/news_partial.html
index 8bc2bfcfa1df42b1e791234a8d798b48ec99134e..5f84fb0bcc22489cabc5fda7a3c0dea313576a97 100644
--- a/www/conservancy/templates/submenus/news_partial.html
+++ b/www/conservancy/templates/submenus/news_partial.html
@@ -1,6 +1,6 @@
 <ul>
   <li><a href="/news/">News Releases</a></li>
   <li><a href="/blog/">Blog</a></li>
-  <li><a href="#fixme">In The News</a></li>
+  <li><a href="/press/inthenews.html">In The News</a></li>
   <li><a href="/press/">Press</a></li>
 </ul>
diff --git a/www/conservancy/templates/submenus/press_partial.html b/www/conservancy/templates/submenus/press_partial.html
new file mode 100644
index 0000000000000000000000000000000000000000..3f5d87c8e999d554bfa3179ed226dac76f176513
--- /dev/null
+++ b/www/conservancy/templates/submenus/press_partial.html
@@ -0,0 +1,5 @@
+<ul>
+  <li>Hannah Gregory</li>
+  <li>Media Rep for Good Causes</li>
+  <li><a href="mailto:sfc@shoestringagency.org">sfc@shoestringagency.org</a></li>
+</ul>
diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py
index 304027fb56a766d420b27b3fb36f213dfa3abcb7..3a94533e8534718daebc4cb83a75950a3b058a2d 100644
--- a/www/conservancy/urls.py
+++ b/www/conservancy/urls.py
@@ -47,6 +47,8 @@ urlpatterns = [
     url(r'^donate', static_views.index),
     url(r'^copyleft-compliance', static_views.index,
                            {'fundraiser_sought' : 'vmware-match-0'}),
+    url(r'^learn', static_views.index),
+    url(r'^press', static_views.index),
     url(r'^projects', static_views.index),
     url(r'^npoacct', static_views.index,
                   {'fundraiser_sought' : 'npoacct'}),