hackathon_manager 0.4.4 → 0.5.0

data/app/inputs/deletable_attachment_input.rb

@@ -4,7 +4,7 @@ class DeletableAttachmentInput < SimpleForm::Inputs::FileInput
     out = ''
     out << @builder.file_field(attribute_name, merged_input_options)
     if object.send("#{attribute_name}?")
-      out << @builder.input("delete_#{attribute_name}", as: :boolean, label: "Remove?")
+      out << @builder.input("delete_#{attribute_name}", as: :boolean, label: "Remove?", wrapper_html: { class: 'deletable_attachment_input' })
     end
     out.html_safe
   end

data/app/models/questionnaire.rb

@@ -145,6 +145,20 @@ class Questionnaire < ApplicationRecord
     SlackInviteWorker.perform_async(id)
   end
 
+  def verbal_status
+    if acc_status == "rsvp_denied"
+      "Not Attending"
+    elsif acc_status == "rsvp_confirmed"
+      "Accepted & Attending"
+    elsif acc_status == "accepted"
+      "Accepted, Awaiting RSVP"
+    elsif ["pending", "waitlist", "late_waitlist"].include? acc_status
+      "Pending Review"
+    elsif acc_status == "denied"
+      "Denied"
+    end
+  end
+
   private
 
   def consolidate_school_names

data/app/views/bus_lists/show.html.haml

@@ -1,5 +1,8 @@
-%section.section{ style: "padding-left: 20px; padding-right: 20px" }
-  %h1.section-title= title "Bus List"
+- title "Bus Captain"
+.form-container
+  %h1.section-title
+    Bus
+    %span.emphasized Captain
   %p#notice= notice
 
   %p Thank you for being a bus captain! Below is any information you may need about your passengers.

data/app/views/devise/passwords/edit.html.haml

@@ -1,14 +1,15 @@
-.section
-  .container
-    .section-title Change your password
-    .form-container
-      = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
-        = f.error_notification
-        = f.input :reset_password_token, as: :hidden
-        = f.full_error :reset_password_token
-        .form-inputs
-          = f.input :password, label: "New Password", required: true, autofocus: true
-          = f.input :password_confirmation, label: "Confirm", required: true
-        .form-actions
-          = f.button :submit, "Change My Password"
-      = render "devise/shared/links"
+- title 'Change Password'
+.form-container
+  .section-title
+    Change Your
+    %span.emphasized Password
+  = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+    = f.error_notification
+    = f.input :reset_password_token, as: :hidden
+    = f.full_error :reset_password_token
+    .form-inputs
+      = f.input :password, label: "New Password", required: true, autofocus: true
+      = f.input :password_confirmation, label: "Confirm", required: true
+    .form-actions
+      = f.button :submit, "Change My Password"
+  = render "devise/shared/links"

data/app/views/devise/passwords/new.html.haml

@@ -1,5 +1,7 @@
-.section
-  .container
-    %h1.section-title Password Reset
+- title 'Password Reset'
+.form-container
+  %h1.section-title
+    Reset Your
+    %span.emphasized Password
 
-    = render 'form'
+  = render 'form'

data/app/views/devise/registrations/_form.html.haml

@@ -8,9 +8,8 @@
     = f.input :email, required: true, autofocus: true
     = f.input :password, required: true
     = f.input :password_confirmation, required: true, label:"Confirm"
-  .form-actions
-    .center
-      = f.button :submit, "Sign up"
-    %p.center
-      Already applied?
-      = link_to "Sign In".html_safe, new_user_session_path
+  .form-actions.right
+    = f.button :submit, "Register"
+    %p.session-link
+      Have an account?
+      = link_to "Sign in!".html_safe, new_user_session_path

data/app/views/devise/registrations/edit.html.haml

