Merge pull request #443 from rails-girls-summer-of-code/lg-text-fixes

text fixes to application form
rails-girls-summer-of-code · Mar 21, 2016 · f44e8b4 · f44e8b4
2 parents 36a48d7 + 8ed0a45
commit f44e8b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/application_drafts/_form.html.slim b/app/views/application_drafts/_form.html.slim
@@ -68,7 +68,7 @@ p.attention
       h2 Working together
       = f.input :working_together, label: 'Since this is a self-guided program, how are you planning to work together?', input_html: { rows: 5, disabled: !application_draft.as_student? || application_draft.applied? }
 
-      h2 For volunteer teams only
+      h2 Only to be filled if you can apply as a volunteer (non-sponsored) team
       p You can read up on volunteer teams in the #{link_to 'application guide', 'http://railsgirlssummerofcode.org/students/application/#volunteer-teams', target: :blank}.
       = f.input :voluntary, as: :boolean, hint: 'This will not exclude you from being in the running for a sponsored seat.', label: 'We could join the RGSoC as a voluntary team', input_html: { disabled: !application_draft.as_student? || application_draft.applied? }
       = f.input :voluntary_hours_per_week, as: :integer, label: 'As a voluntary team, how many hours per week would you be able to work on the project?', hint: 'Please only enter a full number, e.g. 15', input_html: { disabled: !application_draft.as_student? || application_draft.applied? }

diff --git a/app/views/application_drafts/_student_fields.html.slim b/app/views/application_drafts/_student_fields.html.slim
@@ -50,7 +50,7 @@
 
   = s.input :application_goals, label: "What do you want to achieve by the end of the summer?", input_html: { rows: 4, disabled: !may_edit?(s.object) }, wrapper_html: { class: student_field_error_class(index, application_draft, :application_goals) }, hint: (student_field_error_hint(index, application_draft, :application_goals))
 
-  = s.input :application_motivation, label: 'Why are you applying to this program, and what do you think you can give back?', input_html: { rows: 10, disabled: !may_edit?(s.object) }, wrapper_html: { class: student_field_error_class(index, application_draft, :application_motivation)}, hint: (student_field_error_hint(index, application_draft, :application_motivation) || "Write a short essay (750-1000 words) explaining your motivation. Please don't mention your name, age, or current location.")
+  = s.input :application_motivation, label: 'Why are you applying to this program, and what do you think you can give back? (Please don\'t mention your name, age, or current location.)', input_html: { rows: 10, disabled: !may_edit?(s.object) }, wrapper_html: { class: student_field_error_class(index, application_draft, :application_motivation)}, hint: (student_field_error_hint(index, application_draft, :application_motivation) || "Write a short essay (750-1000 words) explaining your motivation. Please don't mention your name, age, or current location.")
 
   h2 Financial matters
   = private_application_data(student) do

diff --git a/app/views/users/edit.html.slim b/app/views/users/edit.html.slim
@@ -106,9 +106,9 @@
 
     = f.input :application_goals, label: "What do you want to achieve by the end of the summer?", input_html: { rows: 4 }
 
-    = f.input :application_motivation, label: 'Why are you applying to this program, and what do you think you can give back?', hint: "Write a short essay (750-1000 words) explaining your motivation. Please don't mention your name, age, or current location.", input_html: { rows: 10 }
+    = f.input :application_motivation, label: 'Why are you applying to this program, and what do you think you can give back? (Please don\'t mention your name, age, or current location.)', hint: "Write a short essay (750-1000 words) explaining your motivation. Please don't mention your name, age, or current location.", input_html: { rows: 10 }
 
-    = f.input :application_money, :collection => (200..1500).step(50), label: 'How much money, in USD, do you need per month to sustain yourself while working fulltime on an Open Source project?', hint: "Double-check your selection by using #{link_to 'this cost of living calculator', 'http://www.numbeo.com/cost-of-living/', target: :blank}. If you need more than $1500/month, select 1500 and let us know so below.".html_safe
+    = f.input :application_money, collection: (200..1500).step(50).entries + ['1500+'], label: 'How much money, in USD, do you need per month to sustain yourself while working fulltime on an Open Source project?', hint: "Double-check your selection by using #{link_to 'this cost of living calculator', 'http://www.numbeo.com/cost-of-living/', target: :blank}. If you need more than $1500/month, let us know so below.".html_safe
 
     = f.input :application_minimum_money, as: :text, label: "If needed, you can use this field to break down your costs for us, or point out any special circumstances which require a higher budget than what you've selected above or than what is usual for your city.", hint: 'The total of the stipend will be decided on case-by-case basis, taking into consideration data from the world bank plus individual living situations.', input_html: { rows: 4 }