From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Tue, 14 Oct 2014 21:34:16 +0000 (-0400)
Subject: Bunch o little updates prepping for registration launch.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c55ac574606ba1a72bf7737941827a0ec8e81df6;p=libreplanet-static.git

Bunch o little updates prepping for registration launch.
---

diff --git a/2015/index.html b/2015/index.html
index 8fa7b9c4..c113d856 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -32,7 +32,7 @@
 	<li class="list-group-item">
 		   10/15/2014: <a href="https://crm.fsf.org/civicrm/event/register?reset=1&id=20">Registration</a> is now open!</li>
 
-	<li class="list-group-item">9/16/2014: <a href="https://www.fsf.org/news/libreplanet-is-coming-march-21-22-2015-call-for-proposals-now-open-for-annual-free-software-conference">LibrePlanet is coming March 21-22, 2015, call for proposals now open for annual free software conference</a></li>
+	<li class="list-group-item">09/16/2014: <a href="https://www.fsf.org/news/libreplanet-is-coming-march-21-22-2015-call-for-proposals-now-open-for-annual-free-software-conference">LibrePlanet is coming March 21-22, 2015, call for proposals now open for annual free software conference</a></li>
 
 	  </ul>
 	</div> <!-- end of Updates -->
diff --git a/server/2015/banner.html b/server/2015/banner.html
index 8179129a..c3630486 100644
--- a/server/2015/banner.html
+++ b/server/2015/banner.html
@@ -14,9 +14,8 @@
 			  </div>
 			  <div class="col-sm-3">
 				<p class="text-muted">
-				  <strong>March 21-22<br />
-					Cambridge, MA</strong><br />
-				  Registration opens in October</p>
+				  <strong><br>March 21-22<br />
+					Cambridge, MA</strong></p>
 			  </div>
 			</div><!-- end of lp header -->
 
diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 470ba024..65efc790 100644
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -15,6 +15,8 @@
               <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
               <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
               <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
+              <li id="scholarship-link"><a href="/2015/scholarships">Apply for a Scholarship</a></li>
+
 
               <!--<li><a href="/2015/video/">Watch the video</a></li>-->
             </ul>