@@ -1,20 +1,18 @@
-%section.section
-  .container
-    %h1.section-title Edit Account
-    .form-container
-      = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
-        = f.error_notification
-        .form-inputs
-          = f.input :email, required: true, autofocus: true
-          - if devise_mapping.confirmable? && resource.pending_reconfirmation?
-            %p
-              Currently waiting confirmation for: #{resource.unconfirmed_email}
-          = f.input :password, autocomplete: "off", hint: "leave blank if you don't want to change it", required: false
-          = f.input :password_confirmation, required: false
-          = f.input :current_password, required: true
-        .form-actions
-          = f.button :submit, "Update"
-    .form-container
-      %p
-        Unhappy? #{link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure? Your account and application will be permanently erased." }, method: :delete}
-      = link_to "Back", :back
+- title 'Edit Account'
+.form-container
+  %h1.section-title
+    Edit
+    %span.emphasized Account
+.form-container
+  = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+    = f.error_notification
+    .form-inputs
+      = f.input :email, required: true, autofocus: true, wrapper_html: { class: 'input--half' }
+      = f.input :current_password, required: true, wrapper_html: { class: 'input--half' }
+      - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+        %p
+          Currently waiting confirmation for: #{resource.unconfirmed_email}
+      = f.input :password, autocomplete: "off", hint: "Leave blank if you don't want to change it", required: false, label: "New password", wrapper_html: { class: 'input--half' }
+      = f.input :password_confirmation, required: false, label: "New password confirmation", wrapper_html: { class: 'input--half' }
+    .form-actions.right
+      = f.button :submit, "Update"

data/app/views/devise/registrations/new.html.haml

@@ -1,15 +1,16 @@
-%section.section
-  .container
-    .form-container.signup
-      %h1.section-title Sign Up
+- title 'Register'
+.form-container.signup
+  %h1.section-title.center
+    Register for
+    %span.emphasized= Rails.configuration.hackathon['name']
 
-      - if Rails.configuration.hackathon['registration_is_open'] || Rails.configuration.hackathon['disclaimer']
-        #disclaimer
-          - unless Rails.configuration.hackathon['registration_is_open']
-            .center
-              %strong Registration is now closed. Thanks to everyone who applied!
-            %br
-          - if Rails.configuration.hackathon['disclaimer']
-            = markdown(Rails.configuration.hackathon['disclaimer'])
+  - if Rails.configuration.hackathon['registration_is_open'] || Rails.configuration.hackathon['disclaimer']
+    #disclaimer
+      - unless Rails.configuration.hackathon['registration_is_open']
+        .center
+          %strong Registration is now closed. Thanks to everyone who applied!
+        %br
+      - if Rails.configuration.hackathon['disclaimer']
+        = markdown(Rails.configuration.hackathon['disclaimer'])
 
-      = render 'form'
+  = render 'form'

data/app/views/devise/sessions/_form.html.haml

@@ -9,10 +9,10 @@
     = f.input :email, required: false, input_html: { autofocus: true }
     = f.input :password, required: false
     = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
-  .form-actions{class:'center'}
+  .form-actions.right
     = f.button :submit, "Sign In"
-    %p
-      Need an account?
-      = link_to "Sign Up".html_safe, new_user_registration_path
-      \-
+    %p.session-link
+      No account?
+      = link_to "Register!".html_safe, new_user_registration_path
+    %p.session-link
       = link_to "Forgot password", new_user_password_path

data/app/views/devise/sessions/new.html.haml

@@ -1,9 +1,10 @@
-.section
-  .container
-    .form-container.login
-      %h1.section-title Sign In
-      - if notice
-        .form-success
-          .success_message
-            %p#notice= notice
-      = render 'form'
+- title 'Sign In'
+.form-container.login
+  %h1.section-title.center
+    Sign in to
+    %span.emphasized= Rails.configuration.hackathon['name']
+  - if notice
+    .form-success
+      .success_message
+        %p#notice= notice
+  = render 'form'

data/app/views/layouts/hackathon_manager/_account_nav.html.haml

@@ -0,0 +1,10 @@
+- if current_user.present?
+  .account-nav
+    .account-nav__wrapper
+      .account-nav__links
+        = active_link_to 'Account', edit_user_registration_path, class: 'account-nav__link', active_class: 'account-nav__link--active'
+        - if current_user.questionnaire.present? && current_user.questionnaire.can_rsvp?
+          = active_link_to 'RSVP', rsvp_path, class: 'account-nav__link', active_class: 'account-nav__link--active'
+        = active_link_to 'Application', questionnaires_path, class: 'account-nav__link', active_class: 'account-nav__link--active'
+        - if current_user.questionnaire.present? && current_user.questionnaire.eligible_for_a_bus? && current_user.questionnaire.is_bus_captain?
+          = active_link_to 'Bus Captain'.html_safe, bus_list_path, class: 'account-nav__link', active_class: 'account-nav__link--active'

