Moved 'Recent Updates' box to the sidebar.

	modified:   2015/index.html
	modified:   server/2015/sidebar.html

diff --git a/2015/index.html b/2015/index.html
index d227a5400010caf9a0f5628f090c4ccef75958af..43836b30b801cfc2aec295850a0206f5736bb5df 100755 (executable)
--- a/2015/index.html
+++ b/2015/index.html
@@ -127,28 +127,10 @@
 
   <p class="lead">LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2015 will feature programming for all ages and experience levels.</p>
 
-         <div class="row"> <!-- start of Text & Updates block -->
-               <div class="col-sm-8">  <!-- start of Text -->
 
   <p>This year, the theme of LibrePlanet is "Free Software Everywhere." We're looking for talks that touch on the many places and ways that free software is used around the world, as well as ways to make free software ubiquitous. Think "where" in the broadest sense of the word--it's not just geography-based talks we're after. What are some contexts where free software is thriving, and some others where it needs a push? How have you worked to gain a foothold for free software in your company or community? And what about free software on all of the myriad pieces of hardware we use, including laptops, phones, tablets, and even coffee makers? At LibrePlanet 2015, we're taking software freedom around the world, to outer space, and through all kinds of industries, governments, organizations, fields of study, and communities. We hope to see you at LibrePlanet 2015, March 21-22 in Cambridge, MA.
   </p>
   <p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now</a>. Registration opens in October--sign up above to receive updates.</p>
-</div> <!-- end of LP15 text -->
-
-
-       <div class="col-sm-4"> <!-- start of Updates -->
-         <ul  class="list-group">
-       <li class="list-group-item">
-                 <strong>Recent Updates</strong>
-       <li class="list-group-item">
-                  <strong>10/15/2014:</strong> <a href="https://fsf.org/blogs/community/registration-opens-for-libreplanet-2015">Registration and scholarship applications now open</a></li>
-
-       <li class="list-group-item"><strong>09/16/2014:</strong> <a href="https://www.fsf.org/news/libreplanet-is-coming-march-21-22-2015-call-for-proposals-now-open-for-annual-free-software-conference">Call for sessions now open</a></li>
-
-         </ul>
-       </div> <!-- end of Updates -->
-  </div> <!-- end of Text & Updates block -->
-
 
 <!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/home_js.html"-->

diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index d28680325e645cf12a991f09fc87339fb9d8ff2c..a76de236cfa2e6020b2193110b710ad1aadc5723 100644 (file)
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -1,6 +1,6 @@
       <div class="container"> <!-- start of container -->
        <div class="row">
-          <div id="lp-nav" class="col-sm-3">
+          <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
             <!--#if expr='"$REQUEST_URI" != "/2015/"' -->
            <p class="text-center lp-home">
              <a class="text-muted" href="/2015/">
@@ -51,5 +51,13 @@
               </li>
             </ul>
             <p class="text-muted text-center">and attend the conference gratis!</p>
-          </div>
+
+                       <ul  class="list-group margin-top">
+                         <li class="list-group-item">
+                               <strong>Recent Updates</strong>
+                         <li class="list-group-item">
+                               <strong>10/15/2014:</strong> <a href="https://fsf.org/blogs/community/registration-opens-for-libreplanet-2015">Registration and scholarship applications now open</a></li>
+                         <li class="list-group-item"><strong>09/16/2014:</strong> <a href="https://www.fsf.org/news/libreplanet-is-coming-march-21-22-2015-call-for-proposals-now-open-for-annual-free-software-conference">Call for sessions now open</a></li>
+                       </ul>
+          </div> <!-- end of sidebar column -->
                  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->