From: rsiddharth <rsd@gnu.org>
Date: Thu, 19 Dec 2013 16:42:26 +0000 (+0530)
Subject: [staging area] updated the scholarship form.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f27ee333e12b48ed37d4e8a38a567c5f9eafd0d;p=libreplanet-static.git

[staging area] updated the scholarship form.
---

diff --git a/server/staging/scholarships/index.html b/server/staging/scholarships/index.html
index 4e558cd6..ba75eeba 100644
--- a/server/staging/scholarships/index.html
+++ b/server/staging/scholarships/index.html
@@ -102,6 +102,8 @@
 
 			<p>We are offering a limited number of travel scholarships to assist with expenses related to attending LibrePlanet 2014. While we cannot offer stipends to everyone who applies, we will do our best to bring as many people as possible from as many communities as possible. We are generally unable to cover 100% of your travel and hotel costs, applicants should be prepared to cover some portion of travel expenses. <strong>The application deadline for travel stipends is Friday, January 10, 2014 at 22:00 UTC (17:00 EST).</strong></p>
 
+			<p>One of the goals of our scholarship program is to increase participation by marginalized groups in our conference. We ask for information about your gender, racial, ethnic, and other identities to help us meet this goal. All of these fields are optional.</p>
+
 			<form action="https://crm.fsf.org/civicrm/profile/create?gid=250&amp;reset=1"
 				  class="form-horizontal margin-top" method="post" name="Edit" id="Edit" role="form">
 
@@ -118,20 +120,6 @@
 				   xml:lang="en">
 
 
-				<div id="editrow-email-Primary" class="form-group">
-				  <label for="email-Primary" class="col-sm-3 control-label">
-					Email
-					<span class="field-required">*</span>
-				  </label>
-
-				  <div class="col-sm-5">
-					<input name="email-Primary"
-						   class="form-control"
-						   type="email" id="email-Primary"
-						   placeholder="Your email address" required>
-				  </div>
-				</div>
-
 				<div id="editrow-first_name"
 					 class="form-group">
 				  <label class="col-sm-3 control-label" for="first_name">
@@ -160,6 +148,20 @@
 				  </div>
 				</div>
 
+				<div id="editrow-email-Primary" class="form-group">
+				  <label for="email-Primary" class="col-sm-3 control-label">
+					Email
+					<span class="field-required">*</span>
+				  </label>
+
+				  <div class="col-sm-5">
+					<input name="email-Primary"
+						   class="form-control"
+						   type="email" id="email-Primary"
+						   placeholder="Your email address" required>
+				  </div>
+				</div>
+
 				<div class="form-group"
 					 id="helprow-street_address-Primary">
 				  <div class="col-sm-offset-3 col-sm-5">
@@ -541,131 +543,52 @@
 
 				<hr/>
 