data/app/views/layouts/hackathon_manager/_header.html.haml

@@ -0,0 +1,14 @@
+.header
+  .header__wrapper.account-nav__wrapper
+    - if Rails.configuration.hackathon['logo_asset']
+      .header-logo
+        = link_to root_path do
+          = image_tag Rails.configuration.hackathon['logo_asset'], id: 'logo', alt: "#{Rails.configuration.hackathon['name']} logo", title: Rails.configuration.hackathon['name'], class: 'header-logo__image'
+    - else
+      .header-nav
+        = btn_link_to "Home", root_path
+    .header-nav
+      - if user_signed_in?
+        - if current_user.admin?
+          = btn_link_to "Manage", manage_root_path
+        = btn_link_to "Sign Out", destroy_user_session_path, method: :delete

data/app/views/layouts/{_shared_footer.html.haml → hackathon_manager/_shared_footer.html.haml}

@@ -1 +1 @@
-%link{ href:'//fonts.googleapis.com/css?family=Open+Sans:300,400,600', rel: 'stylesheet', type: 'text/css' }
+%link{ href:'//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700', rel: 'stylesheet', type: 'text/css' }

data/app/views/layouts/{hackathon_manager.html.haml → hackathon_manager/application.html.haml}

@@ -8,8 +8,12 @@
     = csrf_meta_tags
 
   %body
-    = render "layouts/sidebar"
+    = render "layouts/hackathon_manager/header"
+    = render "layouts/hackathon_manager/account_nav"
     #main
-      = yield
+      %section.section
+        .container
+          = yield
+    = render "layouts/hackathon_manager/footer"
     = javascript_include_tag "hackathon_manager/application"
-    = render "layouts/shared_footer"
+    = render "layouts/hackathon_manager/shared_footer"

data/app/views/layouts/manage/application.html.haml

@@ -6,7 +6,7 @@
     = csrf_meta_tags
 
   %body
-    = render "layouts/sidebar"
+    = render "layouts/hackathon_manager/header"
     = javascript_include_tag "hackathon_manager/manage/application"
     #main
       #manageNav
@@ -23,4 +23,4 @@
           = link_to "Sidekiq", sidekiq_web_path
           = link_to "Blazer", blazer_path
       = yield
-    = render "layouts/shared_footer"
+    = render "layouts/hackathon_manager/shared_footer"

data/app/views/manage/questionnaires/_form.html.haml

@@ -32,7 +32,7 @@
       = f.input :experience, as: :select, collection: Questionnaire::POSSIBLE_EXPERIENCES.invert, include_blank: "(select one...)", label: "Experience", input_html: { "data-validate" => "presence" }
       = f.input :interest, as: :select, collection: Questionnaire::POSSIBLE_INTERESTS.invert, include_blank: "(select one...)", label: "Interest", input_html: { "data-validate" => "presence" }
 
-      = f.input :resume, as: :deletable_attachment, hint: "Must be < 2MB", input_html: { "data-validate" => "file-max-size file-content-type", "data-validate-file-max-size" => "2097152", "data-validate-file-content-type" => "application/pdf" }, label: "Resume (PDF)"
+      = f.input :resume, as: :deletable_attachment, hint: "Must be under 2MB", input_html: { "data-validate" => "file-max-size file-content-type", "data-validate-file-max-size" => "2097152", "data-validate-file-content-type" => "application/pdf" }, label: "Resume (PDF)"
 
       = f.input :portfolio_url, label: "Portfolio Link", placeholder:"http://mywebsite.com"
       = f.input :vcs_url, label: "GitHub/BitBucket", placeholder:"https://github.com/coderit"

data/app/views/questionnaires/_form.html.haml

@@ -14,63 +14,60 @@
           = markdown(Rails.configuration.hackathon['disclaimer'])
 
       .form-inputs
