Putting streaming in the sidebar and making it the featured item in the carousel.

diff --git a/2015/index.html b/2015/index.html
index 772db25db4a2fc82c39a6619481f4f9fb2fc1b9a..af468b0316cac6fb6fbf842287a30b473be020ee 100755 (executable)
--- a/2015/index.html
+++ b/2015/index.html
@@ -12,6 +12,12 @@
        <ul class="carousel-inner list-unstyled">
 
                <li class="item active">
+                       <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.jpg" alt="[A globe]">
+                       <p class="carousel-caption-tr">
+                               Wherever you are, we invite you to participate in<br>LibrePlanet <a href="live">via chat and livestream</a>.</p>
+                       </li>
+
+               <li class="item">
                        <img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/keynotes-slide.jpg"
                        alt="[ Karen Sandler, Mako Hill and Richard Stallman speaking at previous LibrePlanets ]">
                        <p class="carousel-caption-bl">
@@ -19,12 +25,6 @@
                        </p>
                </li>
 
-               <li class="item">
-                       <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.jpg" alt="[A globe]">
-                       <p class="carousel-caption-tr">
-                               Wherever you are, we invite you to participate in<br>LibrePlanet <a href="live">via chat and livestream</a>.</p>
-                       </li>
-
                <li class="item">
                        <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
                        alt="[ Become a member ]">
@@ -79,14 +79,6 @@ LibrePlanet has something for everyone<br>
 <a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/program">View the complete program</a></p>
 </li>
 
-<li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.jpg" alt="[A globe]">
-<p class="carousel-caption-tr">
-Wherever you are, we invite you to participate in LibrePlanet<br>via chat and livestream<br>
-<a class="btn btn-default btn-carousel" href="http://libreplanet.org/2014/live">Participate online</a></p>
-</li>
-
-
 <li class="item">
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
 alt="[ LibrePlanet 2013 discussion ]">

diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 8e224baaa4be5ff89f88af9928c3cb386537fe49..be96a15ed86cd09cb0e1f437e2b18c4469b3e20c 100755 (executable)
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -1,4 +1,4 @@
-<div class="container"> <!-- start of container -->
+       <div class="container"> <!-- start of container -->
   <div class="row">
     <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
       <!--#if expr='"$REQUEST_URI" != "/2015/"' -->
@@ -19,8 +19,6 @@
 
       <li><a href="/2015/scholarships">Scholarships (until January 10th)</a></li>
 
-      <li><a href="/2015/live">Participate online</a></li>
-
       <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Conference_brainstorm">Share Your Conference Ideas</a></li>
 
       <li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>
@@ -30,6 +28,7 @@
 
     <ul class="nav nav-pills nav-stacked" style="padding-top: 0 !important;">
 
+                       <li><a href="/2015/live">Livestream & Chat</a></li>
       <li><a href="/2015/program">Program</a></li>
       <li><a href="/2015/program/social.html">Social Events</a></li>
       <li id="exhibit-link"><a href="/2015/program/exhibit-hall.html">Exhibit Hall</a></li>