X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=2016%2Findex.html;h=a470641c371b2e014b8feb0cf1d386c0dae5c4af;hb=99a82199a526255cc1f83c3bb9c265266b4cfc6f;hp=5acc0832c7ae4b2bbda512e16a2c75380af25bd8;hpb=3b20a5f907eaf43c2b4d7788d325f01bd0c9d554;p=libreplanet-static.git

diff --git a/2016/index.html b/2016/index.html
index 5acc0832..a470641c 100755
--- a/2016/index.html
+++ b/2016/index.html
@@ -1,73 +1,113 @@
-<!--#include virtual="/server/2016/header.html"-->
+<!--#include virtual="/2016/includes/header.html"-->
 
 <title>LibrePlanet 2016</title>
 
-<!--#include virtual="/server/2016/banner.html"-->
-<!--#include virtual="/server/2016/sidebar.html"-->
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
 
 <!-- start of carousel -->
 <div id="lpc-carousel" class="carousel slide">
 
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
-			<li class="item active">
+
+				<li class="item active">
 				<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
-				<p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</p>
+				<p class="carousel-caption-bottom">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/news/hundreds-explore-ways-to-fork-the-system-with-free-software-at-libreplanet-2016">Read the recap</a>.</p>
 			</li>
 
-		</ul>
+			<li class="item">
+				<img src="//static.fsf.org/nosvn/libreplanet/feature-images/snowden-feature.png"
+				alt="[ Snowden Keynote ]">
+				<p class="carousel-caption-bottom">
+					Explore a wealth of <a href="program/index.html">session videos and slides</a>.</p>
+				</li>
+
+			<li class="item">
+			<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+			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>
 
-		<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+				</ul>
 
-		<!--
+				<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT. Their formatting might not be quite right, but reusing them is much faster than making them from scratch.
+				<li class="item">
+					<img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
+					alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
+					<p class="carousel-caption-bottom">
+						<a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
+					</li>
 
 		<li class="item">
-		<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-		alt="[ Apply for a scholarship ]">
-		<p class="lead carousel-caption-tl"><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>
+			<a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/lp2016-video.png"
+			alt="[ LibrePlanet 2016 promotional video ]"></a>
+			<p class="carousel-caption-bottom"><a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">Watch the video for a taste of what's to come at LibrePlanet</a></p>
+			</li>
+
+
+			<li class="item">
+			<a href="streaming"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/remote_participation.png"
+			alt="[ A globe. ]"></a>
+			<p class="carousel-caption-bottom">Wherever you are, we invite you to participate in LibrePlanet via livestream</a>.
+			</li>
+
+
+						<li class="item">
+							<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
+							alt="[ Aleph Objects' Lulzbot 3D printer ]">
+							<p class="carousel-caption-bottom">
+								<a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">
+									Apply for an exhibition table</a> for your free software business or project.
+								</p>
+							</li>
 
 <li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2016/site/graphics/carousel/keynotes-slide.jpg"
-alt="[ Karen Sandler, Mako Hill and Richard Stallman speaking at previous LibrePlanets ]">
-<p class="carousel-caption-bl">
-<a href="https://libreplanet.org/2016/program/speakers.html#sandler">Karen Sandler</a>, <a href="https://libreplanet.org/2016/program/speakers.html#hill">Benjamin Mako Hill</a>, and<br><a href="https://libreplanet.org/2016/program/speakers.html#stallman">Richard Stallman</a> announced as keynote speakers.
+<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+alt="[ Apply for a scholarship ]">
+<p class="lead carousel-caption-tl"> <a href="scholarships">Apply for a travel scholarship</a> by November 30th or <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>
 
+				<li class="item ">
+					<img src="//static.fsf.org/nosvn/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
+					alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
+					<p class="carousel-caption-bottom">
+						<a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list now</a> and meet the people you'll spend time with at LibrePlanet.</p>
+					</li>
+
+
+
 <li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
-alt="[ Become a member ]">
-<p class="lead carousel-caption-bl"> <a href="https://my.fsf.org/associate/support_freedom">Join the Free Software Foundation as a member</a> and get<br />gratis conference admission and other perks.
+<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+alt="[ Apply for a scholarship ]">
+<p class="lead carousel-caption-tl"> <a href="scholarships">Apply for a travel scholarship</a> by November 30th or <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>
 
-		<li class="item">
-		<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.jpg" alt="[A globe]">
-		<p class="carousel-caption-tr">
-		Wherever you are, we invite you to participate in<br>LibrePlanet <a href="live">via chat and livestream</a>.</p>
-	</li>
-
-		<li class="item">
-		<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.jpg" alt="[ A presentation at LibrePlanet 2013]">
-		<p class="carousel-caption-center">
-		Volunteers keep LibrePlanet spinning <br>(and get great perks as well).<br>
-		<a href="https://libreplanet.org/2016/volunteer">Join us today.</a>
-	</p>
+	<li class="item">
+	<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
+	alt="[ Open house at LibrePlanet 2015 ]">
+	<p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get gratis conference admission and other perks.
+</p>
 </li>
 
 <li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
