Various updates to make the site ready for 2017.
authorZak Rogoff <zak@fsf.org>
Thu, 15 Sep 2016 22:26:11 +0000 (18:26 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 15 Sep 2016 22:26:11 +0000 (18:26 -0400)
2017/assets/img/site_logo_alternate-small.png [deleted file]
2017/assets/img/site_logo_alternate.png
2017/getting-around/index.html
2017/includes/banner.html
2017/includes/nav-list-1.html
2017/includes/nav-list-2.html
2017/includes/sidebar.html
2017/index.html
2017/sponsors/index.html

diff --git a/2017/assets/img/site_logo_alternate-small.png b/2017/assets/img/site_logo_alternate-small.png
deleted file mode 100644 (file)
index d8947ae..0000000
Binary files a/2017/assets/img/site_logo_alternate-small.png and /dev/null differ
index 8d3651e4fda0480fa714d7f1b10d53b621a08a23..6934fc71235d5d3a40852a3492f24e0d10d44088 100644 (file)
Binary files a/2017/assets/img/site_logo_alternate.png and b/2017/assets/img/site_logo_alternate.png differ
index 9c20d2602c68c7107fea47a5a528c5515392636b..cb0635c64311ea142758fcffd26d8fb3b7fd834c 100755 (executable)
@@ -7,8 +7,11 @@
 
 <h1>Travel</h1>
 
-<p><strong>LibrePlanet 2017 will held at the Stata Center at the Massachusetts Institute for Technology (32 Vassar St, Cambridge, MA 02139). Check out the <a href="#map">map</a> with restaurants and the Subway station near the conference.</strong></p>
+<p><strong>LibrePlanet 2017 will be held in the greater Boston area, but the venue is not yet announced.</strong></p>
 
+<!--<p><strong>LibrePlanet 2017 will held at the Stata Center at the Massachusetts Institute for Technology (32 Vassar St, Cambridge, MA 02139). Check out the <a href="#map">map</a> with restaurants and the Subway station near the conference.</strong></p>-->
+
+<!--
 <h2 id="map">Map</h2>
 
 <div class="thumbnail">
@@ -17,6 +20,7 @@
           alt="[Venue Map]"
           style="width:100%">
 </div>
+-->
 
 <div id="lp-panel" class="panel panel-default margin-top">
   <div class="panel-heading">
   </div>
 
   <div class="panel-body">
-    <p><a href="#map">Map</a></p>
+    <!--<p><a href="#map">Map</a></p>-->
     <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="#eating">Where to eat</a></p>
+    <!--<p><a href="#getting-around">Getting to the event locations</a></p>
+    <p><a href="#eating">Where to eat</a></p>-->
   </div>
 </div>
 
 <h3>Hotels</h3>
 
 <ul>
-  <li>Stay at a cute New England bed and breakfast like <a href="http://www.cambridgeinns.com/irving">the Irving</a> in Harvard Square. ($$)</li>
+  <li>Stay at a cute New England bed and breakfast like <a href="https://www.irvinghouse.com">Irving House</a> in Harvard Square. ($$)</li>
   <li><a href="http://www.johnjeffrieshouse.com/">The John Jeffries House</a> is another B&amp;B a short ride away on the red line at the Charles MGH stop. ($$)</li>
   <li><a href="http://www.harvardsquarehotel.com/">Harvard Square Hotel</a> is close to the red line and reasonably priced for a hotel in Harvard Square. ($$$)</li>
   <li><a href="http://www.charleshotel.com/">The Charles Hotel</a> in Harvard Square has valet parking. ($$$)</li>
-  <li><a href="http://cambridge.hyatt.com/en/hotel/home.html">The Hyatt Regency</a> overlooks the Charles river, providing a view of the Boston skyline. ($$$)</li>
-  <li><a href="http://www.marriott.com/hotels/travel/boscb-boston-marriott-cambridge">The Marriott</a> is located at the Kendall/MIT stop with many restaurants located nearby. ($$)</li>
+  <li><a href="https://cambridge.hyatt.com/en/hotel/home.html">The Hyatt Regency</a> overlooks the Charles river, providing a view of the Boston skyline. ($$$)</li>
+  <li><a href="https://www.marriott.com/hotels/travel/boscb-boston-marriott-cambridge">The Marriott</a> is located at the Kendall/MIT stop with many restaurants located nearby. ($$)</li>
   <li>The historic <a href="http://kendallhotel.com/">Kendall Hotel</a> is in the heart of the MIT campus. It was originally an 1800s firehouse. ($$$)</li>
   <li><a href="http://doubletree3.hilton.com/en/hotels/massachusetts/doubletree-suites-by-hilton-hotel-boston-cambridge-BOSSBDT/index.html">The Doubletree</a> is over the Charles river in Boston just two kilometers away. A 5 minute ride on the 64 or 70 bus takes you into Central Square. ($$$)</li>
-  <li>Also in Boston is the <a href="http://www.daysinn.com/hotels/massachusetts/boston/days-hotel-boston-harvard-fenway/hotel-overview?hotel_id=04159">Days Hotel of Boston</a>. The 86 or 70 bus picks up across the street (in front of the Star Market grocery) and takes you to Cambridge and the red line in approximately 10 minutes. ($$)</li>
+  <li>Also in Boston is the <a href="https://www.daysinn.com/hotels/massachusetts/boston/days-hotel-boston-harvard-fenway/hotel-overview?hotel_id=04159">Days Hotel of Boston</a>. The 86 or 70 bus picks up across the street (in front of the Star Market grocery) and takes you to Cambridge and the red line in approximately 10 minutes. ($$)</li>
 </ul>
 
 <h2 id="arriving">Arriving in the City</h2>
@@ -85,8 +89,9 @@
     <li>Commute to <a href="http://www.mbta.com/schedules_and_maps/rail/lines/stations/?stopId=191">South Station</a> for cities south of the city. The station is situated on the Red Line. You can take the North Red Line to the FSF office and get off at <a href="http://www.mbta.com/schedules_and_maps/subway/lines/stations/?stopId=13771">Park Street</a> or <a href="http://mbta.com/schedules_and_maps/subway/lines/stations/?stopId=11473">Downtown Crossing</a>. You can reach MIT by continuing north and disembarking at <a href="http://www.mbta.com/schedules_and_maps/subway/lines/stations/?stopId=12412">Kendall/MIT Station</a>.</li>
   </ul>
 
-  <p><b>If you have questions about travelling, contact Chrissie at sales@fsf.org.</b>
+  <p><b>If you have questions about travelling, contact us at campaigns@fsf.org.</b>
 
+<!--
     <h2 id="getting-around">Getting to the event locations</h2>
 
     <h3>Public Transportation</h3>
         <li><a href="http://chauchowcity.com/">Chau Chow City</a> can accommodate large groups. Their Chinese food proportions are substantial, and their cocktails are fun (some are literally on fire!) Vegetarian options.</li>
         <li><a href="http://www.samlagrassas.com/">Sam Lagrassa's</a> is famous for its sandwiches. Vegetarian options.</li>
       </ul>
-
+-->
       <!--#include virtual="/2017/includes/footer.html"-->
       <!--#include virtual="/2017/includes/common_js.html"-->
       <!--#include virtual="/2017/includes/getting_around_js.html"-->
index 9b128fdb9f79538c1de3b5248adb3df82e9fec0e..7a4a86f41fec5d97341380e3290552bf318e2f44 100755 (executable)
@@ -9,7 +9,7 @@
                                <a href="/2017/">
                                  <img src="/2017/assets/img/site_logo_alternate.png"
                                           class="img-responsive"
-                                          alt="[ LibrePlanet 2017 &mdash; Fork the System]" />
+                                          alt="[ LibrePlanet 2017 ]" />
                                </a>
                          </div>
                          <div id="lp16-date-place" class="col-sm-3 col-xs-2">
@@ -17,9 +17,8 @@
                                  remember to update it in the small
                                  screen navbar too (see below) -->
                                <p>
-                                 <strong><br>March 19-20<br />
-          MIT<br>
-          Cambridge, Massachusetts</strong>
+                                 <strong><br><br>March 25-26<br />
+          Greater Boston area</strong>
                                </p>
                          </div>
                           <!-- #top-right-desktop start -->
             <a class="navbar-brand" href="/2017/">
               <img src="/2017/assets/img/site_logo_alternate-small.png"
                    class="img-responsive"
-                   alt="[ LibrePlanet 2017 &mdash; Fork the System ]" />
+                   alt="[ LibrePlanet 2017 ]" />
             </a>
             <p class="navbar-text">
                <!-- Heads up! When updating date place, remember to
                update it in the lp banner too (see above) -->
-             <strong>March 19-20, MIT, Cambridge, MA</strong>
+             <strong>March 25-26, greater Boston area</strong>
            </p>
           </div>
 
index c060c1a03e4748d4a348f5d9bd53a94bb8f37652..38022d44ad11ad1facca5654506ea2f13e0ee13a 100644 (file)
@@ -1,5 +1,5 @@
 <!-- <li><a href="/2017/streaming">Livestream</a></li> -->
-<li class="program-link"><a href="/2017/program">Sessions, videos, & slides</a></li>
+<li class="program-link"><a href="/2016/program">Video sessions from last LibrePlanet</a></li>
 <!--<li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>-->
 <li class="getting-around-link"><a href="/2017/getting-around">Travel info</a></li>
 <li class="ahp-link"><a href="/2017/safe-space-policy/">Safe space policy</a></li>
index 049712cfe2111a5e6099e92918383e68221370ef..1d9145562267718489ffd385e06d683b5e243ce4 100644 (file)
@@ -2,4 +2,4 @@
 <!-- <li><a href="https://my.fsf.org/civicrm/event/register?id=43&amp;reset=1">Host a streaming party</a></li> -->
 <li class="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
 <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
-<li class="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li>
+<!-- <li class="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li> -->
index fb7e44e7f2b71744acb09865bda4fe444d3e3ffc..b461edda1a8dd77de4364fb54c277aa1fb7f0878 100755 (executable)
                                <strong>Recent Updates</strong>
                        </li>
                        <li class="list-group-item">
-                                       <strong>03/23/2016:</strong> <a href="https://www.fsf.org/news/hundreds-explore-ways-to-fork-the-system-with-free-software-at-libreplanet-2017">(Recap) Hundreds explore ways to Fork the System with free software at LibrePlanet 2016 </a></li>
+                                       <strong>06/21/2016:</strong> <a href="https://www.fsf.org/blogs/community/building-a-better-libreplanet-what-we-learned-from-the-conference-surveys">Building a better LibrePlanet: What we learned from the conference surveys</a></li>
                        <li class="list-group-item">
-                               <strong>02/17/2016:</strong> <a href="https://www.fsf.org/blogs/community/get-ready-to-fork-the-system-at-libreplanet">Program announced: Get ready to Fork the System at LibrePlanet</a></li>
+                                       <strong>03/23/2016:</strong> <a href="https://www.fsf.org/news/hundreds-explore-ways-to-fork-the-system-with-free-software-at-libreplanet-2017">(Recap) Hundreds explore ways to Fork the System with free software at LibrePlanet 2016</a></li>
                        <li class="list-group-item">
-                               <strong>01/27/2016:</strong> <a href="https://www.fsf.org/blogs/community/edward-snowden-will-kick-off-libreplanet-2017-will-you-be-there"> Edward Snowden will kick off LibrePlanet 2016: Will you be there?</a></li>
+                               <strong>02/17/2016:</strong> <a href="https://www.fsf.org/blogs/community/get-ready-to-fork-the-system-at-libreplanet">Program announced: Get ready to Fork the System at LibrePlanet</a></li>
                                        </ul>
                                </div> <!-- end of sidebar column -->
                                <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
index d11c1152f4852aa7c1b3b66db4df4bebf2dc2936..8b9389b1c66242da35b81edc636af80acb135fc8 100755 (executable)
@@ -25,7 +25,7 @@
 
                        <li class="item">
                        <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-                       alt="[ Apply for a scholarship ]">              
+                       alt="[ Apply for a scholarship ]">
                        <p class="carousel-caption-bottom"><a href="https://www.libreplanet.org/2016/scholarship_donation">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
                </p>
        </li>
@@ -186,11 +186,11 @@ Get excited for our keynote speakers!
 
 <!-- end of notification area -->
 
-<p class="lead">LibrePlanet is an annual conference hosted by the <a href="https://www.fsf.org">Free Software Foundation</a> for people who care about their digital freedoms, bringing together software developers, policy experts, activists, and computer users to learn skills, share accomplishments, and address challenges facing the free software movement. LibrePlanet 2016 will feature programming for a wide range of ages and experience levels.</p>
+<p class="lead">LibrePlanet is an annual conference hosted by the <a href="https://www.fsf.org">Free Software Foundation</a> for people who care about their digital freedoms, bringing together software developers, policy experts, activists, and computer users to learn skills, share accomplishments, and address challenges facing the free software movement. LibrePlanet 2017 will feature programming for a wide range of ages and experience levels.</p>
 
-<p>Organized around the theme "Fork the System", the conference's sessions will examine how free software creates the opportunity of a new path for its users, allows developers to fight the restrictions of a system dominated by proprietary software by creating free replacements, and is the foundation of a philosophy of freedom, sharing, and change.</p>
+<!--Theme paragraph.-->
 
-<p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>.<!-- Registration opens in October - sign up above to receive updates.--></p>
+<p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>. Registration opens soon - sign up above to receive updates.</p>
 
 <!--#include virtual="/2017/includes/footer.html"-->
 <!--#include virtual="/2017/includes/common_js.html"-->
index e2e6f64e40cb6afcc7071e139e0155aaa7f64c54..4f27df8454e24dd5652393b8a05de6bc15242759 100755 (executable)
@@ -7,13 +7,9 @@
 
 <h1>Thank you to our sponsors!</h1>
 <br><br>
-<img class="spnsr-logo" alt="[ Sponsor - Audeo ]" src="//static.fsf.org/nosvn/libreplanet/sponsor-logos/audeo.jpg">
-
-<img class="spnsr-logo" alt="[ Sponsor - Open Invention Network ]" src="//static.fsf.org/nosvn/libreplanet/sponsor-logos/oin.png">
-
-<img class="spnsr-logo" alt="[ Sponsor - Whole Foods Market ]" src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/sponsors/whole-foods.jpg">
-
-<img class="spnsr-logo" alt="[ Sponsor - Google ]" src="//static.fsf.org/nosvn/libreplanet/sponsor-logos/google.png">
+<!--
+<img class="spnsr-logo" alt="[ Sponsor - EXAMPLE ]" src="//static.fsf.org/nosvn/libreplanet/sponsor-logos/EXAMPLE.jpg">
+-->
 
       <!--#include virtual="/2017/includes/footer.html"-->
       <!--#include virtual="/2017/includes/common_js.html"-->