From 9a0cb169d1276ccad651103fb7d7e4421b4845b6 Mon Sep 17 00:00:00 2001
From: Daniel Pono Takamori <pono@sfconservancy.org>
Date: Tue, 19 Oct 2021 08:21:14 -0700
Subject: [PATCH] update staff and bug fix for /news menu

---
 www/conservancy/static/about/staff/index.html | 30 +++++++++++--------
 .../templates/news/pressrelease_detail.html   |  9 ------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/www/conservancy/static/about/staff/index.html b/www/conservancy/static/about/staff/index.html
index 26b9a7cf..91d1a26b 100644
--- a/www/conservancy/static/about/staff/index.html
+++ b/www/conservancy/static/about/staff/index.html
@@ -90,19 +90,25 @@ was a James Kent Scholar and co-founder of the Columbia Science and
 Technology Law Review. Karen received her bachelor’s degree in engineering
 from The Cooper Union.</p>
 
-<h2 id="brett">Brett Smith - Director of Strategic Initiatives</h2>
-<p>Brett Smith began his FLOSS advocacy in 2000 at college, organizing
-student groups and discussing the issues with professors and journalists.  He
-also spent a couple of those summers interning at the Free Software
-Foundation, and working in various assisting roles there when he returned to
-campus.  Later on he worked as the FSF's License Compliance Engineer from
-2006-2012, helping to shepherd the GPLv3 drafting process and do outreach
-after the license was released.  From there, he worked as a Systems Engineer
-at the World Wide Web Consortium (W3C) and
-an <a href="https://arvados.org/">Arvados</a> maintainer at Curoverse before
-joining Conservancy as Director of Strategic Initiatives in 2016.  He holds a
-BS in Computer Science from the University of Kentucky.</p>
+<h2 id="sage">Sage Sharp - Senior Director of Diversity & Inclusion</h2>
+<p>Sage Sharp is the Senior Director of Diversity & Inclusion at the Software
+Freedom Conservancy. Sage runs Outreachy, which is Conservancy's diversity
+initiative that provides paid, remote internships to people who are subject to
+systemic bias or impacted by underrepresentation in tech. Sage is a
+long-standing free software contributor, and is known for their work as a
+Linux kernel maintainer for seven years. They also founded their own company,
+Otter Tech, which has trained over 400 people on how to enforce a Code of
+Conduct.</p>
 
+<h2 id="pono">Daniel Pono Takamori - Community Organizer & Non-Profit Problem Solver</h2>
+<p>Pono joined Conservancy to help fill a community need for bridging technical
+and non-technical roles. Having worked at FOSS foundations and organizations
+for over a decade, his background in FOSS infrastructure led him to think more
+deeply about how to better use community intelligence instead of technology
+to solve governance questions. He is passionate about making FOSS a more
+equitable and inclusive space. With a background in mathematics and physics,
+he looks forward to mobilizing social intelligence and community goveranance
+as a basis for solving both technical and non-technical problems.</p>
 
 
 {% endblock %}
diff --git a/www/conservancy/templates/news/pressrelease_detail.html b/www/conservancy/templates/news/pressrelease_detail.html
index 93cc22b0..90ac7fcf 100644
--- a/www/conservancy/templates/news/pressrelease_detail.html
+++ b/www/conservancy/templates/news/pressrelease_detail.html
@@ -8,15 +8,6 @@
 
 {% 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">