From d42e41d110bc49b617249a49c83d68518f751acf Mon Sep 17 00:00:00 2001
From: rsiddharth <rsd@gnu.org>
Date: Mon, 16 Dec 2013 23:05:51 +0530
Subject: [PATCH] [staging area] updated the form modified:  
 server/staging/scholarships/index.html

---
 server/staging/scholarships/index.html | 325 +++++++++++++++----------
 1 file changed, 199 insertions(+), 126 deletions(-)

diff --git a/server/staging/scholarships/index.html b/server/staging/scholarships/index.html
index d966761b..4e558cd6 100644
--- a/server/staging/scholarships/index.html
+++ b/server/staging/scholarships/index.html
@@ -541,27 +541,143 @@
 
 				<hr/>
 
-				<div id="editrow-custom_107" class="form-group">
+				<div id="editrow-gender" class="form-group">
 				  <label class="col-sm-3 control-label">
-					Would you be willing to volunteer at the event?
-					<span class="field-required">*</span>
+					Gender
 				  </label>
 
-				  <div class="col-sm-5">
-					<label class="radio-inline" for="CIVICRM_QFID_1_2">
-					  <input value="1"
-							 type="radio" id="CIVICRM_QFID_1_2" name="custom_107"
-							 />Yes</label>&nbsp;
-
-					<label class="radio-inline" for="CIVICRM_QFID_0_4">
-					<input value="0"
-						   type="radio" id="CIVICRM_QFID_0_4" name="custom_107"
-						   />No</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"
+						   class="radio-inline">
+					  20 or under
+					  <input value="20 or under" type="radio"
+							 id="CIVICRM_QFID_20_or_under_14"
+							 name="custom_147" /></label>&nbsp;
+
+					<label for="CIVICRM_QFID_21_30_16"
+						   class="radio-inline">
+					  21-30
+					  <input value="21-30" type="radio"
+							 id="CIVICRM_QFID_21_30_16" name="custom_147" />
+					</label>&nbsp;
+
+					<label class="radio-inline"
+						   for="CIVICRM_QFID_31_40_18">31-40
+					  <input value="31-40"
+							 type="radio" id="CIVICRM_QFID_31_40_18"
+							 name="custom_147" />
+					</label>&nbsp;
+
+					<label class="radio-inline"
+					   for="CIVICRM_QFID_41_50_20">
+					  41-50
+					  <input value="41-50"
+							 type="radio"
+							 id="CIVICRM_QFID_41_50_20"
+							 name="custom_147"/>
+					</label>&nbsp;
+
+					<label class="radio-inline"
+						   for="CIVICRM_QFID_51_60_22">51-60
+					  <input value="51-60"
+							 type="radio" id="CIVICRM_QFID_51_60_22"
+							 name="custom_147"/></label>&nbsp;
+
+					<label class="radio-inline"
+						   for="CIVICRM_QFID_61_24">61+
+					  <input value="61 +"
+							 type="radio" id="CIVICRM_QFID_61_24"
+							 name="custom_147"/></label>&nbsp;
+
+					<span class="radio-clear-link">
+					  (<a href="#"
+						  title="unselect"
+						  onclick="unselectRadio('custom_147', 'Edit'); return false;">
+						clear</a>)</span>
 				  </div>
 				</div>
 
 				<div class="form-group"
-					 id="helprow-custom_122">
+					 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>
@@ -569,209 +685,166 @@
 				  </div>
 				</div>
 
-				<div id="editrow-custom_122" class="form-group">
+				<div id="editrow-custom_148" class="form-group">
 				  <label class="col-sm-3 control-label">
 					Race/Ethnicity
 				  </label>
 
 				  <div class="col-sm-9">
 
-					<input type="hidden" name="custom_122[African]" value="" />
+					<input type="hidden" name="custom_148[African]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_African">
-					  <input id="custom_122_African" name="custom_122[African]"
+						   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_122[African American]" value="" />
-					<label class="checkbox-inline" for="custom_122_African_American">
-					  <input id="custom_122_African_American"
-							 name="custom_122[African American]"
+					<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_122[Arab American]" value="" />
+					<input type="hidden" name="custom_148[Arab American]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Arab_American">
-					  <input id="custom_122_Arab_American" name="custom_122[Arab American]"
+						   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_122[Asian]" value="" />
+					<input type="hidden" name="custom_148[Asian]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Asian">
-					  <input id="custom_122_Asian" name="custom_122[Asian]"
+						   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_122[Asian American]" value="" />
-					<label class="checkbox-inline" for="custom_122_Asian_American">
-					  <input id="custom_122_Asian_American" name="custom_122[Asian American]"
+					<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_122[Black]"
+					<input type="hidden" name="custom_148[Black]"
 						   value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Black">
