Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable

[libreplanet-static.git] / 2014 / javascript / index.html

diff --git a/2014/javascript/index.html b/2014/javascript/index.html
index 5512537aa15b76df2b868f52bb17be6e0860dc9c..d641a4041e034ecc72e98c631feabca389a7f705 100644 (file)
--- a/2014/javascript/index.html
+++ b/2014/javascript/index.html
@@ -16,7 +16,7 @@
                  <div class="row">
                        <div class="col-sm-7"> <!-- start of lp header -->
                          <div class="lp-head">
-                               <h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+                               <h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
                                <p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
                                <p class="text-muted">The yearly conference of the free software community</p>
                          </div>
@@ -70,8 +70,9 @@
                <div class="row">
                  <div class="col-sm-3"> <!-- start of nav items -->
                        <ul class="nav nav-pills nav-stacked">
-                         <li><a href="#">Videos from LP 2013</a></li>
-                         <li><a href="#">Previous years</a></li>
+                         <li><a href="#">Call for proposals</a></li>
+                         <li><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Video"> 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>
                        </ul>
                        <div class="fsf-donate-button">