-        = f.input :first_name, placeholder: "Joe", input_html: { "data-validate" => "presence" }, autofocus: true
-        = f.input :last_name, placeholder: "Smith", input_html: { "data-validate" => "presence" }
-        = f.input :phone, placeholder: "(123) 456-7890", input_html: { "data-validate" => "presence" }
+        = f.input :first_name, input_html: { "data-validate" => "presence" }, autofocus: true, wrapper_html: { class: 'input--half' }
+        = f.input :last_name, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :phone, label: "Phone number", input_html: { "data-validate" => "presence" }
         = f.input :date_of_birth, start_year: Date.today.year - 18, end_year: Date.today.year - 90, order: [:month, :day, :year], input_html: { "data-validate" => "presence" }
 
-        = f.input :school_id, as: :school_selection, placeholder: "My University", input_html: { "data-validate" => "presence" }
-        = f.input :level_of_study, placeholder: "University (Undergraduate)", input_html: { "data-validate" => "presence" }
-        = f.input :major, placeholder: "Major", input_html: { "data-validate" => "presence" }
-        = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" }
-        = f.input :gender, placeholder: "Female, Male, Non-Binary, Prefer not to say, other", input_html: { "data-validate" => "presence" }
-        = f.input :dietary_restrictions, placeholder: "Allergies, medical assistance, etc. (optional)", label: "Health restrictions"
-        = f.input :special_needs, placeholder: "Any special needs or requests (optional)", label: "Special needs"
+        = f.input :school_id, as: :school_selection, input_html: { "data-validate" => "presence" }
+        = f.input :level_of_study, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :major, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :gender, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :dietary_restrictions, as: :text, placeholder: "Allergies, medical assistance, etc.", label: "Health restrictions", wrapper_html: { class: 'input--half' }
+        = f.input :special_needs, as: :text, placeholder: "Any special needs or requests", label: "Special needs", wrapper_html: { class: 'input--half' }
 
-      .center
+      .right
         %button.button{ type: "button", "data-wizard" => "next" } Next
 
     .wizard-stage
       .form-inputs
-        = f.input :experience, as: :select, collection: Questionnaire::POSSIBLE_EXPERIENCES.invert, include_blank: "(select one...)", label: "Experience", input_html: { "data-validate" => "presence" }
-        = f.input :interest, as: :select, collection: Questionnaire::POSSIBLE_INTERESTS.invert, include_blank: "(select one...)", label: "Interest", input_html: { "data-validate" => "presence" }
+        = f.input :experience, as: :select, collection: Questionnaire::POSSIBLE_EXPERIENCES.invert, include_blank: "(select one...)", label: "Experience", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :interest, as: :select, collection: Questionnaire::POSSIBLE_INTERESTS.invert, include_blank: "(select one...)", label: "Interest", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
 
-        = f.input :portfolio_url, label: "Portfolio link", placeholder:"http://mywebsite.com"
-        = f.input :vcs_url, label: "GitHub/Bitbucket", placeholder:"https://github.com/coderit"
-        = f.input :resume, as: :deletable_attachment, hint: "Must be < 2MB", input_html: { "data-validate" => "file-max-size file-content-type", "data-validate-file-max-size" => "2097152", "data-validate-file-content-type" => "application/pdf" }, label: "Resume (PDF)"
-        = f.input :can_share_info, as: :radio_buttons, collection: { " Yes!" => true, " No thank you" => false }, label: "Share info with sponsors?"
-        %p{ style: "margin-top: -10px" }
-          %i
-            %small Our sponsors would receive info such as your name, email, resume, GitHub link, etc
-
-        %hr
+        = f.input :portfolio_url, label: "Portfolio link", placeholder: "http://mywebsite.com"
+        = f.input :vcs_url, label: "GitHub/Bitbucket link", placeholder: "https://github.com/coderit"
+        = f.input :resume, as: :deletable_attachment, hint: "Must be a PDF, under 2MB", input_html: { "data-validate" => "file-max-size file-content-type", "data-validate-file-max-size" => "2097152", "data-validate-file-content-type" => "application/pdf" }, label: "Resume"
+        = f.input :can_share_info, as: :radio_buttons, collection: { " Yes please!" => true, " No, thank you." => false }, label: "Share info with sponsors?", hint: "Our sponsors would receive info such as your name, email, resume, GitHub link, etc"
 
         - travel_state = !@questionnaire.new_record? && @questionnaire.travel_not_from_school
