From cdc7a550a4faa30e3eabfe67e55ba1696e321211 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Mon, 23 Dec 2013 16:40:17 -0500
Subject: [PATCH] Propagating new sidebar with scholarship stuff to the whole
 site.

---
 2014/exhibit/confirmation.html | 13 +++++++++++--
 2014/exhibit/index.html        | 11 ++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/2014/exhibit/confirmation.html b/2014/exhibit/confirmation.html
index 1f76086c..f15faee5 100644
--- a/2014/exhibit/confirmation.html
+++ b/2014/exhibit/confirmation.html
@@ -38,7 +38,7 @@
 
 	  <div class="container"> <!-- start of container -->
 		<div class="row">
-		  <div class="col-sm-3"> <!-- start of nav items -->
+<div class="col-sm-3"> <!-- start of nav items -->
 			<p class="text-center lp-home">
 			  <a class="text-muted" href="/2014/">
 				<span class="glyphicon glyphicon-chevron-left"></span> Home
@@ -47,12 +47,21 @@
 			<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/exhibit">Promotional opportunities</a></li>
+			  <li class="active"><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>
+			 </ul>
+
+			<ul class="nav nav-pills nav-stacked">
+
 			  <li><a href="/2014/logistics">Lodging</a></li>
+		  <li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>
+		  <li><a href="/2014/scholarship_donation">Donate to the scholarship fund</a></li>
+
 			</ul>
+
+
 			<ul class="nav nav-pills nav-stacked">
 			  <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
 			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
diff --git a/2014/exhibit/index.html b/2014/exhibit/index.html
index 24d7c569..880e7d12 100644
--- a/2014/exhibit/index.html
+++ b/2014/exhibit/index.html
@@ -38,7 +38,7 @@
 
 	  <div class="container"> <!-- start of container -->
 		<div class="row">
-		  <div class="col-sm-3"> <!-- start of nav items -->
+<div class="col-sm-3"> <!-- start of nav items -->
 			<p class="text-center lp-home">
 			  <a class="text-muted" href="/2014/">
 				<span class="glyphicon glyphicon-chevron-left"></span> Home
@@ -51,8 +51,17 @@
 			  <li>
 				<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
 				  Share your ideas</a></li>
+			 </ul>
+
+			<ul class="nav nav-pills nav-stacked">
+
 			  <li><a href="/2014/logistics">Lodging</a></li>
+		  <li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>
+		  <li><a href="/2014/scholarship_donation">Donate to the scholarship fund</a></li>
+
 			</ul>
+
+
 			<ul class="nav nav-pills nav-stacked">
 			  <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
 			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
-- 
2.25.1