Propagating new sidebar with scholarship stuff to the whole site.

diff --git a/2014/exhibit/confirmation.html b/2014/exhibit/confirmation.html
index 1f76086cead0da99870523a1c12b1120b22c488b..f15faee5d1694ea2a36d78cb92ffe1bd8ad6c3a3 100644 (file)
--- 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 24d7c5690b5f9e1e7c6d9c7eabe5cc8038b87cad..880e7d125d61e547506a592c433bf56d6524361c 100644 (file)
--- 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>