updated nav bar.

diff --git a/2019/includes/nav-list-1.html b/2019/includes/nav-list-1.html
index ce6195b365b96d16bf5ce3816fd40c3dd87f4887..a57f8c18df3f56e7348441b3b68b1193ebb7ea31 100644 (file)
--- a/2019/includes/nav-list-1.html
+++ b/2019/includes/nav-list-1.html
@@ -1,2 +1,3 @@
 <li><a href="https://my.fsf.org/civicrm/event/info?reset=1&id=71">Register!</a></li>
-<li><a href="https://my.fsf.org/node/17">Apply for a scholarship</a></li>
+<li><a href="https://my.fsf.org/node/21">Apply for a scholarship</a></li>
+<li><a href="https://my.fsf.org/node/20/">Submit a session</a></li>

diff --git a/2019/includes/nav-list-2.html b/2019/includes/nav-list-2.html
index a703409f07fa55d739577aba560b11affd989c6e..3e24bcd4d058b877dbdd4d813f3def500d66cef9 100644 (file)
--- a/2019/includes/nav-list-2.html
+++ b/2019/includes/nav-list-2.html
@@ -1,4 +1,4 @@
-<li class="getting-around-link"><a href="/2019/getting-around">Travel, Food & Lodging</a></li>
+<!-- <li class="getting-around-link"><a href="/2019/getting-around">Travel, Food & Lodging</a></li> -->
 <li class="safe-space-policy-link"><a href="/2019/safe-space-policy/">Safe Space Policy</a></li>
 <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=60">Build the scholarship fund</a></li>
 <li class="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>

diff --git a/2019/safe-space-policy/index.html b/2019/safe-space-policy/index.html
index ce81d27b14865b33b2f0b9e6f95d9b62d6b9fd93..494867268833f98701a2f964f8752bde14111c86 100755 (executable)
--- a/2019/safe-space-policy/index.html
+++ b/2019/safe-space-policy/index.html
@@ -1,75 +1,37 @@
-<!--#include virtual="/2019/includes/header.html"-->
-
-<title>LibrePlanet 2019 &mdash; Safe space policy</title>
-
-<!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/includes/sidebar.html"-->
-
-<h1> Safe Space Policy </h1>
-
-<p><i>If you feel there has been a violation of the following policy,
-please contact a member of the LibrePlanet incident response
-team--details on this will be announced closer to the conference. You
-can identify them by the yellow STAFF flag on their name badge. If you
-need help finding them, ask any volunteer or FSF staff member, or go
-to the Welcome Desk or GNU Press table. Email contact:
-campaigns@fsf.org.</i></p>
-
-<p>The FSF is dedicated to providing a harassment-free LibrePlanet
-experience for everyone.</p>
-
-<ul>
-    <li><p>We do not tolerate harassment of conference participants in
-        any form. Offensive or graphic sexual language and imagery is
-        not appropriate for any conference venue, including talks.</p>
-    </li>
-
-    <li><p>Conference participants violating these rules may be
-        sanctioned or expelled from the conference at the discretion
-        of the conference organizers.</p>
-    </li>
-</ul>
-
-<p>Harassment includes offensive verbal comments related to gender,
-sexual orientation, disability, physical appearance, age, body size,
-race, religion, sexual images in public spaces, deliberate
-intimidation, stalking, following, harassing photography or recording,
-sustained disruption of talks or other events, inappropriate physical
-contact, and unwelcome sexual attention.</p>
-
-<ul>
-    <li><p>Participants asked to stop any harassing behavior are
-        expected to comply immediately.</p></li>
-
-    <li><p>If a participant engages in harassing behavior, the
-    conference organizers may take any action they deem appropriate,
-    including warning the offender or expulsion from the conference.</p></li>
-
-    <li><p>If you are being harassed, notice that someone else is
-    being harassed, or have any other concerns, please contact a
-    member of the FSF staff immediately. FSF staff are available in
-    every conference session and at the information desk throughout
-    the conference.</p></li>
-
-    <li><p>Conference staff will be happy to help participants contact
-    hotel/venue security or local law enforcement, provide escorts, or
-    otherwise assist those experiencing harassment to feel safe for
-    the duration of the conference.</p></li>
-</ul>
-
-<p><b>We value your attendance and hope you enjoy the conference.</b></p>
-
+<!--#include virtual="/2018/includes/header.html"-->
+
+<title>LibrePlanet 2018 &mdash; Safe space policy</title>
+
+<!--#include virtual="/2018/includes/banner.html"-->
+<!--#include virtual="/2018/includes/sidebar.html"-->
+
+                       <h1> Safe Space Policy </h1>
+
+                       <p><i>If you feel there has been a violation of the following policy, please contact a member of the LibrePlanet incident response team--details on this will be announced closer to the conference. You can identify them by the yellow STAFF flag on their name badge. If you need help finding them, ask any volunteer or FSF staff member, or go to the Welcome Desk or GNU Press table. Email contact: campaigns@fsf.org.
+</i></p>
+                       <p>The FSF is dedicated to providing a harassment-free LibrePlanet experience for everyone.
+</p>
+<ul><li> We do not tolerate harassment of conference participants in any form. Offensive or graphic sexual language and imagery is not appropriate for any conference venue, including talks.
+</li></ul>
+<ul><li> Conference participants violating these rules may be sanctioned or expelled from the conference at the discretion of the conference organizers.
+</li></ul>
+<p>Harassment includes offensive verbal comments related to gender, sexual orientation, disability, physical appearance, age, body size, race, religion, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, sustained disruption of talks or other events, inappropriate physical contact, and unwelcome sexual attention.
+</p>
+<ul><li> Participants asked to stop any harassing behavior are expected to comply immediately.
+</li></ul>
+<ul><li> If a participant engages in harassing behavior, the conference organizers may take any action they deem appropriate, including warning the offender or expulsion from the conference.
+</li></ul>
+<ul><li> If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of the FSF staff immediately. FSF staff are available in every conference session and at the information desk throughout the conference.
+</li></ul>
+<ul><li> Conference staff will be happy to help participants contact hotel/venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference.
+</li></ul>
+<p><b>We value your attendance and hope you enjoy the conference.</b>
+</p>
 <hr>
-
-<p class="text-muted">This policy is based on several other policies,
-including the OLF anti-harassment policy, written by Esther Filderman
-and Beth Lynn Eicher, and the Con Anti-Harassment Project. Mary
-Gardiner, Valerie Aurora, Sarah Smith, and Donna Benjamin generalized
-the policies and added supporting material. Many members of LinuxChix,
-Geek Feminism and other groups contributed to this work.</p>
-
-
-<!--#include virtual="/2019/includes/footer.html"-->
-<!--#include virtual="/2019/includes/common_js.html"-->
-<!--#include virtual="/2019/includes/safe_space_js.html"-->
-<!--#include virtual="/2019/includes/close.html" -->
+<p class="text-muted">This policy is based on several other policies, including the OLF anti-harassment policy, written by Esther Filderman and Beth Lynn Eicher, and the Con Anti-Harassment Project. Mary Gardiner, Valerie Aurora, Sarah Smith, and Donna Benjamin generalized the policies and added supporting material. Many members of LinuxChix, Geek Feminism and other groups contributed to this work.
+</p>
+<!--#include virtual="/2018/includes/footer.html"-->
+<!--#include virtual="/2018/includes/common_js.html"-->
+<!--#include virtual="/2018/includes/safe_space_js.html"-->
+<!--#include virtual="/2018/includes/ahp_js.html"-->
+<!--#include virtual="/2018/includes/close.html" -->