updated sidebar: added `exhibit hall' link; moved around `live' link & `share your...

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index 8fdb1d35e88b8984c5c9cd9f1725edad7198e1b0..5f982eec005f0f23023a8bbc40479a0c01a4cae4 100644 (file)
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -57,10 +57,9 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">
@@ -68,13 +67,14 @@
                          <li><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li class="active"><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/call_for_sessions/confirmation.html b/2014/call_for_sessions/confirmation.html
index 6ec6917127ff7ee9487ee449934bea05e0716a8c..7bdd9be22f1a9e7589f983a4bb3365abdeec087d 100644 (file)
--- a/2014/call_for_sessions/confirmation.html
+++ b/2014/call_for_sessions/confirmation.html
@@ -54,20 +54,21 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/call_for_sessions/index.html b/2014/call_for_sessions/index.html
index 7faa4ce93eadddd8e152c6f57117f3b7816eab59..29a240abd3e1cb7d88ed5113fca45f5df22cbeb9 100644 (file)
--- a/2014/call_for_sessions/index.html
+++ b/2014/call_for_sessions/index.html
@@ -77,20 +77,21 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/confirmation.html b/2014/confirmation.html
index 770776f689d32f3c495b7728acf13675ff30ae47..ea4044d22292f4cdd9c19da5efe7a4c2f687c788 100644 (file)
--- a/2014/confirmation.html
+++ b/2014/confirmation.html
@@ -54,10 +54,9 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">
@@ -65,13 +64,15 @@
                          <li><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/exhibit/confirmation.html b/2014/exhibit/confirmation.html
index 9503ece04f89d28083596f891d43517c79788fd8..15d522c12dde89e12eab76ba056af4e9665005c0 100644 (file)
--- a/2014/exhibit/confirmation.html
+++ b/2014/exhibit/confirmation.html
@@ -54,10 +54,9 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">
@@ -65,13 +64,15 @@
                          <li><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/exhibit/index.html b/2014/exhibit/index.html
index b3203411c1b527dcf179b6901fbd28df532ac0e1..511338b18875e8d16fcdd9bc1cc64f818b4bbd73 100644 (file)
--- a/2014/exhibit/index.html
+++ b/2014/exhibit/index.html
@@ -54,10 +54,9 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">
@@ -65,13 +64,15 @@
                          <li><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/index.html b/2014/index.html
index 4d236415d5c34f4b47cd4e27ecba8beeb5c68651..05e382e19d357a081925106079d182ca21df995f 100644 (file)
--- a/2014/index.html
+++ b/2014/index.html
@@ -51,10 +51,9 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">
@@ -62,13 +61,15 @@
                          <li><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/live/index.html b/2014/live/index.html
