updated 2015/index.html: Text & Updates section are two seperate columns now.

diff --git a/2015/index.html b/2015/index.html
index d8c116bc6533f43813c454fc62446e8fbc2690f6..7735c885e466e73678e59db820b2cb3c9023c532 100755 (executable)
--- a/2015/index.html
+++ b/2015/index.html
@@ -8,37 +8,32 @@
 <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/crockford_and_levy_2014.jpg"
         alt="[ MIT Stata Center ]" />
 
-<div class="margin-top"> <!-- start of LP14 text -->
+  <div class="row margin-top"> <!-- start of Text & Updates block -->
+       <div class="col-sm-8">  <!-- start of Text -->
+
                          <!-- // SURVEY ASK
                        <div class="alert alert-info margin-top">
                                <p>If you attended LibrePlanet 2015, please fill out our <a href="https://libreplanet.org/2014/feedback" style="text-decoration:underline">feedback survey</a> so we can make the conference even better next year!</p>
                        </div>
                        -->
 
-       <ul id="lp-updates" class="list-group pull-right">
-         <li class="list-group-item">
-               <span class="label label-primary">
-                 Heads up!</span> Lorem ipsum dolor sit amet, consectetur
-               adipiscing elit. Mauris eget fermentum risus. Morbi rutrum
-               consequat euismod.</li>
-         <li class="list-group-item">
-               <span class="label label-success">
-                 News</span> LP15 news! Lorem ipsum dolor sit amet,
-               consectetur adipiscing elit. Mauris eget fermentum
-               risus. Morbi rutrum consequat euismod.</li>
-         <li class="list-group-item">
-               <span class="label label-danger">
-                 Gotcha!</span> Gotcha and time sensitive info. Lorem ipsum dolor sit
-               amet, consectetur adipiscing elit. Mauris eget fermentum
-               risus. Morbi rutrum consequat euismod. </li>
-       </ul>
-
-  <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>
-
-  <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 -->
+         <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>
+
+         <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 Text -->
+
+       <div class="col-sm-4"> <!-- start of Updates -->
+         <ul  class="list-group">
+               <li class="list-group-item">
+                 <span class="label label-success">
+                       News</span> LibrePlanet is coming March 21-22, 2015:
+                 <a href="/2015/call_for_sessions">Propose a session!</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"-->
 <!--#include virtual="/server/2015/close.html" -->