X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=2014%2Fvolunteer%2Findex.html;h=5979ec3bcd59dbfb0ae4023576846704ab1e65d6;hb=de8880b1be8f71b83f81ce326a6dcad3e8a1e86b;hp=97e22e8e0c8875c3857a7f54774eb3df24e3e3c3;hpb=6d9c445a52867d4d873293752db908b7d912ffe3;p=libreplanet-static.git

diff --git a/2014/volunteer/index.html b/2014/volunteer/index.html
index 97e22e8e..5979ec3b 100644
--- a/2014/volunteer/index.html
+++ b/2014/volunteer/index.html
@@ -16,64 +16,21 @@
 		  <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 2014 in Cambridge, MA</strong></p>
-				<p class="text-muted">The yearly conference of the free software community</p>
+				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+				<p><strong>March 22nd-23rd 2014 in Cambridge, MA</strong></p>
+				<p class="text-muted">Free software, free society</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 class="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>
+				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 -->
@@ -82,37 +39,36 @@
 		<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/">
+			  <a class="text-muted" href="/2014/">
 				<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/call_for_sessions">Propose a session</a></li>-->
 			  <li class="active"><a href="/2014/volunteer">Help plan LibrePlanet</a></li>
-			  <li><a href="/2014/exhibit">Exhibition tables</a></li>
+			  <li><a href="/2014/exhibit">Promotional opportunities</a></li>
 			  <li>
-				<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm_page">
+				<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
 				  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="http://media.libreplanet.org/">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
+				  Become an FSF member
 				</a>
 			  </li>
 			</ul>
+			<p class="text-muted text-center">and attend the conference gratis!</p>
 		  </div> <!-- end of nav items -->
 
 		  <div class="col-sm-9"> <!-- start of LPC 14 main text -->
 			<h2> Volunteer <small>Registration</small> </h2>
 
-			<p>
-			  This list will be used for planning the 2014
-			  LibrePlanet conference. The volunteer committee will
+<p>We welcome you to use the #libreplanet channel on Freenode for informal communication. To get more involved, join our volunteer planning committee with the form below. The volunteer committee will
 			  meet monthly to plan the logistics of next year's
 			  conference, such as advising on the program,
 			  assisting with outreach efforts, and helping to plan
@@ -137,6 +93,7 @@
 				<div id="editrow-email-Primary1" class="form-group"> 
 				  <label for="email-Primary1" class="col-sm-3 control-label">
 					Email
+					<span class="field-required">*</span>
 				  </label>
 				  <div class="col-sm-5">
 					<input name="email-Primary" type="email" id="email-Primary1"
@@ -562,7 +519,7 @@
 			  <div class="form-group">
 				<div class="col-sm-12">
 				  <p>
-					Thank you for your interest in LibrePlanet 2014!<br />
+					Thank you for your interest in LibrePlanet 2014, March 22-23 2014 in Cambridge, MA!<br />
 					We will not publish or share your information with any
 					party outside the FSF. See
 					our <a href="https://my.fsf.org/donate/privacypolicy.html">privacy
@@ -599,15 +556,38 @@
 		<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>
+		  advance software freedom.
+		  <a href="https://my.fsf.org/associate/support_freedom">
+			Donate</a>.
+		</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 rel="license"
+			 href="http://creativecommons.org/licenses/by-sa/3.0/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/us/">
+			Creative Commons Attribution-ShareAlike 3.0 US
+		  </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.
+			JavaScript license information
 		  </a>
 		</p>
+
+		<p class="text-muted text-center">
+		  This site, including fonts, CSS, and JavaScript, was built using
+		  <a href="http://getbootstrap.com">Bootstrap</a>,
+		  which is licensed under the
+		  <a href="https://directory.fsf.org/wiki/License:Apache2.0">
+			Apache 2.0 license</a>.
+		</p>
 	  </div>
 	</div>
 
@@ -624,10 +604,30 @@
 	</script>
 
 	<script type="text/javascript">
+	  /**
+	  * @licstart  The following is the entire license notice for the JavaScript code in this page.
+	  *
+	  * Copyright (C) 2013 Free Software Foundation, Inc
+
+	  * Licensed under the Apache License, Version 2.0 (the
+	  * "License"); you may not use this file except in compliance
+	  * with the License.  You may obtain a copy of the License at
+
+	  *        http://www.apache.org/licenses/LICENSE-2.0
+
+	  * Unless required by applicable law or agreed to in writing,
+	  * software distributed under the License is distributed on an
+	  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+	  * either express or implied.  See the License for the specific
+	  * language governing permissions and limitations under the
+	  * License.
+
+	  *
+	  * @licend  The above is the entire license notice for the JavaScript code in this page.
+	  **/
+
 	  var cj = jQuery.noConflict(); $ = cj;
-	</script>
 
-	<script type="text/javascript">
 	  cj(function() {
 		  countryID = "#country-Primary"
 		  stateProvinceID = "#state_province-Primary"