-				<div id="editrow-gender" class="form-group">
-				  <label class="col-sm-3 control-label">
-					Gender
-				  </label>
-
-				  <div class="col-sm-9">
-					<label class="radio-inline"
-						   for="CIVICRM_QFID_3_2">
-					  <input value="3" type="radio" id="CIVICRM_QFID_3_2"
-							 name="gender" />
-					  Transgender</label>&nbsp;
-
-					<label class="radio-inline"  for="CIVICRM_QFID_4_4">
-					  <input value="4" type="radio" id="CIVICRM_QFID_4_4" name="gender"/>
-					  Cisgender</label>&nbsp;
-
-					<label class="radio-inline" for="CIVICRM_QFID_5_6">
-					  <input value="5" type="radio" id="CIVICRM_QFID_5_6" name="gender" />
-					  Genderqueer / Non-Conforming / Variant</label>&nbsp;
-
-					<label class="radio-inline"
-						   for="CIVICRM_QFID_1_8">
-					  <input value="1" type="radio"
-							 id="CIVICRM_QFID_1_8" name="gender"/>
-					  Woman
-					</label>&nbsp;
-
-					<label class="radio-inline"
-						   for="CIVICRM_QFID_2_10">
-					  <input value="2" type="radio"
-							 id="CIVICRM_QFID_2_10" name="gender"/>
-					  Man</label>&nbsp;
-
-					<label class="radio-inline" for="CIVICRM_QFID_6_12">
-					  <input value="6" type="radio" id="CIVICRM_QFID_6_12" name="gender" />
-					  None of these are accurate for
-					  me</label>&nbsp;
-
-					<span class="radio-clear-link">
-					  (<a href="#"
-						  title="unselect"
-						  onclick="unselectRadio('gender', 'Edit'); return false;">clear</a>)
-					</span>
-
-				  </div>
-				</div>
-
-
-
-				<div class="form-group" id="helprow-custom_150">
-				  <div class="col-sm-offset-3 col-sm-9">
-					<p class="help-block scholarship-input-annotation">
-					  <small>
-						Please describe your social identities. These
-						may include race, ethnicity, age, class
-						background, ability/disability, national
-						origin/citizenship status, gender, sexuality,
-						religion/spiritual practice,
-						geography/regional affiliations, education,
-						types of work, etc. This field allows you to
-						self-identify. Please also use the checkboxes
-						provided below.</small>
-					</p>
-				  </div>
-				</div>
-
-				<div id="editrow-custom_150" class="form-group">
-				  <label for="custom_150"
-						 class="col-sm-3 control-label">
-					Self Identify
-				  </label>
-				  <div class="col-sm-9">
-					<textarea rows="4" name="custom_150" id="custom_150"
-							  class="form-control"></textarea>
-				  </div>
-				</div>
-
-
-
 				<div id="editrow-custom_147"
 					 class="form-group">
 				  <label class="col-sm-3 control-label">Age</label>
 
 				  <div class="col-sm-9">
 
-					<label for="CIVICRM_QFID_20_or_under_14"
+					<label for="CIVICRM_QFID_20_or_under_2"
 						   class="radio-inline">
 					  20 or under
 					  <input value="20 or under" type="radio"
-							 id="CIVICRM_QFID_20_or_under_14"
+							 id="CIVICRM_QFID_20_or_under_2"
 							 name="custom_147" /></label>&nbsp;
 
-					<label for="CIVICRM_QFID_21_30_16"
+					<label for="CIVICRM_QFID_21_30_4"
 						   class="radio-inline">
 					  21-30
 					  <input value="21-30" type="radio"
-							 id="CIVICRM_QFID_21_30_16" name="custom_147" />
+							 id="CIVICRM_QFID_21_30_4" name="custom_147" />
 					</label>&nbsp;
 
 					<label class="radio-inline"
-						   for="CIVICRM_QFID_31_40_18">31-40
+						   for="CIVICRM_QFID_31_40_6">31-40
 					  <input value="31-40"
-							 type="radio" id="CIVICRM_QFID_31_40_18"
+							 type="radio" id="CIVICRM_QFID_31_40_6"
 							 name="custom_147" />
 					</label>&nbsp;
 
 					<label class="radio-inline"
-					   for="CIVICRM_QFID_41_50_20">
+					   for="CIVICRM_QFID_41_50_8">
 					  41-50
 					  <input value="41-50"
 							 type="radio"
-							 id="CIVICRM_QFID_41_50_20"
+							 id="CIVICRM_QFID_41_50_8"
 							 name="custom_147"/>
 					</label>&nbsp;
 
 					<label class="radio-inline"
-						   for="CIVICRM_QFID_51_60_22">51-60
+						   for="CIVICRM_QFID_51_60_10">51-60
 					  <input value="51-60"
-							 type="radio" id="CIVICRM_QFID_51_60_22"
+							 type="radio" id="CIVICRM_QFID_51_60_10"
 							 name="custom_147"/></label>&nbsp;
 
 					<label class="radio-inline"
