Copy fixes and reordered field options in volunteer form. Also removin form in develo...

diff --git a/2015/call_for_sessions/index.html b/2015/call_for_sessions/index.html
index 42efca4199f142ddd8eefba18ee4092d6e38f49b..b6dff137ac19e9f456230659883011eef64a75a0 100755 (executable)
--- a/2015/call_for_sessions/index.html
+++ b/2015/call_for_sessions/index.html
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/2015/header.html"-->
-<h2> Call for Sessions (form in development)</h2>
+<h2> Call for Sessions</h2>
 
 <p>The Call for Sessions for LibrePlanet 2015 is open from <strong>Monday, September 15th, 2014</strong> to <strong>Sunday, November 2nd, 2014 at 19:59 EST (23:59 UTC)</strong>.</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 stronghold 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.</p>

diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html
index e768aa87865c7360ef7d1f8706fd6f44c35e92e2..2cf55e194c8ec9409af70f7cf7fec11dff695bc5 100755 (executable)
--- a/2015/exhibit/index.html
+++ b/2015/exhibit/index.html
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/2015/header.html"-->
-                       <h2> Exhibitor Application(form in development) </h2>
+                       <h2> Exhibitor Application</h2>
 
                        <p>LibrePlanet is the perfect place to
                          spread the word about your organization to an inspired and engaged

diff --git a/2015/volunteer/index.html b/2015/volunteer/index.html
index 0a6ab11d3f0c549d58c3dde11ab679dffa08496c..ae5c9d74fda52698d877d5ade3342ec2a058c203 100755 (executable)
--- a/2015/volunteer/index.html
+++ b/2015/volunteer/index.html
@@ -1,15 +1,13 @@
 <!--#include virtual="/server/2015/header.html"-->
-                       <h2> Volunteer Registration(form in development)</h2>
+                       <h2> Volunteer Registration</h2>
 
-<p>Volunteers play many roles in making LibrePlanet great, doing anything from helping plan the and prepare for the conference beforehand, to welcoming attendees at the registration desk to managing video streams during the event. All volunteers recieve gratis admission and a LibrePlanet t-shirt.</p>
+<p>Volunteers make LibrePlanet great, and have fun doing it. Volunteers also recieve gratis conference admission and a LibrePlanet 2015 t-shirt. We have volunteer tasks for a wide variety of skill sets and interests, even if you can't make to Boston, or can only come during the conference weekend.</p>
+
+<p>Some past volunteer roles include: welcoming people at the registration desk, managing video streams, doing outreach before the conference, building the conference Web site, escorting speakers, selling merchandise, and organizing dinners during the conference.</p>
+
+<p>We welcome you to use the #libreplanet channel on Freenode for informal communication with other volunteers before and during the conference. Please email Chrissie at <a href="mailto:resources@fsf.org">resources@fsf.org</a> with any questions.</p>
 
-<p><strong>If you'd like to volunteer in any way, please fill out the form below. If you plan to volunteer during the event, please also send an email to <a href="mailto:resources@fsf.org">resources@fsf.org</a> with your availability for the conference weekend and the Friday before (March 20st-22nd), and any special skills you'd like to employ.</strong></p>
 
-<p>If you want to give us a little more
-                         information about your location, we will be able to
-                         use that in planning future events like LibrePlanet
-                         in different cities. We welcome you to use the #libreplanet channel on Freenode for informal communication.
-                       </p>
                        <form action="https://crm.fsf.org/civicrm/profile/create?gid=327&amp;reset=1"
                                  class="form-horizontal margin-top" method="post" name="Edit" id="Edit1" role="form">
                          <div>
@@ -94,16 +92,6 @@
                                        the Boston area?</label>
 
                                  <div class="col-sm-9">
-                                       <input type="hidden" name="custom_196[1]"
-                                                  value=""/>
-
-                                       <label class="checkbox-inline" for="custom_196_1">
-                                         <input data-crm-custom="LP15_Volunteer_Interests:Could_you_come_to_the_Boston_area_"
-                                                  id="custom_196_1" name="custom_196[1]" type="checkbox"
-                                                  value="1"/>
-                                         Before the conference
-                                       </label>
-
                                        <input type="hidden"
                                                   name="custom_196[2]" value=""
                                                   />
@@ -114,6 +102,17 @@
                                                         />
                                          During the conference
                                        </label>
+
+                                       <input type="hidden" name="custom_196[1]"
+                                                  value=""/>
+
+                                       <label class="checkbox-inline" for="custom_196_1">
+                                         <input data-crm-custom="LP15_Volunteer_Interests:Could_you_come_to_the_Boston_area_"
+                                                  id="custom_196_1" name="custom_196[1]" type="checkbox"
+                                                  value="1"/>
+                                         Before the conference
+                                       </label>
+
                                  </div>
                                </div>
 
@@ -153,7 +152,11 @@
                                  </div>
                                </div>
 
-
+<p>If you want to give us a little more
+                         information about your location, we will be able to
+                         use that in planning future events like LibrePlanet
+                         in different cities.
+                       </p>
                                <div id="editrow-city-Primary"
                                         class="form-group">
                                  <label for="city-Primary" class="col-sm-3 control-label">