index 4c09e38af8b680d64c49f4f5abff30bf1c90ec73..c42f770c39aa72584fc70c78ce83c08a6df09183 100644 (file)
--- a/2014/live/index.html
+++ b/2014/live/index.html
@@ -56,23 +56,24 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li class="active"><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li class="active"><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/live/room123.html b/2014/live/room123.html
index a5f5e3c400cda5d8979e2ebb940df9ed83f43467..b6666e71631393a37f68012231fe05d718f242fe 100644 (file)
--- a/2014/live/room123.html
+++ b/2014/live/room123.html
@@ -56,23 +56,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li class="active"><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li class="active"><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/live/room141.html b/2014/live/room141.html
index 3c25ae5464469e188c9e0c664385608e03546ce1..55fdd4fb30f2f3f7042da64aa6d953f509d5e4ba 100644 (file)
--- a/2014/live/room141.html
+++ b/2014/live/room141.html
@@ -56,23 +56,22 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li class="active"><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li class="active"><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/live/room155.html b/2014/live/room155.html
index 0b815ad8b00ed5446b82f7620081b817a81de6b0..f23b1a5b144e68a20ea235c36d59b53740151ef4 100644 (file)
--- a/2014/live/room155.html
+++ b/2014/live/room155.html
@@ -56,23 +56,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li class="active"><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li class="active"><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/logistics/index.html b/2014/logistics/index.html
index 1b87d81cf8eb6f53fd7d0b7a2195e754cde306ad..9968c88421db796a4142f5ec4308387094ba1ced 100644 (file)
--- a/2014/logistics/index.html
+++ b/2014/logistics/index.html
@@ -56,24 +56,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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 class="active"><a href="/2014/logistics">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/program/exhibit_hall.html b/2014/program/exhibit_hall.html
index 780489b4728684115485a38bf5521b1b1146a1b0..b5e6a24382293a99e8ac298db693522f383e3d2a 100644 (file)
--- a/2014/program/exhibit_hall.html
+++ b/2014/program/exhibit_hall.html
@@ -55,25 +55,24 @@
                        </p>
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
-                         <li class="active"><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program">Program</a></li>
+                         <li class="active"><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/program/sessions.html b/2014/program/sessions.html
index ac52dcad142dc8bb9d87c3b55ccab8b2d4ac389d..475025e9748262998571ca34d30972ba6bca8d1a 100644 (file)
--- a/2014/program/sessions.html
+++ b/2014/program/sessions.html
@@ -56,24 +56,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li class="active"><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/program/speakers.html b/2014/program/speakers.html
index aec2a09f906c5b2d7a2a1eb720b0656967030130..73c13d9c91df2082cc1cceec810cae2e2bf55adc 100644 (file)
--- a/2014/program/speakers.html
+++ b/2014/program/speakers.html
@@ -56,24 +56,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li class="active"><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/scholarships/confirmation.html b/2014/scholarships/confirmation.html
index d3a4622a9146ff8c073d9ef09d73861566f20562..a9dedc8146406788790c99ce3edc54a92ad2e814 100644 (file)
--- a/2014/scholarships/confirmation.html
+++ b/2014/scholarships/confirmation.html
@@ -54,24 +54,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li class="active"><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/scholarships/index.html b/2014/scholarships/index.html
index 2109eefdfb6bb4c4d2a7b9271e699fd71a10694c..9e1c437301db73ced3ca25659f6ea8f60eea1757 100644 (file)
--- a/2014/scholarships/index.html
+++ b/2014/scholarships/index.html
@@ -77,24 +77,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li class="active"><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/video/index.html b/2014/video/index.html
index 3b57820410de6d21303d8a43fcbdde59353009e2..ac60c3803043a0eba27a570daa7a413086279aac 100644 (file)
--- a/2014/video/index.html
+++ b/2014/video/index.html
@@ -56,24 +56,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li class="active"><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/volunteer/confirmation.html b/2014/volunteer/confirmation.html
index 55849fac50d84587c642321f30ce64abcad18ef7..7001b6ff51173e8df0b1a319c2c40702cd7b0c14 100644 (file)
--- a/2014/volunteer/confirmation.html
+++ b/2014/volunteer/confirmation.html
@@ -54,24 +54,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li class="active"><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>

diff --git a/2014/volunteer/index.html b/2014/volunteer/index.html
index 3c84309db2785952b61bc17787a6b20d4113a189..0605098e05d557056244e92cc8e63b04457271e5 100644 (file)
--- a/2014/volunteer/index.html
+++ b/2014/volunteer/index.html
@@ -54,24 +54,23 @@
                        <ul class="nav nav-pills nav-stacked">
                          <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
                          <li><a href="/2014/program">Program</a></li>
+                         <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
                          <li><a href="/2014/video/">Watch the video</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">Getting around Cambridge</a></li>
                  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
                          <li class="active"><a href="/2014/volunteer">Volunteer</a></li>
-              <li><a href="/2014/live">Participate online</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+                                 Share your ideas</a></li>
                          <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>
                          <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>