From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Mon, 23 Mar 2015 16:46:04 +0000 (-0400)
Subject: Adding SSI notification panel to display current media upload status, and putting... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1ff2c407d86877c1a246dadb6933383e5ad73722;p=libreplanet-static.git

Adding SSI notification panel to display current media upload status, and putting it up on homepage, along with a restyled survey link.
---

diff --git a/2015/index.html b/2015/index.html
index 10743ba4..39e4cd98 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -17,41 +17,41 @@
 				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/2015/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/2015/program/speakers.html#sandler">Karen Sandler</a>, <a href="https://libreplanet.org/2015/program/speakers.html#hill">Benjamin Mako Hill</a>, and<br><a href="https://libreplanet.org/2015/program/speakers.html#stallman">Richard Stallman</a> announced as keynote speakers.
-			</p>
-		</li>
+			<li class="item">
+				<img src="//static.fsf.org/nosvn/libreplanet/2015/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/2015/program/speakers.html#sandler">Karen Sandler</a>, <a href="https://libreplanet.org/2015/program/speakers.html#hill">Benjamin Mako Hill</a>, and<br><a href="https://libreplanet.org/2015/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/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.
+				</p>
+			</li>
+
+		</ul>
+		<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+
+		<!--
 
 		<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.
-			</p>
-		</li>
-
-	</ul>
-	<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
-
-	<!--
-
-	<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/2015/volunteer">Join us today.</a>
-</p>
+		<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/2015/volunteer">Join us today.</a>
+	</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
+<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>
 </p>
 </li>
@@ -134,14 +134,23 @@ and be part of LibrePlanet 2014!
 <p style="text-align:center;"><strong><a href="call_for_sessions" style="color:black; text-decoration:underline; font-size:150%;">The call for sessions deadline is extended! Propose your session by Sunday, November 9th at 19:59 EST (23:59 UTC).</a></strong></p>
 </div>-->
 
-
-<div class="alert alert-success margin-top">
-<p>If you attended LibrePlanet 2015, please fill out our <a href="https://libreplanet.org/2015/feedback" style="text-decoration:underline">feedback survey</a> so we can make the conference even better next year!</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/2015" style="text-decoration:underline; text-color:inherited">LibrePlanet 2015 site</a> is now available!</strong></p></div>
+<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 2015, please fill out our <a href="https://libreplanet.org/2015/feedback" style="text-decoration:underline">feedback survey</a> so we can make the conference even better next year!</p></div>
+			</div>
+		</div>
+		<div class="col-md-6"><!--#include virtual="/server/2015/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/2015" style="text-decoration:underline; text-color:inherited">LibrePlanet 2015 site</a> is now available!</strong></p></div>
 -->
 
 <!-- end of notification area -->
diff --git a/server/2015/media-status.html b/server/2015/media-status.html
new file mode 100644
index 00000000..e69de29b