Miscellaneous updates to 2016-ify things and link things up.
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Fri, 9 Oct 2015 16:43:51 +0000 (12:43 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Fri, 9 Oct 2015 16:43:51 +0000 (12:43 -0400)
2016/confirmation.html
2016/feedback-closed.html
2016/feedback-confirmation.html
2016/fixed.html [deleted file]
server/2016/banner.html
server/2016/footer.html
server/2016/sidebar.html

index 9c6b88af5bfacbde0e21022d8c4ac493618b43fe..388f57a6a74247d69bd8cd1c704a308683977e9f 100755 (executable)
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2015/header.html"-->
+<!--#include virtual="/server/2016/header.html"-->
 
-<title>LibrePlanet 2015 &mdash; Announcements List Confirmation</title>
+<title>LibrePlanet &mdash; Announcements List Confirmation</title>
 
-<!--#include virtual="/server/2015/banner.html"-->
-<!--#include virtual="/server/2015/sidebar.html"-->
+<!--#include virtual="/server/2016/banner.html"-->
+<!--#include virtual="/server/2016/sidebar.html"-->
 
                        <h2>Confirm your email</h2>
 
                          </p>
                        </div>
                        <p>
-                         <a href="/2015/">
+                         <a href="/2016/">
                                Return to the homepage.
                          </a>
                        </p>
-<!--#include virtual="/server/2015/footer.html"-->
-<!--#include virtual="/server/2015/common_js.html"-->
-<!--#include virtual="/server/2015/cfs_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
+<!--#include virtual="/server/2016/footer.html"-->
+<!--#include virtual="/server/2016/common_js.html"-->
+<!--#include virtual="/server/2016/cfs_js.html"-->
+<!--#include virtual="/server/2016/close.html" -->
index 3d230ac8a2780d6f126dcfed460cc499079a33d8..cc2ad4194a81955a0ebcf93326486c7cce3dd4db 100755 (executable)
@@ -1,17 +1,17 @@
-<!--#include virtual="/server/2015/header.html"-->
+<!--#include virtual="/server/2016/header.html"-->
 
-<title>LibrePlanet 2015 &mdash; Feedback Survey Closed</title>
+<title>LibrePlanet &mdash; Feedback Survey Closed</title>
 
-<!--#include virtual="/server/2015/banner.html"-->
-<!--#include virtual="/server/2015/sidebar.html"-->
+<!--#include virtual="/server/2016/banner.html"-->
+<!--#include virtual="/server/2016/sidebar.html"-->
 
 <h2> Sorry, the feedback survey is now closed</h2>
                        <p>
-                         <a href="/2015/">
+                         <a href="/2016/">
                                Return to the homepage.
                          </a>
                        </p>
-<!--#include virtual="/server/2015/footer.html"-->
-<!--#include virtual="/server/2015/common_js.html"-->
-<!--#include virtual="/server/2015/cfs_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
+<!--#include virtual="/server/2016/footer.html"-->
+<!--#include virtual="/server/2016/common_js.html"-->
+<!--#include virtual="/server/2016/cfs_js.html"-->
+<!--#include virtual="/server/2016/close.html" -->
index 923e496f95d8391e40e72821f2f6b3a512420d47..c7c403637c50db4f60827f5b1759948600578c29 100755 (executable)
@@ -1,9 +1,9 @@
-<!--#include virtual="/server/2015/header.html"-->
+<!--#include virtual="/server/2016/header.html"-->
 
-<title>LibrePlanet 2015 &mdash; Feedback Survey Confirmation</title>
+<title>LibrePlanet &mdash; Feedback Survey Confirmation</title>
 
-<!--#include virtual="/server/2015/banner.html"-->
-<!--#include virtual="/server/2015/sidebar.html"-->
+<!--#include virtual="/server/2016/banner.html"-->
+<!--#include virtual="/server/2016/sidebar.html"-->
 
 <h2> One more step! </h2>
 <p>
        </p>
                        </div>
                        <p>
-                         <a href="/2015/">
+                         <a href="/2016/">
                                Return to the homepage.
                          </a>
                        </p>
-<!--#include virtual="/server/2015/footer.html"-->
-<!--#include virtual="/server/2015/common_js.html"-->
-<!--#include virtual="/server/2015/cfs_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
+<!--#include virtual="/server/2016/footer.html"-->
+<!--#include virtual="/server/2016/common_js.html"-->
+<!--#include virtual="/server/2016/cfs_js.html"-->
+<!--#include virtual="/server/2016/close.html" -->
diff --git a/2016/fixed.html b/2016/fixed.html
deleted file mode 100755 (executable)
index e4a63c6..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-<!--#include virtual="/server/2015/header.html"-->
-
-<title>LibrePlanet 2015</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="lp-head"> <!-- start of lp header -->
-                         <div class="col-sm-3">
-                               <a href="/2015/">
-                                 <img src="http://static.fsf.org/nosvn/libreplanet/2015/site/graphics/better_pepper.png"
-                                          class="img-responsive"
-                                          alt="[ LibrePlanet 2015 &mdash; Free Software Everywhere]" />
-                               </a>
-                         </div>
-                         <div class="col-sm-3">
-                               <p class="text-muted">
-                                 <strong><br>March 21-22<br />
-                                       Cambridge, MA</strong></p>
-                         </div>
-                       </div><!-- end of lp header -->
-
-            <!-- start of signup form <div class="col-sm-6">
-              <form role="form" class="margin-top lp-signup"
-                    action="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1"
-                    method="post" name="Edit" id="Edit">
-                <div>
-                  <input name="postURL" type="hidden"
-                         value="https://libreplanet.org/2015/confirmation.html" />
-                  <input name="cancelURL" type="hidden"
-                         value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=285" />
-                  <input name="add_to_group" type="hidden" value="619" />
-                  <input name="_qf_default" type="hidden" value="Edit:cancel" />
-                </div>
-
-                <div id="crm-container" lang="en" xml:lang="en">
-                  <br />
-                  <div id="editrow-email-Primary"
-                       class="form-group">
-                    <label class="sr-only" for="email-Primary">
-                      Enter your email to receive updates
-                    </label>
-                    <div class="input-group">
-                      <input class="form-control"
-                             name="email-Primary"
-                             id="email-Primary"
-                             type="email"
-                             placeholder="Enter your email to receive updates" 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">
-                          Submit
-                        </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" />
-                                               <span class="text-muted">Also join the FSF's newsletter</span>
-                      </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 -->
-
-
-
-           <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://my.fsf.org/civicrm/event/register?reset=1&amp;id=20">
-           <span class="glyphicon glyphicon-ok"></span>
-           Register now
-           </a>
-           <p class="text-muted text-center">
-           gratis for members and students!
-           </p>
-           </div> <!--end of Register button -->
-                 </div>
-               </div> <!-- end of header container -->
-      </div> <!-- end of lp banner -->
-
-<!--#include virtual="/server/2015/sidebar.html"-->
-
-
-<!-- start of carousel -->
-                       <div id="lpc-carousel" class="carousel slide">
-
-                         <!-- wrapper for slides -->
-                         <ul class="carousel-inner list-unstyled">
-
-
-<li class="item active">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/crockford_and_levy_2014.jpg"
-                                          alt="[ Two speakers at LibrePlanet 2014]">
-                                 <p class="carousel-caption-tr">
-                                       Call for Sessions open until November 9th.<br><a href="call_for_sessions">Submit a proposal today.</a><br>
-                               </li>
-                 <li class="item">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-                                          alt="[ Apply for a scholarship ]">
-                       <p class="lead carousel-caption-tl"> <a href="scholarships">Apply for a travel scholarship</a> before November 30th or <a href="https://www.libreplanet.org/2015/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
-                                         </p>
-                               </li>
-<li class="item">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
-                                          alt="[ Become a member ]">
-                       <p class="lead carousel-caption-bl"> <a href="https://my.fsf.org/associate/support_freedom">Join the Free Software Foundation as a member</a> and get<br />gratis conference admission and other perks.
-                                         </p>
-                               </li>
-
-</ul>
-<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
-
-<!--
-                               <li class="item active">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.jpg"
-                                          alt="[MIT's Stata Center]">
-                                 <p class="carousel-caption-tl">
-                                       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 ]">
-                                 <p class="lead carousel-caption-bl">
-                                       We're collecting suggestions for<br>LibrePlanet 2014
-
-                                       <a class="btn btn-default"
-                                          href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
-                                         Share your ideas
-                                       </a>
-
-                                 </p>
-                               </li>
-
-                               <li class="item active">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp14_keynotes.png"
-                                          alt="[ Keynote speakers]">
-                                 <p class="carousel-caption-tl">
-                                       <a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/speakers">
-                                         Get excited for our keynote speakers!
-                                       </a></p>
-                               </li>
-
-                <li class="item">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-expand-the-tent.jpg"
-                                          alt="[ The Expanding the Tent panel ]">
-                                 <p class="carousel-caption-tr">
-                                       <a class="btn btn-default btn-carousel"
-                                          href="https://libreplanet.org/2014/register">
-                                         Register now
-                                       </a>
-                                       and be part of LibrePlanet 2014!
-                                 </p>
-
-                               </li>
-
-                       <li class="item">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
-                                          alt="[ Aleph Objects' Lulzbot 3D printer ]">
-                                 <p class="carousel-caption-tr">
-                                       LibrePlanet is a great place to spread the word about your free software business or organization<br>
-                                       <a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/exhibit">
-                                         Apply for an exhibition table and program ad
-                                       </a>
-                                 </p>
-
-                               </li>
-                               <li class="item">
-                                 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-presentation.jpg"
-                                          alt="[ A presentation at LibrePlanet 2013]">
-                                 <p class="carousel-caption-tr">
-                                       Volunteers are crucial in planning LibrePlanet<br>
-                                       <a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">
-                                         Join the planning committee
-                                       </a>
-                               </li> -->
-                         <!-- controls -->
-                         <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
-                               <span class="glyphicon glyphicon-chevron-left"></span>
-                         </a>
-                         <a class="right carousel-control" href="#lpc-carousel" data-slide="next">
-                               <span class="glyphicon glyphicon-chevron-right"></span>
-                         </a>
-                       </div> <!-- end of carousel -->
-
-
-<!-- start of notification area -->
-
-<!--fill out the feedback survey-->
-<div class="alert alert-success margin-top">
-                               <p style="text-align:center;"><strong><a href="call_for_sessions" style="color:black; text-decoration:underline; font-size:150%;">The call for sessions deadline is extended! Propose your session by Sunday, November 9th at 19:59 EST (23:59 UTC).</a></strong></p>
-</div>
-
-
-<!-- // fill out the feedback survey
-<div class="alert alert-success 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>
--->
-
-<!-- // next year's site available
-<div class="alert alert-success margin-top">
-                         <p style="text-align:center; font-size:large"><strong>The <a href="https://www.libreplanet.org/2015" style="text-decoration:underline; text-color:inherited">LibrePlanet 2015 site</a> is now available!</strong></p></div>
--->
-
-<!-- end of notification area -->
-
-<script type="text/javascript" src="http://z1.zyxware.in/fsf-civicrm/sites/all/modules/civicrm/extensions/civicrm-wci/extern/wciwidget.php?widgetId=4&embed=1"></script>
-<script type="text/javascript" src="http://z1.zyxware.in/fsf-civicrm/sites/all/modules/civicrm/extensions/civicrm-wci/extern/wciembed.js"></script>
-<div id='widgetwci'></div>
-
-  <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>
-
-<!--#include virtual="/server/2015/footer.html"-->
-<!--#include virtual="/server/2015/common_js.html"-->
-<!--#include virtual="/server/2015/home_js.html"-->
-<!--#include virtual="/server/2015/close.html" -->
index 41907537b67c408a03fbd5c3cc745387e560665a..40f3e6e7560de7012ca8de34c86ba5d4fd251c5b 100755 (executable)
@@ -14,9 +14,8 @@
                          </div>
                          <div id="lp15-date-place" class="col-sm-3 col-xs-3">
                                <p>