-        = f.input :travel_not_from_school, as: :radio_buttons, collection: { " My School" => false, " Somewhere else" => true }, label: "I am traveling from..."
+        = f.input :travel_not_from_school, as: :radio_buttons, collection: { " My school" => false, " Somewhere else" => true }, label: "I am traveling from..."
         = f.input :travel_location, input_html: { "data-validate" => "presence", disabled: !travel_state }, wrapper_html: { style: travel_state ? "" : "display: none" }, label: "Where are you traveling from?", placeholder: "New York City"
+
       %hr
-      %div
-        %p
-          %small
-            Please read the
-            = link_to asset_url(Rails.configuration.hackathon['agreement_pdf_asset']), target: '_blank' do
-              #{Rails.configuration.hackathon['name']} Agreement
-              %span.fa.fa-external-link.icon-space-l-half
-        = f.input :agreement_accepted, as: :formatted_boolean, label: "I accept the #{Rails.configuration.hackathon['name']} Agreement", input_html: { "data-validate" => "presence" }
-        %p
-          %small
-            Please read the
-            %a{ href:"http://static.mlh.io/docs/mlh-code-of-conduct.pdf", target: "_blank" }
-              MLH Code of Conduct
-              %span.fa.fa-external-link.icon-space-l-half
-        = f.input :code_of_conduct_accepted, as: :formatted_boolean, label: "I accept the MLH Code of Conduct", input_html: { "data-validate" => "presence" }
-        %p
-          %small
-            I agree to the terms of both the
-            <a href="https://github.com/MLH/mlh-policies/tree/master/prize-terms-and-conditions" target="_blank">MLH Contest Terms</a> and Conditions and the
-            <a href="https://mlh.io/privacy" target="_blank">MLH Privacy Policy</a>. Please note that you may receive pre and post-event informational e-mails and occasional messages about hackathons from MLH as per the MLH Privacy Policy.
-        = f.input :data_sharing_accepted, as: :formatted_boolean, label: "I accept the MLH policies", input_html: { "data-validate" => "presence" }
 
-      .center
+      .form-inputs
+        .supporting-text
+          Please read the
+          = link_to asset_url(Rails.configuration.hackathon['agreement_pdf_asset']), target: '_blank' do
+            #{Rails.configuration.hackathon['name']} Agreement
+            %span.fa.fa-external-link.icon-space-l-half
+        = f.input :agreement_accepted, as: :formatted_boolean, label: "I accept the #{Rails.configuration.hackathon['name']} agreement.", input_html: { "data-validate" => "presence" }
+
+        .supporting-text
+          Please read the
+          %a{ href:"http://static.mlh.io/docs/mlh-code-of-conduct.pdf", target: "_blank" }
+            MLH Code of Conduct
+            %span.fa.fa-external-link.icon-space-l-half
+        = f.input :code_of_conduct_accepted, as: :formatted_boolean, label: "I accept the MLH Code of Conduct.", input_html: { "data-validate" => "presence" }
+
+        .supporting-text
+          I agree to the terms of both the
+          <a href="https://github.com/MLH/mlh-policies/tree/master/prize-terms-and-conditions" target="_blank">MLH Contest Terms</a> and Conditions and the
+          <a href="https://mlh.io/privacy" target="_blank">MLH Privacy Policy</a>. Please note that you may receive pre and post-event informational e-mails and occasional messages about hackathons from MLH as per the MLH Privacy Policy.
+        = f.input :data_sharing_accepted, as: :formatted_boolean, label: "I accept the MLH policies.", input_html: { "data-validate" => "presence" }
+
+      .right
         %button.button{ type: "button", "data-wizard" => "previous" } Previous
+        &nbsp;
         = f.button :submit, value: ( @questionnaire.new_record? ? 'Apply' : 'Save' )

data/app/views/questionnaires/edit.html.haml

@@ -1,10 +1,13 @@
-%section.section
-  .container
-    - title "Edit Application"
-    .form-container
-      %h1.section-title Edit #{Rails.configuration.hackathon['name']} Application
+- title "Edit Application"
+.form-container
+  %h1.section-title
+    Edit
+    %span.emphasized Application
 
