Propagating new sidebar with scholarship stuff to the whole site.

diff --git a/2014/exhibit/index.html b/2014/exhibit/index.html
index 880e7d125d61e547506a592c433bf56d6524361c..3a77e2e7bfe6bad79066b20fd8643347e8838eaf 100644 (file)
--- a/2014/exhibit/index.html
+++ b/2014/exhibit/index.html
@@ -34,7 +34,7 @@
                        </div> <!-- end of Register button -->
                  </div>
                </div> <!-- end of header container -->
-         </div> <!-- end of lp banner -->
+         </div> <!-- end of lp banner -->      
 
          <div class="container"> <!-- start of container -->
                <div class="row">

diff --git a/2014/volunteer/confirmation.html b/2014/volunteer/confirmation.html
index 7f1813d2e23aed4629593bf3a6323b1b209c3166..9d108f93c8445701b365073572bf2ffb800b75cc 100644 (file)
--- a/2014/volunteer/confirmation.html
+++ b/2014/volunteer/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
@@ -46,13 +46,22 @@
                        </p>
                        <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 class="active"><a href="/2014/volunteer">Help plan LibrePlanet</a></li>
                          <li><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/volunteer/index.html b/2014/volunteer/index.html
index 31a2597042b4ed9bfb1d3a9f0386dacc4b336595..6f07be9d8eb4538f13cd0ffb34b531e5c8b325f9 100644 (file)
--- a/2014/volunteer/index.html
+++ b/2014/volunteer/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>