-                                 <strong><br>March 21-22<br />
-          MIT Stata Center<br />
-          Cambridge, MA</strong>
+                                 <strong><br>March 19-20<br />
+          Boston area</strong>
                                </p>
                          </div>
                        </div><!-- end of lp header -->
@@ -27,7 +26,7 @@
                     method="post" name="Edit" id="Edit">
                 <div>
                   <input name="postURL" type="hidden"
-                         value="https://libreplanet.org/2015/confirmation.html" />
+                         value="https://libreplanet.org/2016/confirmation.html" />
                   <input name="cancelURL" type="hidden"
                          value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=285" />
                   <input name="add_to_group" type="hidden" value="619" />
index 2dcf2e0ee922cdc910bd64a93bf84ccd8b26eb46..35466fa852bf713be705d7384d239cbe1e21fafa 100755 (executable)
@@ -6,21 +6,21 @@
 <div id="footer">
   <div class="container">
     <p class="text-muted">
-      LibrePlanet 2016 is produced in partnership by the <a href="https://www.fsf.org">Free Software Foundation</a> and the <a href="http://sipb.mit.edu/"> Student Information Processing Board (SIPB)
+      <!--LibrePlanet is produced in partnership by the <a href="https://www.fsf.org">Free Software Foundation</a> and the <a href="http://sipb.mit.edu/"> Student Information Processing Board (SIPB)
       </a>
       at MIT.