-						   for="CIVICRM_QFID_61_24">61+
+						   for="CIVICRM_QFID_61_12">61+
 					  <input value="61 +"
-							 type="radio" id="CIVICRM_QFID_61_24"
+							 type="radio" id="CIVICRM_QFID_61_12"
 							 name="custom_147"/></label>&nbsp;
 
 					<span class="radio-clear-link">
@@ -676,145 +599,49 @@
 				  </div>
 				</div>
 
-				<div class="form-group"
-					 id="helprow-custom_148">
-				  <div class="col-sm-offset-3 col-sm-5">
-					<p class="help-block scholarship-input-annotation">
-					  <small>Check all that apply</small>
-					</p>
-				  </div>
-				</div>
 
-				<div id="editrow-custom_148" class="form-group">
-				  <label class="col-sm-3 control-label">
-					Race/Ethnicity
+				<div id="editrow-custom_155" class="form-group">
+				  <label class="col-sm-3 control-label"
+						 for="custom_155">
+					Gender
 				  </label>
+				  <div class="col-sm-5">
+					<input name="custom_155" type="text" id="custom_155"
+						   class="form-control" />
+				  </div>
+				</div>
 
-				  <div class="col-sm-9">
-
-					<input type="hidden" name="custom_148[African]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_African">
-					  <input id="custom_148_African" name="custom_148[African]"
-							 type="checkbox" value="1"/>
-					  African
-					</label>&nbsp;
-
-					<input type="hidden" name="custom_148[African American]" value="" />
-					<label class="checkbox-inline" for="custom_148_African_American">
-					  <input id="custom_148_African_American"
-							 name="custom_148[African American]"
-							 type="checkbox" value="1"/>
-					  African American
-					</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Arab American]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Arab_American">
-					  <input id="custom_148_Arab_American" name="custom_148[Arab American]"
-							 type="checkbox" value="1"/>
-					  Arab American
-					</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Asian]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Asian">
-					  <input id="custom_148_Asian" name="custom_148[Asian]"
-							 type="checkbox" value="1"/>
-					  Asian
-					</label>&nbsp;
 
-					<input type="hidden" name="custom_148[Asian American]" value="" />
-					<label class="checkbox-inline" for="custom_148_Asian_American">
-					  <input id="custom_148_Asian_American" name="custom_148[Asian American]"
-							 type="checkbox" value="1"/>
-					  Asian American</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Black]"
-						   value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Black">
-					  <input id="custom_148_Black" name="custom_148[Black]"
-							 type="checkbox" value="1"/>
-					  Black</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Caribbean]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Caribbean">
-					  <input id="custom_148_Caribbean" name="custom_148[Caribbean]"
-							 type="checkbox" value="1"/>Caribbean</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Caucasian]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Caucasian">
-					  <input id="custom_148_Caucasian" name="custom_148[Caucasian]"
-							 type="checkbox" value="1" />Caucasian</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Indigenous]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Indigenous">
-					  <input id="custom_148_Indigenous" name="custom_148[Indigenous]" type="checkbox"
-							 value="1"/>Indigenous</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Latina/Latino]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Latina/Latino">
-					  <input id="custom_148_Latina/Latino" name="custom_148[Latina/Latino]"
-							 type="checkbox" value="1"/>Latina/Latino</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Middle Eastern]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Middle_Eastern">
-					  <input id="custom_148_Middle_Eastern" name="custom_148[Middle Eastern]"
-							 type="checkbox" value="1"/>Middle Eastern</label>&nbsp;
-
-					<input type="hidden" name="custom_148[Pacific Islander]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_Pacific_Islander">
-					  <input id="custom_148_Pacific_Islander" name="custom_148[Pacific Islander]"
-							 type="checkbox" value="1"/>Pacific Islander</label>&nbsp;
-
-					<input type="hidden" name="custom_148[South Asian]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_South_Asian">
-					  <input id="custom_148_South_Asian" name="custom_148[South Asian]"
-							 type="checkbox" value="1"/>South Asian</label>&nbsp;
-
-					<input type="hidden" name="custom_148[White]" value="" />
-					<label class="checkbox-inline"
-						   for="custom_148_White">
-					  <input id="custom_148_White" name="custom_148[White]"
-							 type="checkbox" value="1"
-							 />White</label>&nbsp;
-
-					<input type="hidden" name="custom_148[None of these are accurate for me]" value="" />
-					<label class="checkbox-inline" for="custom_148_None_of_these_are_accurate_for_me">
-					  <input id="custom_148_None_of_these_are_accurate_for_me"
-							 name="custom_148[None of these are accurate for me]" type="checkbox" value="1"/>
-					  None of these are accurate for me</label>
+				<div id="editrow-custom_156" class="form-group">
+				  <label class="col-sm-3 control-label"
+						 for="custom_156">
+					Race/Ethnicity</label>
+				  <div class="col-sm-5">
+					<input name="custom_156" type="text" id="custom_156"
+						   class="form-control" />
 				  </div>
 				</div>
 