-    = render 'form'
+= render 'form'
 
-    - if @questionnaire.valid?
-      %p{class:"cancel_btn_wrap"}= link_to 'Cancel', questionnaires_path
+- if @questionnaire.valid?
+  .form-container
+    .right
+      %p.session-link
+        = link_to 'Cancel', questionnaires_path

data/app/views/questionnaires/new.html.haml

@@ -1,7 +1,7 @@
-%section.section
-  .container
-    - title "Apply"
-    .form-container
-      %h1.section-title Apply for #{Rails.configuration.hackathon['name']}
+- title "Apply"
+.form-container
+  %h1.section-title
+    Apply for
+    %span.emphasized= Rails.configuration.hackathon['name']
 
-    = render 'form'
+= render 'form'

data/app/views/questionnaires/show.html.haml

@@ -1,35 +1,54 @@
 - title "Application"
-.form-success
-  .success_message
-    %p#notice= notice
-    - if @questionnaire.can_rsvp?
-      - if @questionnaire.did_rsvp?
-        %p
-          Below is a copy of your information for #{Rails.configuration.hackathon['name']}.
-          = link_to "Back to RSVP page »".html_safe, rsvp_path
-      - else
-        %p
-          You have not RSVP'd yet!
-          %br
-          %br
-          = link_to "RSVP NOW »".html_safe, rsvp_path
+.form-container
+  - if flash[:notice]
+    #disclaimer
+      %p#notice= flash[:notice]
+
+  #disclaimer
+    %h1.section-title
+      Application
+      %span.emphasized Status
+    - if @questionnaire.blank?
+      %strong AWAITING APPLICATION
     - else
-      - if Rails.configuration.hackathon['registration_is_open']
-        - if Rails.configuration.hackathon['thanks_for_applying']
-          = markdown(Rails.configuration.hackathon['thanks_for_applying'])
+      %strong= @questionnaire.verbal_status.upcase
+      - if @questionnaire.can_rsvp?
+        - if @questionnaire.did_rsvp?
+          - if @questionnaire.acc_status == "rsvp_confirmed"
+            %p
+              Congratulations! You're all set to attend #{Rails.configuration.hackathon['name']}!
+            %p
+              Expect an email closer to February 11th with additional logistics & travel info.
+              %br
+              %br
+          %p.center
+            = btn_link_to "Change RSVP", rsvp_path
         - else
-          %p Thanks for applying! You will be notified of your acceptance via email.
+          %p
+            Please RSVP so we know if you're attending!
+            %br
+            %br
+          %p.center
+            = btn_link_to "RSVP NOW »".html_safe, rsvp_path
       - else
-        %p Thanks for applying!
+        - if Rails.configuration.hackathon['registration_is_open']
+          - if Rails.configuration.hackathon['thanks_for_applying']
+            = markdown(Rails.configuration.hackathon['thanks_for_applying'])
+          - else
+            %p Thanks for applying! You will be notified of your acceptance via email.
+        - else
+          %p Thanks for applying!
 
-  .participant_info
-    %p Below is a copy of your application.
+.form-container
+  %h1.section-title.section-title--actions
+    %span
+      Review your
+      %span.emphasized Application
+    = btn_link_to 'Edit', edit_questionnaires_path, class: 'section-title__action'
 
+  .participant_info
     = render partial: 'questionnaire_summary'
 
-    %p
-      = btn_link_to '<span class="fa fa-pencil icon-space-r"></span> Edit Application'.html_safe, edit_questionnaires_path
-      - if !@questionnaire.user.provider
-        = btn_link_to '<span class="fa fa-user icon-space-r"></span> Edit Account'.html_safe, edit_user_registration_path
-    %p
-      Unhappy? #{link_to "Revoke my application", user_registration_path, data: { confirm: "Are you sure? Your account and application will be permanently erased." }, method: :delete}
+  %br
+  %p.session-link.right
+    Unhappy? #{link_to "Revoke my application", user_registration_path, data: { confirm: "Are you sure? Your account and application will be permanently erased." }, method: :delete}