-      <a href="https://my.fsf.org/associate/support_freedom">Donate to the FSF</a>.
+      <a href="https://my.fsf.org/associate/support_freedom">Donate to the FSF</a>.-->
     </p>
 <p class="text-muted">
       Except where otherwise noted, this site and its images, logos and and other media are licensed under
       <a rel="license"
         href="http://creativecommons.org/licenses/by-sa/4.0/">
        Creative Commons Attribution-ShareAlike 4.0</a>.
-      Copyright &copy; 2014-2016 Free Software Foundation. It was built using
+      Copyright &copy; 2014-2015 Free Software Foundation. It was built using
       <a href="http://getbootstrap.com">Bootstrap 3.2.0</a>,
       which is licensed under <a href="http://www.gnu.org/licenses/license-list.html#Expat">
        Expat</a>. The JavaScript is free software with <!-- <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">-->
-     <a href="/server/staging/lp15/weblabels.html" rel="jslicense">licensing information</a> documented by <a href="https://fsf.org/campaigns/freejs">Web labels</a>.
+     <a href="/server/staging/lp15/weblabels.html" rel="jslicense">licensing information</a> documented by <a href="https://www.fsf.org/campaigns/freejs">Web labels</a>.
     </p>
 
     <p class="text-muted">
index 9b5cc1e4ed03c8e857b35df05f6f3d17f7ef5205..0865e846283837870deeb2f83990b617fc4669c9 100755 (executable)
@@ -36,7 +36,7 @@
 
                <ul class="nav nav-pills nav-stacked">
                        <li class="fsf-donate">
-                               <a href="https://my.fsf.org/associate/support_freedom">
+                               <a href="https://crm.fsf.org/join">
                                        <span class="glyphicon glyphicon-heart"></span>
                                        Become a proud FSF Member
                                </a>