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

---
 2014/scholarships/confirmation.html | 11 ++++++++++-
 2014/scholarships/index.html        | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/2014/scholarships/confirmation.html b/2014/scholarships/confirmation.html
index 5c277fa4..19dbfa70 100644
--- a/2014/scholarships/confirmation.html
+++ b/2014/scholarships/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
@@ -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 class="active"><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/scholarships/index.html b/2014/scholarships/index.html
index 24972c75..d105fe48 100644
--- a/2014/scholarships/index.html
+++ b/2014/scholarships/index.html
@@ -61,7 +61,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
@@ -74,8 +74,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 class="active"><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