-				<div class="form-group" id="helprow-custom_154">
-				  <div class="col-sm-offset-3 col-sm-9">
-					<p class="help-block scholarship-input-annotation">
-					  <small>Please describe your social identities. These may include
-						race, ethnicity, age, class background, ability/disability, national
-						origin/citizenship status, gender, sexuality, religion/spiritual
-						practice, geography/regional affiliations, education, types of work,
-						etc. This field allows you to self-identify. Please also use the
-						checkboxes provided below.</small>
-					</p>
+				<div id="editrow-custom_150" class="form-group">
+				  <label for="custom_150"
+						 class="col-sm-3 control-label">
+					Additional Information
+				  </label>
+				  <div class="col-sm-9">
+					<textarea rows="4" name="custom_150" id="custom_150"
+							  class="form-control"></textarea>
+					<p class="help-block"><small>We are working to increase the participation of marginalized groups at LibrePlanet. Please describe any other identity information you feel is important. These may include race, ethnicity, age, class background, ability/disability, national origin/citizenship status, gender, sexuality, religion/spiritual practice, geography/regional affiliations, education, types of work, etc.</small></p>
 				  </div>
 				</div>
 
 				<div id="editrow-custom_154" class="form-group">
 				  <label class="col-sm-3 control-label" for="custom_154">
-					Do you require any special accommodations of any kind?
+					Are there any special accommodations that would make it easier for you to attend LibrePlanet?
 				  </label>
 				  <div class="col-sm-9">
 					<textarea rows="4" name="custom_154" id="custom_154"
 							  class="form-control"></textarea>
+					<p class="help-block"><small>Examples: ASL interpretation, wheelchair accessibility, etc.</small></p>
 				  </div>
 				</div>
 
@@ -840,7 +667,7 @@
 				</div>
 
 				<div id="editrow-custom_153" class="form-group">
-				  <label class="col-sm-3" for="custom_153">
+				  <label class="col-sm-3 control-label" for="custom_153">
 					Estimated travel and hotel expenses
 				  </label>
 				  <div class="col-sm-9">
@@ -853,20 +680,23 @@
 			  <!-- end form-layout-compressed for last profile -->
 
 			  <div class="form-group">
-				<p>
-				  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 policy</a> for more information.
-				</p>
+				<div class="col-sm-12">
+				  <p>
+					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 policy</a> for more information.
+				  </p>
+				</div>
 			  </div>
 
 			  <div class="form-group">
-
-				<input class="btn btn-default"
-					   accesskey="S" name="_qf_Edit_next"
-					   value="Save" type="submit"
-					   id="_qf_Edit_next" />
+				<div class="col-sm-12">
+				  <input class="btn btn-default"
+						 accesskey="S" name="_qf_Edit_next"
+						 value="Save" type="submit"
+						 id="_qf_Edit_next" />
+				</div>
 			  </div>
 
 		  </form>