-alt="[ Aleph Objects' Lulzbot 3D printer ]">
-<p class="carousel-caption-tr">
-LibrePlanet is a great place to spread the word about your free software business or project<br>
-<a href="https://libreplanet.org/2014/exhibit">
-Apply for an exhibition table
-</a>
+<img src="//static.fsf.org/nosvn/libreplanet/2016/site/graphics/carousel/keynotes-slide.jpg"
+alt="[ Karen Sandler, Mako Hill and Richard Stallman speaking at previous LibrePlanets ]">
+<p class="carousel-caption-bl">
+<a href="https://libreplanet.org/2016/program/speakers.html#sandler">Karen Sandler</a>, <a href="https://libreplanet.org/2016/program/speakers.html#hill">Benjamin Mako Hill</a>, and<br><a href="https://libreplanet.org/2016/program/speakers.html#stallman">Richard Stallman</a> announced as keynote speakers.
 </p>
 </li>
 
+<li class="item">
+<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.jpg" alt="[ A presentation at LibrePlanet 2013]">
+<p class="carousel-caption-center">
+Volunteers keep LibrePlanet spinning <br>(and get great perks as well).<br>
+<a href="https://libreplanet.org/2016/volunteer">Join us today.</a>
+</p>
+</li>
 
 <li class="item">
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
@@ -76,13 +116,6 @@ alt="[ Apply for a scholarship ]">
 </p>
 </li>
 
-<li class="item active">
-<img src="//static.fsf.org/nosvn/libreplanet/2016/site/graphics/crockford_and_levy_2014.jpg"
-alt="[ Two speakers at LibrePlanet 2014]">
-<p class="carousel-caption-tr">
-Call for Sessions open until November 9th.<br><a href="call_for_sessions">Submit a proposal today.</a><br>
-</li>
-
 <li class="item active">
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.jpg"
 alt="[MIT's Stata Center]">
@@ -113,63 +146,53 @@ alt="[ Keynote speakers]">
 Get excited for our keynote speakers!
 </a></p>
 </li>
+-->
 
-<li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-expand-the-tent.jpg"
-alt="[ The Expanding the Tent panel ]">
-<p class="carousel-caption-tr">
-<a class="btn btn-default btn-carousel"
-href="https://libreplanet.org/2014/register">
-Register now
-</a>
-and be part of LibrePlanet 2014!
-</p>
-
-</li> -->
 
+<!-- These are the controls fors the carousel. Comment them in if you want the little navigation chevrons and the skrims that appear when you mouse over the edges of the active image.-->
 
 
-<!-- controls -->
 <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
 	<span class="glyphicon glyphicon-chevron-left"></span>
 </a>
 <a class="right carousel-control" href="#lpc-carousel" data-slide="next">
 	<span class="glyphicon glyphicon-chevron-right"></span>
-</a>
-</div> <!-- end of carousel -->
+</a>  <!--end of carousel -->
+</div>
 
 
 <!-- start of notification area -->
 
 <div class="row">
 	<!--<div class="col-md-6">
-		<div class="panel panel-primary margin-top">
-			<div class="panel-heading">
-				<h3 class="panel-title">Help improve the conference!</h3>
-			</div>
-			<div class="panel-body">
-				<p>If you attended LibrePlanet 2016, please fill out our <a href="https://libreplanet.org/2016/feedback">feedback survey</a> so we can make the conference even better next year!</p></div>
-			</div>
-		</div>-->
+	<div class="panel panel-primary margin-top">
+	<div class="panel-heading">
+	<h3 class="panel-title">Help improve the conference!</h3>
+</div>
+<div class="panel-body">
+<p>If you attended LibrePlanet 2016, please fill out our <a href="https://libreplanet.org/2016/feedback">feedback survey</a> so we can make the conference even better next year!</p></div>
+</div>
+</div>-->
+<!-- This is an SSI include for the media status box we use after the conference. To make it work, remove this comment and comment *in* the #include line.
 <div class="col-md-12">
-			<!--#include virtual="/server/2016/media-status.html"-->
-		</div>
-	</div>
+#include virtual="/2016/includes/media-status.html"
+</div>-->
+</div>
 
-	<!-- // next year's site available
-	<div class="alert alert-success margin-top">
-	<p style="text-align:center; font-size:large"><strong>The <a href="https://www.libreplanet.org/2016" style="text-decoration:underline; text-color:inherited">LibrePlanet 2016 site</a> is now available!</strong></p></div>
+<!-- // next year's site available
+<div class="alert alert-success margin-top">
+<p style="text-align:center; font-size:large"><strong>The <a href="https://www.libreplanet.org/2016" style="text-decoration:underline; text-color:inherited">LibrePlanet 2016 site</a> is now available!</strong></p></div>
 -->
 
 <!-- end of notification area -->
 
-<p class="lead">LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2016 will feature programming for all 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 2016 will feature programming for a wide range of ages and experience levels.</p>
 
-<p>This year, the theme of LibrePlanet is "Free Software Everywhere." The weekend's sessions touch on the many places and ways that free software is used around the world, as well as strategizing ways to make free software ubiquitous. We'll talk about some contexts where free software is thriving, and some others where it needs a push. We'll hear from people who have worked to gain a foothold for free software in their workplace or community. We'll explore the state of software freedom on all of the myriad pieces of hardware we use, including laptops, phones, tablets, and even coffee makers. At LibrePlanet, we're taking software freedom around the world, to outer space, and through all kinds of industries, governments, organizations, fields of study, and communities.</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>
 
-<p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">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 in October - sign up above to receive updates.--></p>
 
-<!--#include virtual="/server/2016/footer.html"-->
-<!--#include virtual="/server/2016/common_js.html"-->
-<!--#include virtual="/server/2016/home_js.html"-->
-<!--#include virtual="/server/2016/close.html" -->
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/home_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->