-					  <input id="custom_122_Black" name="custom_122[Black]"
+						   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_122[Caribbean]" value="" />
+					<input type="hidden" name="custom_148[Caribbean]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Caribbean">
-					  <input id="custom_122_Caribbean" name="custom_122[Caribbean]"
+						   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_122[Caucasian]" value="" />
+					<input type="hidden" name="custom_148[Caucasian]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Caucasian">
-					  <input id="custom_122_Caucasian" name="custom_122[Caucasian]"
+						   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_122[Indigenous]" value="" />
+					<input type="hidden" name="custom_148[Indigenous]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Indigenous">
-					  <input id="custom_122_Indigenous" name="custom_122[Indigenous]" type="checkbox"
+						   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_122[Latina/Latino]" value="" />
+					<input type="hidden" name="custom_148[Latina/Latino]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Latina/Latino">
-					  <input id="custom_122_Latina/Latino" name="custom_122[Latina/Latino]"
+						   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_122[Middle Eastern]" value="" />
+					<input type="hidden" name="custom_148[Middle Eastern]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Middle_Eastern">
-					  <input id="custom_122_Middle_Eastern" name="custom_122[Middle Eastern]"
+						   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_122[Pacific Islander]" value="" />
+					<input type="hidden" name="custom_148[Pacific Islander]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_Pacific_Islander">
-					  <input id="custom_122_Pacific_Islander" name="custom_122[Pacific Islander]"
+						   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_122[South Asian]" value="" />
+					<input type="hidden" name="custom_148[South Asian]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_South_Asian">
-					  <input id="custom_122_South_Asian" name="custom_122[South Asian]"
+						   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_122[White]" value="" />
+					<input type="hidden" name="custom_148[White]" value="" />
 					<label class="checkbox-inline"
-						   for="custom_122_White">
-					  <input id="custom_122_White" name="custom_122[White]"
+						   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_122[None of these are accurate for me]" value="" />
-					<label class="checkbox-inline" for="custom_122_None_of_these_are_accurate_for_me">
-					  <input id="custom_122_None_of_these_are_accurate_for_me"
-							 name="custom_122[None of these are accurate for me]" type="checkbox" value="1"/>
+					<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>
 				</div>
 
-				<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_6">
-					  <input value="3" type="radio" id="CIVICRM_QFID_3_6"
-							 name="gender" />
-					  Transgender</label>&nbsp;
-
-					<label class="radio-inline"  for="CIVICRM_QFID_4_8">
-					  <input value="4" type="radio" id="CIVICRM_QFID_4_8" name="gender"/>
-					  Cisgender</label>&nbsp;
-
-					<label class="radio-inline" for="CIVICRM_QFID_5_10">
-					  <input value="5" type="radio" id="CIVICRM_QFID_5_10" name="gender" />
-					  Genderqueer / Non-Conforming / Variant</label>&nbsp;
-
-					<label class="radio-inline"
-						   for="CIVICRM_QFID_1_12">
-					  <input value="1" type="radio"
-							 id="CIVICRM_QFID_1_12" name="gender"/>
-					  Woman
-					</label>&nbsp;
-
-					<label class="radio-inline"
-						   for="CIVICRM_QFID_2_14">
-					  <input value="2" type="radio"
-							 id="CIVICRM_QFID_2_14" name="gender"/>
-					  Man</label>&nbsp;
-
-					<label class="radio-inline" for="CIVICRM_QFID_6_16">
-					  <input value="6" type="radio" id="CIVICRM_QFID_6_16" 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_104">
-				  <div class="col-sm-offset-3 col-sm-5">
+				<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 limit each of your answers to 150 words.</small>
+					  <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_104" class="form-group">
-				  <label class="col-sm-3 control-label" for="custom_104">
-					GNU Project affiliation, if any
+				<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?
 				  </label>
 				  <div class="col-sm-9">
-					<textarea rows="4" name="custom_104" id="custom_104"
+					<textarea rows="4" name="custom_154" id="custom_154"
 							  class="form-control"></textarea>
 				  </div>
 				</div>
 
-				<div id="editrow-custom_105" class="form-group">
-				  <label class="col-sm-3 control-label" for="custom_105">
+				<div id="editrow-custom_151" class="form-group">
+				  <label class="col-sm-3 control-label" for="custom_151">
 					Why do you want to attend LibrePlanet 2014?</label>
 				  <div class="col-sm-9">
 					<textarea
-					   rows="4" name="custom_105" id="custom_105"
+					   rows="4" name="custom_151" id="custom_151"
 					   class="form-control"></textarea>
 				  </div>
 				</div>
 
-				<div id="editrow-custom_106" class="form-group">
-				  <label class="col-sm-3 control-label" for="custom_106">
+				<div id="editrow-custom_152" class="form-group">
+				  <label class="col-sm-3 control-label" for="custom_152">
 					How do you plan to bring your
 					experience back to your community?
 				  </label>
 				  <div class="col-sm-9">
-					<textarea rows="4" name="custom_106" id="custom_106"
+					<textarea rows="4" name="custom_152" id="custom_152"
 							  class="form-control"></textarea>
 				  </div>
 				</div>
 
-				<div id="editrow-custom_103" class="form-group">
-				  <label class="col-sm-3" for="custom_103">
+				<div id="editrow-custom_153" class="form-group">
+				  <label class="col-sm-3" for="custom_153">
 					Estimated travel and hotel expenses
 				  </label>
 				  <div class="col-sm-9">
-					<textarea rows="4" name="custom_103" id="custom_103"
+					<textarea rows="4" name="custom_153" id="custom_153"
 							  class="form-control"></textarea>
 				  </div>
 				</div>
-- 
2.25.1