What's going on
authorZak Rogoff <zak@fsf.org>
Thu, 17 Oct 2013 19:07:00 +0000 (15:07 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 17 Oct 2013 19:07:00 +0000 (15:07 -0400)
1  2 
2014/exhibit/confirmation.html
server/staging/lpc14/index.html

diff --cc 2014/exhibit/confirmation.html
index 8401370d8c810cb581ca09a2d3d177dbeecc191d,e46787a81d96a0cb48bd2f37bae0608267005435..0000000000000000000000000000000000000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,142 -1,153 +1,0 @@@
--<!DOCTYPE html>
--<html lang="en">
--  <head>
--      <meta charset="utf-8" />
--      <meta name="viewport" content="width=device-width, initial-scale=1.0" /> 
--
--      <link href="/2014/assets/css/bootstrap.min.css" rel="stylesheet" media="screen" />
--      <link href="/2014/assets/css/custom.css" rel="stylesheet" media="screen" /> 
--      <title> Volunteer Registration &mdash; LibrePlanet 2014</title>
--  </head>
--  <body>
--
--      <div id="wrapper"> <!-- start of wrapper -->
--        <div class="lp-banner"> <!--start of lp banner -->
--              <div class="container"> <!-- start of container -->
--                <div class="row">
--                      <div class="col-sm-7"> <!-- start of lp header -->
--                        <div class="lp-head">
--                              <h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
-                               <p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -                              <p><strong>March 2014 in Cambridge, MA</strong></p>
--                              <p class="text-muted">The yearly conference of the free software community</p>
--                        </div>
--                      </div><!-- end of lp header -->
--                      <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">Read our
--                                              <a href="https://my.fsf.org/donate/privacypolicy.html">
--                                                privacy policy</a>.</p>
--                                      </div>
--                                </div>
--                              </div>
--                        </form>
--                      </div> <!-- end of signup form -->
--                </div>
--              </div> <!-- end of header container -->
--        </div> <!-- end of lp banner -->
--
--        <div class="container"> <!-- start of container -->
--              <div class="row">
--                <div class="col-sm-3"> <!-- start of nav items -->
--                      <p class="text-center lp-home">
--                        <a class="text-muted" href="/server/staging/lpc14/">
--                              <span class="glyphicon glyphicon-chevron-left"></span> Home
--                        </a>
--                      </p>
--                      <ul class="nav nav-pills nav-stacked">
--                        <li><a href="/2014/call_for_sessions">Propose a session</a></li>
--                        <li><a href="/2014/volunteer">Help plan LibrePlanet</a></li>
--                        <li><a href="/2014/exhibit">Exhibition tables</a></li>
--                        <li>
--                              <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm_page">
--                                Share your ideas</a></li>
--                      </ul>
--                      <ul class="nav nav-pills nav-stacked">
--                        <li><a href="https://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>
--                        <li class="fsf-donate">
--                              <a href="https://my.fsf.org/associate/support_freedom">
--                                <span class="glyphicon glyphicon-heart"></span>
--                                Donate to the FSF
--                              </a>
--                        </li>
--                      </ul>
--                </div> <!-- end of nav items -->
--
-                 <div class="col-sm-8"> <!-- start of LPC 14 main text -->
 -                <div class="col-sm-5"> <!-- start of LPC 14 main text -->
--                      <h2> Exhibitor application </h2>
--
-                       <p>Thanks for applying to exhibit at LibrePlanet. We will review your application and get in touch via email.</p>
- <p><span class="glyphicon glyphicon-chevron-right"></span><strong>  Please check your email for a confirmation link.</strong></p>
- <br>
- <p><a href="https://libreplanet.org/server/staging/lpc14/">Return to the homepage.</a></p>
 -                      <p>
 -                        Thanks for applying to exhibit at LibrePlanet. We will review your
 -                        application and get in touch via email.
 -                      </p>
--
 -                      <div class="alert alert-info margin-top">
 -                        <p>
 -                              <span class="glyphicon glyphicon-inbox"></span>
 -                              <strong>Please check your email for a confirmation link.</strong>
 -                        </p>
 -                      </div>
 -                      <p>
 -                        <a href="/server/staging/lpc14/">
 -                              Return to the homepage.
 -                        </a>
 -                      </p>
--
--                </div> <!-- end of LPC 14 main text -->
--              </div>
--        </div> <!-- end of container -->
--
--      </div> <!-- end of wrapper -->
--
--      <div id="footer">
--        <div class="container">
--              <p class="text-muted text-center">
--                The <a href="http://www.fsf.org/">Free Software
--                Foundation</a> is a nonprofit with a worldwide mission to
--                advance software freedom.</p>
--
--                <p class="text-muted text-center"><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a>  This page and its images, logos and videos are licensed under a<br><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>. Copyright &copy; 2013 Free Software Foundation.</p>
--
--              <p class="text-muted text-center">
--                <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">
--                      JavaScript license information.
--                </a>
--              </p>
--        </div>
--      </div>
--  </body>
--</html>
Simple merge