removed `Promotional Opportunities' from sidebar.

[libreplanet-static.git] / 2014 / index.html

diff --git a/2014/index.html b/2014/index.html
index 199455ff2dafbb6f9c1f39187132d9540da259dc..4d236415d5c34f4b47cd4e27ecba8beeb5c68651 100644 (file)
--- a/2014/index.html
+++ b/2014/index.html
@@ -50,10 +50,8 @@
                  <div id="lp-nav" class="col-sm-3"> <!-- start of nav items -->
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
-                         <!--<li><a href="/2014/volunteer">Help plan LibrePlanet</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
                          <li><a href="/2014/video/">Watch the video</a></li>
-                         <li><a href="/2014/exhibit">Promotional opportunities</a></li>
                          <li>
                                <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
                                  Share your ideas</a></li>
@@ -63,6 +61,7 @@
 
                          <li><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
+                         <li><a href="/2014/volunteer">Volunteer</a></li>
               <li><a href="/2014/live">Participate online</a></li>
                  <li><a href="/2014/scholarship_donation">Donate to the scholarship fund</a></li>
 
@@ -90,7 +89,7 @@
                          
                          <!-- wrapper for slides -->
                          <ul class="carousel-inner list-unstyled">
-<li class="item active">
+<li class="item">
                                  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.png"
                                           alt="[ A presentation at LibrePlanet 2013]">
                                  <p class="carousel-caption-tr">
@@ -105,7 +104,7 @@
                                        <a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/live">Bookmark the remote participation page</a></p>
                                </li>
 
-                               <li class="item">
+                               <li class="item active">
                                  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.png"
                                           alt="[MIT's Stata Center]">
                                  <p class="carousel-caption-tl">
@@ -190,7 +189,7 @@ Watch and share our volunteer-created LibrePlanet video<br>
                                        <a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">
                                          Join the planning committee
                                        </a>
-                               </li>
+                               </li> -->
                          <!-- controls -->
                          <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
                                <span class="glyphicon glyphicon-chevron-left"></span>
@@ -206,9 +205,9 @@ Watch and share our volunteer-created LibrePlanet video<br>
                          <p>
                                 This year, the theme of LibrePlanet is "Free Software, Free Society." How can free software protect journalists, whistleblowers, activists, and regular computer users from government and corporate surveillance? How can free software, or free software values like copyleft, community development, and transparency, be used by people fighting to create free societies around the world? What challenges are standing between us and our goal of free software ubiquity? With your help, we'll tackle these questions and more at LibrePlanet 2014, March 22-23 in Cambridge, MA. 
                          </p>
-<p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now</a>. We encourage you to <a href="https://crm.fsf.org/civicrm/event/register?reset=1&id=13">register in advance</a>, but registration will be available at the door on both days of the conference.</p>
+<p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now</a>. We encourage you to <a href="https://crm.fsf.org/civicrm/event/register?reset=1&amp;id=13">register in advance</a>, but registration will be available at the door on both days of the conference.</p>
 
-<p>On Monday, March 24th (the day after LibrePlanet), the Free Software Foundation will hold a GPL Enforcement and Legal Ethics seminar at Suffolk University. <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">This is a separate event and requires separate registration</a>.</p>
+<p>There are two other events, with separate registration, taking place before and after the conference. On Friday, March 21st, community-members will hold the <a href="https://www.fsf.org/blogs/community/the-0th-spinachcon">0th SpinachCon</a>, where users and developers will improve the user experience of free software programs. On Monday, March 24th (the day after LibrePlanet), the Free Software Foundation will hold a <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">GPL Enforcement and Legal Ethics seminar</a> at Suffolk University in Boston.</p>
                        </div> <!-- end of LP14 text -->
 
                  </div> <!-- end of content column -->