Merge pull request #744 from sparc-request/kg-protocol_page_language_…

…changes

KG - Protocol Page Text/Style Updates

app/views/service_requests/protocol/_protocol_display.html.haml

@@ -33,7 +33,5 @@
         %small
           = t(:proper)[:protocol][:create_protocol_instructions]
     .col-sm-12.protocol-container.text-center
-      = link_to t(:protocols)[:studies][:new], new_protocol_path(srid: service_request.id, protocol_type: 'Study'), class: 'btn btn-success new-study'
-      = link_to t(:protocols)[:projects][:new], new_protocol_path(srid: service_request.id, protocol_type: 'Project'), class: 'btn btn-success new-project'
-      .protocol-select-help
-        = link_to t(:proper)[:protocol][:selection_help][:question], 'javascript:void(0)', title: [t(:proper)[:protocol][:selection_help][:study_response], t(:proper)[:protocol][:selection_help][:project_response]], data: { toggle: 'tooltip', placement: 'bottom' }
+      = link_to t(:protocols)[:studies][:new], new_protocol_path(srid: service_request.id, protocol_type: 'Study'), class: 'btn btn-lg btn-success new-study', title: t(:proper)[:protocol][:study_tooltip], data: { toggle: 'tooltip' }
+      = link_to t(:protocols)[:projects][:new], new_protocol_path(srid: service_request.id, protocol_type: 'Project'), class: 'btn btn-lg btn-primary new-project', title: t(:proper)[:protocol][:project_tooltip], data: { toggle: 'tooltip' }

config/locales/en.yml

@@ -304,7 +304,7 @@ en:
       updated: "Protocol Type Updated!"
       new_study_warning: "Please complete Sponsor Name and Publish Study in Epic"
     studies:
-      new: "New Study"
+      new: "New Research Study"
       information:
         header: "Study Information"
         subtext: "Necessary to obtain correct pricing"

config/locales/proper.en.yml

@@ -87,11 +87,8 @@ en:
       review_protocol_notice: "Protocol Information"
       review_protocol_instructions: "Review your Protocol and Authorized Users"
       percent_effort_notice: "If Professional Services are covered by % effort, please indicate in Step 2."
-      selection_help:
-        question: "Which type of Protocol should I choose?"
-        tooltip:
-        study_response: "Choose 'New Study' for a research study with defined aims and outcomes."
-        project_response: "Choose 'New Project' for non-study-specific Service Requests or anything that is not a research study."
+      study_tooltip: "Choose 'New Research Study' for a Research Study with defined aims and outcomes."
+      project_tooltip: "Choose 'New Project' for non-study-specific Service Requests or anything that is not a Research Study."
       previously_submitted_warning: "The request that you are editing has been previously submitted and can not be moved to another %{protocol_type}."
       authorized_users:
         self_remove_warning: "You can't remove yourself as an Authorized User of this Protocol. Please complete this request first or create a new request."

spec/features/protocol/user_creates_study_spec.rb

@@ -36,12 +36,12 @@
     StudyTypeQuestionGroup.create(active: true)
   end
 
-  context 'and clicks \'New Study\'' do
+  context 'and clicks \'New Research Study\'' do
     scenario 'and sees the study form' do
       visit protocol_service_request_path(@sr)
       wait_for_javascript_to_finish
 
-      click_link 'New Study'
+      click_link 'New Research Study'
       wait_for_javascript_to_finish
 
       expect(page).to have_content('Study Information')
@@ -53,7 +53,7 @@
       visit protocol_service_request_path(@sr)
       wait_for_javascript_to_finish
 
-      click_link 'New Study'
+      click_link 'New Research Study'
       wait_for_javascript_to_finish
 
       fill_in 'protocol_short_title', with: 'asd'