Various changes and improvements to get the site close to ready for launch.

diff --git a/2016/assets/css/custom.css b/2016/assets/css/custom.css
index 579f3d0a8f8a288d5fbe6d67eb81e096183ffba9..2d4413a0d388c82f30b81fbb883927526fbb4423 100644 (file)
--- a/2016/assets/css/custom.css
+++ b/2016/assets/css/custom.css
@@ -434,6 +434,7 @@ hr {
 .lp-banner {
   box-shadow: 0px 1px 5px rgba(255, 255, 255, 0.7);
   margin-bottom: 20px;
+  border-bottom: 3px solid rgba(88, 208, 121, 0.8);
   text-shadow: 0px 1px 0px #ffffff;
   background-color: rgb(250, 250, 250);
 }

diff --git a/2016/getting_around/index.html b/2016/getting_around/index.html
index b66169c9955ee6f5f939d73d723211642f3bfb44..df88443660e9044dc9f771d31c96807e662ca31b 100755 (executable)
--- a/2016/getting_around/index.html
+++ b/2016/getting_around/index.html
@@ -7,7 +7,7 @@
 
 <h1>Travel</h1>
 
-<p><strong>LibrePlanet 2015 will be held at the Massachusetts Institute of Technology's Stata Center, at 32 Vassar St, Cambridge, MA 02139.</strong></p>
+<p><strong>LibrePlanet 2016 will be held in or near Boston, Massachusetts, but the exact location is TBD.</strong></p>
 
 <div id="lp-panel" class="panel panel-default margin-top">
   <div class="panel-heading">
@@ -21,9 +21,9 @@
 
     <p><a href="#lodging">Where to stay</a></p>
     <p><a href="#arriving">Arriving in Boston</a></p>
-    <p><a href="#getting_around">Getting to the event locations</a></p>
+    <!--<p><a href="#getting_around">Getting to the event locations</a></p>
     <p><a href="#eating">Where to eat</a></p>
-    <p><a href="#map">Map</a></p>
+    <p><a href="#map">Map</a></p>-->
   </div>
 </div>
 <h2 id="lodging">Where to stay</h2>
@@ -77,6 +77,7 @@
 
   <p><b>If you have questions about travelling, contact Chrissie at sales@fsf.org.</b>
 
+<!-- EVERYTHING BELOW HERE IS COMMENTED OUT UNTIL THE EVENT LOCATION IS CONFIRMED
     <h2 id="getting_around">Getting to the event locations</h2>
 
     <h3>Public Transportation</h3>
@@ -188,6 +189,7 @@
           alt="[Venue Map]"
           style="width:100%">
 </div>
+-->
 
 
       <!--#include virtual="/server/2016/footer.html"-->

diff --git a/2016/anti-harassment/index.html b/2016/safe-space-policy/index.html
similarity index 89%
rename from 2016/anti-harassment/index.html
rename to 2016/safe-space-policy/index.html
index de85af57b04217c50e1e0e3d8da2bee8b6909293..d29dc8b8bb15c3209cd1cbbb4ca89826d51ff3b8 100755 (executable)
--- a/2016/anti-harassment/index.html
+++ b/2016/safe-space-policy/index.html
@@ -1,13 +1,13 @@
 <!--#include virtual="/server/2016/header.html"-->
 
-<title>LibrePlanet 2016 &mdash; Anti-Harassment Policy</title>
+<title>LibrePlanet 2016 &mdash; Safe space policy</title>
 
 <!--#include virtual="/server/2016/banner.html"-->
 <!--#include virtual="/server/2016/sidebar.html"-->
 
                        <h1> Anti-Harassment Policy </h1>
 
-                       <p><i>Libby Reinish, FSF campaigns manager, is the contact person for any reports of violations of the anti-harassment policy during LibrePlanet 2016. If you need to file a report, find Libby or ask a staff member to page her.</i></p>
+                       <p><i>If you need to file a report, find a staff member or ask a  volunteer to help you find one.</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.

diff --git a/server/2016/banner.html b/server/2016/banner.html
index e1d979a2560a287d9fac69facb05de74c256d74c..51d227fc6fcf7930e92898b59d238d85ea3fa2bf 100755 (executable)
--- a/server/2016/banner.html
+++ b/server/2016/banner.html
@@ -15,7 +15,8 @@
                          <div id="lp16-date-place" class="col-sm-3 col-xs-2">
                                <p>
                                  <strong><br>March 19-20<br />
-          Boston area</strong>
+          Greater Boston<br>
+          Exact location TBD</strong>
                                </p>
                          </div>
                        </div><!-- end of lp header -->

diff --git a/server/2016/sidebar.html b/server/2016/sidebar.html
index 8ba6f1b203dd36753e1033dbc5bd43c87ba1b7f2..550834397d705376be80085b864f52dba5638fd3 100755 (executable)
--- a/server/2016/sidebar.html
+++ b/server/2016/sidebar.html
@@ -22,7 +22,7 @@
                -->
 
                <ul class="nav nav-pills nav-stacked">
-                       <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a Session</a></li>
+                       <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a session</a></li>
                        <li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
                        <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
                </ul>
@@ -30,8 +30,8 @@
                <ul class="nav nav-pills nav-stacked">
                        <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
                        <li id="getting_around-link"><a href="/2016/getting_around">Travel info</a></li>
-                       <li><a href="https://libreplanet.org/2015/scholarship_donation">Build the scholarship fund</a></li>
-                       <li id="ahp-link"><a href="/2016/anti-harassment/">Safe space policy</a></li>
+                       <li><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&id=33">Build the scholarship fund</a></li>
+                       <li id="ahp-link"><a href="/2016/safe-space-policy/">Safe space policy</a></li>
                </ul>
 
                <ul class="nav nav-pills nav-stacked">
@@ -53,7 +53,7 @@
                                <li class="list-group-item">
                                        <strong>09/10/2015:</strong> <a href="https://www.fsf.org/blogs/community/who-is-improving-the-world-through-free-software-nominate-them-now">Nominate your heroes for a free software award!</a></li>
                                <li class="list-group-item">
-                                       <strong>03/23/2015:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2015-highlights-and-what-comes-next">LibrePlanet 2016: Highlights and what comes next</a></li>
+                                       <strong>03/23/2015:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2015-highlights-and-what-comes-next">LibrePlanet 2015: Highlights and what comes next</a></li>
 
                                        </ul>
                                </div> <!-- end of sidebar column -->