Updating homepage to have link to survey and also signup for announcements, though...

diff --git a/2014/index.html b/2014/index.html
index 1f50581d510c4bdc9f458383e8e7cffadb08079f..87b486475fccb53f7d0ed85d89b80bab9ab1e7a3 100644 (file)
--- a/2014/index.html
+++ b/2014/index.html
@@ -30,7 +30,61 @@
                                  MIT, Cambridge, MA</p>
                          </div>
                        </div><!-- end of lp header -->
-                       <div class="col-sm-offset-3 col-sm-3"> <!-- start of Register button -->
+-                       <div class="col-sm-5"> <!-- start of signup form -->
+-                         <form role="form" class="margin-top lp-signup"
+-                                       action="https://crm.fsf.org/civicrm/profile/create?gid=234&amp;reset=1"
+-                                       method="post" name="Edit" id="Edit">
+-                               <div>
+-                                 <input name="postURL" type="hidden" value="" />
+-                                 <input name="cancelURL" type="hidden"
+-                                                value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=234" />
+-                                 <input name="add_to_group" type="hidden" value="306" />
+-                                 <input name="_qf_default" type="hidden" value="Edit:cancel" />
+-                               </div>
+-
+-                               <div id="crm-container" lang="en" xml:lang="en">
+-                                 <p>Registration has not yet opened. Sign up for updates!</p>
+-                                 <div id="editrow-email-Primary"
+-                                          class="form-group">
+-                                       <label class="sr-only" for="email-Primary">
+-                                         Email
+-                                       </label>
+-                                       <div class="input-group">
+-                                         <input class="form-control"
+-                                                        name="email-Primary"
+-                                                        id="email-Primary"
+-                                                        type="email"
+-                                                        placeholder="Your email address" required>
+-                                         <span class="input-group-btn">
+-                                               <button type="submit" class="btn btn-default"
+-                                                               accesskey="S" name="_qf_Edit_next" value="Save"
+-                                                               id="_qf_Edit_next">
+-                                                 Receive updates
+-                                               </button>
+-                                         </span>
+-                                       </div>
+-                                 </div>
+-                                 <div id="editrow-custom_79">
+-                                       <div class="checkbox">
+-                                         <input
+-                                                type="hidden" name="custom_79[yes]" value="" />
+-                                         <label class="lp-label-news">
+-                                               <input id="custom_79_yes"
+-                                                          name="custom_79[yes]" type="checkbox" value="1" checked="checked"
+-                                                          class="checkbox" />
+-                                               Also join the FSF's newsletter
+-                                         </label>
+-                                         &middot;
+-                                         <p class="help-block">
+-                                               <a href="https://my.fsf.org/donate/privacypolicy.html">Read our privacy policy.</a></p>
+-                                       </div>
+-                                 </div>
+-                               </div>
+-                         </form>
+-                       </div> <!-- end of signup form -->
+
+<!-- REGISTER BUTTON
+                       <div class="col-sm-offset-3 col-sm-3"> // start of Register button
                          <a class="btn btn-register-lp14 btn-lg btn-block"
                                 href="https://libreplanet.org/2014/register">
                                <span class="glyphicon glyphicon-ok"></span>
@@ -39,7 +93,8 @@
                          <p class="text-muted text-center">
                                gratis for members and students!
                          </p>
-                       </div> <!-- end of Register button -->
+                       </div> //end of Register button
+-->
                  </div>
                </div> <!-- end of header container -->
          </div> <!-- end of lp banner -->
@@ -99,13 +154,6 @@
                                </li>
 
                                <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 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/stata_center.jpg"
                                           alt="[MIT's Stata Center]">
                                  <p class="carousel-caption-tl">
@@ -125,7 +173,12 @@ Watch and share our volunteer-created LibrePlanet video<br>
 
 <!--
 
-
+                               <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/gnu30_hackers.jpg"
@@ -201,6 +254,7 @@ Watch and share our volunteer-created LibrePlanet video<br>
                        </div> <!-- end of carousel -->
 
                        <div class="margin-top"> <!-- start of LP14 text -->
+                         <p class="lead">If you attended LibrePlanet, please fill out our <a href="https://libreplanet.org/2014/feedback">feedback survey</a> so we can make the conference even better next year! Thanks for coming!</p>
                          <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 2014 will feature programming for all ages and experience levels.</p>
                          <p>