From a05924b94bd3bbf493c0489f6c369a0a41f09ebc Mon Sep 17 00:00:00 2001
From: Stephanie Wilkinson <what.happens@gmail.com>
Date: Fri, 29 Sep 2017 12:14:47 -0700
Subject: [PATCH] remove username stuff and changed heart icon

---
 app/views/conference_registrations/_form.html.haml       | 4 ----
 app/views/devise/registrations/edit.html.haml            | 2 +-
 app/views/devise/shared/_sign_up_form_embedded.html.haml | 3 ++-
 app/views/layouts/_navigation.html.haml                  | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/conference_registrations/_form.html.haml b/app/views/conference_registrations/_form.html.haml
index 971a613f..8f8698bf 100644
--- a/app/views/conference_registrations/_form.html.haml
+++ b/app/views/conference_registrations/_form.html.haml
@@ -9,10 +9,6 @@
     .col-md-8
       - unless current_user
         %legend
-          %span
-            =link_to('#signup', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
-              = ENV['OSEM_NAME'] || 'OSEM'
-              Account
           %span.pull-right#account-already
             =link_to('#signin', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
               Already have an account?
diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
index c884a194..8c803c84 100644
--- a/app/views/devise/registrations/edit.html.haml
+++ b/app/views/devise/registrations/edit.html.haml
@@ -6,7 +6,7 @@
   .row
     .col-md-12
       = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
-        = f.input :username, required: false, input_html: { autocomplete: 'off' }
+        = f.input :username, label: "First Name", required: false, input_html: { autocomplete: 'off' }
         = f.input :email, required: false, input_html: { autocomplete: 'off' }
         = f.input :email_public
         = f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: { autocomplete: 'off' }
diff --git a/app/views/devise/shared/_sign_up_form_embedded.html.haml b/app/views/devise/shared/_sign_up_form_embedded.html.haml
index 5bc038f0..688958d4 100644
--- a/app/views/devise/shared/_sign_up_form_embedded.html.haml
+++ b/app/views/devise/shared/_sign_up_form_embedded.html.haml
@@ -1,6 +1,7 @@
 - unless current_user
   = semantic_fields_for @user do |u|
-    = u.input :username, input_html: { required: 'required', autocomplete: 'off' }
+    = u.input :username, label: "First Name", input_html: { required: 'required', autocomplete: 'off' }
+    = u.input :name, label: "Last Name", input_html: { required: 'required', autocomplete: 'off' }
     = u.input :email, input_html: { required: 'required', autocomplete: 'off' }
     = u.input :password, input_html: { required: 'required', autocomplete: 'off', id: 'password_inline' }
     = u.input :password_confirmation, input_html: { required: 'required', autocomplete: 'off' }
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 9995123b..df4c58af 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -54,12 +54,12 @@
           - if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
             %li{class: "#{active_nav_li(new_ichain_registration_path('user'))}"}
               = link_to(new_ichain_registration_path('user')) do
-                %span.fa.fa-heart
+                %span.fa.fa-user-plus
                 Sign Up
           - else
             %li{class: "#{active_nav_li(new_registration_path('user'))}"}
               = link_to(new_registration_path('user')) do
-                %span.fa.fa-heart
+                %span.fa.fa-user-plus
                 Sign Up
           %li.dropdown.visible-desktop
             %a.dropdown-toggle{"data-toggle" => "dropdown", href: '#'}