start Q&A page

edit menu to remove About section and rearrange other items

www/conservancy/static/press/index.html

@@ -12,11 +12,4 @@
   non proident, sunt in culpa qui officia deserunt mollit anim id est
   laborum."</p>
 
-<h2 id="support">Donate to Support This Work</h2>
-
-<p>Finally, Conservancy welcomes <a href="#donate-box"
-  class="donate-now">donations</a> in support of our GPL Compliance Projects,
-  and we encourage you to become a <a href="/sustainer/">an official
-  Supporter of Software Freedom Conservancy</a>. </p>
-</div>
 {% endblock %}

www/conservancy/static/press/qanda.html

@@ -0,0 +1,15 @@
+{% extends "base_press.html" %}
+{% block subtitle %}Press - {% endblock %}
+{% block submenuselection %}Press{% endblock %}
+{% block content %}
+<h1 id="QandA">Q&A</h1>
+
+<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod 
+  tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+  quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+  consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+  cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
+  non proident, sunt in culpa qui officia deserunt mollit anim id est
+  laborum."</p>
+
+{% endblock %}

www/conservancy/templates/base_conservancy.html

@@ -78,7 +78,7 @@
               <li><a href="#fixme">FAQs</a></li>
             </ul>
           </li>
-          <li class="who"><a href="#fixme">Who we are</a>
+          <li class="who"><a href="/about/">Who we are</a>
             <ul>
               <li><a href="/sponsors/">Sponsors</a></li>
               <li><a href="/sustainer/">Sustainers</a></li>
@@ -86,14 +86,17 @@
               <li><a href="/about/staff/">Staff</a></li>
               <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/contact/">Contact</a></li>
             </ul>
           </li>
           <li class="learn"><a href="#fixme">Learn</a>
             <ul>
               <li><a href="/copyleft-compliance/glossary.html">Glossary of Terms</a></li>
-              <li><a href="#fixme">Q&A</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>
+              <li><a href="/about/filings/">Public Filings</a></li>
             </ul>
           </li>
           <li class="news"><a href="/news/">News</a>
@@ -104,14 +107,6 @@
               <li><a href="/press/">Press</a></li>
             </ul>
           </li>
-          <li class="about"><a href="/about/">About</a>
-            <ul>
-              <li><a href="#fixme">Who we are</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>
-          </li>
         </ul>
       </div>
       <div id="navbar-clear"></div>

www/conservancy/templates/frontpage.html

@@ -80,7 +80,7 @@ strategies that defend FOSS (such as copyleft). <a href="#fixme" class="orange">
     <h3 class="ttu">Term of the week</h3>
     <h4 class="f4 mt3 mb2 i navy">auditability</h4>
     <p>Ability to inspect the exact software running on a device. This includes version information, modifications and licensing information.</p>
-    <p><a href="#fixme" class="orange ttu">Visit our glossary of terms</a></p>
+    <p><a href="/copyleft-compliance/glossary.html" class="orange ttu">Visit our glossary of terms</a></p>
   </div>
 
   <div class="mh3 pt3">