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

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index 3dc3ba6bcc17034e10995170413812f6d24ff448..0033953d5758b3cdd64474d4c7ef9281df52340f 100644 (file)
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -17,7 +17,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>
@@ -73,8 +73,9 @@
 
                  <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 class="active"><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
                        </ul>
                        <div class="fsf-donate-button">

diff --git a/2014/assets/css/custom.css b/2014/assets/css/custom.css
index 4465ee1729db8ee49ac012a0175e53417612e178..eb9899ccb4615bb32e220c83ec4a5494d9732fd9 100644 (file)
--- a/2014/assets/css/custom.css
+++ b/2014/assets/css/custom.css
@@ -163,6 +163,22 @@
   display: none;
 }
 
+.carousel-caption {
+  position: absolute;
+  top: 5%;
+  bottom: auto;
+  right: 2%;
+  left: 35%;
+  z-index: 10;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  color: #ffffff;
+  text-align: center;
+  background-color: rgba(0, 0, 0,0.4);
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  border-radius: 8px;
+}
+
 .margin-top {
        margin-top: 40px;
 }

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">

diff --git a/server/staging/lpc14/index.html b/server/staging/lpc14/index.html
index 24f3dc438e0c30c6e3b998033c19785cef0f5e22..bec67924465816a28cce9c9cd6132689a9c4bce0 100644 (file)
--- a/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@ -17,7 +17,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>
@@ -72,8 +72,9 @@
 
                  <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">
@@ -92,11 +93,15 @@
                          
                          <!-- wrapper for slides -->
                          <ul class="carousel-inner list-unstyled">
-                                <li class="item active">
+                <li class="item active">
                                  <img src="/2014/i/lp13-expand-the-tent.jpg"
                                           alt="[ The Expanding the Tent panel ]">
+                                 <p class="lead carousel-caption">
+                                       Call for proposals now open!
+                                       <a class="btn btn-default" href="#">Submit a proposal</a>
+                                 </p>
                                </li>                           
-                                <li class="item">
+                <li class="item">
                                  <img src="/2014/i/lp13-printer.jpg"
                                           alt="[ Aleph Objects' Lulzbot 3D printer ]">
                                </li>