Rework the Sign Up/Sign In views

Use Capybaras save_page when feature tests go wrong

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

@@ -23,7 +23,8 @@
           %h4
             To add an openID with a different email address to your account, sign in with your
             openID while logged in to OSEM
-          = render 'devise/shared/openid'
+          #openidlinks
+            = render 'devise/shared/openid'
 
       = f.inputs name: 'Account' do
         = f.input :email, required: false, input_html: {autocomplete: "off"}

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

@@ -1,21 +1,32 @@
 .row
-  .page-header
-    %h1.text-center Sign Up
-  .col-md-5.col-md-offset-1
-    .well
-      = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
-        = f.input :email
-        = f.input :name, required: true
-        = f.input :password
-        = f.input :password_confirmation
-        = f.action :submit, as: :button, label: 'Sign Up', button_html: {class: 'btn btn-primary'}
-        %br
-        %br
-        %h4 Already have an account?
-      = render 'devise/shared/links'
-  - if resource_class.omniauth_providers.present?
-    .col-md-4
-      .well
-        %h4 Or use your openID
-
-        = render 'devise/shared/openid'
+  .col-md-6.col-md-offset-3
+    .panel.panel-default
+      .panel-heading
+        %h3.panel-title
+          Sign Up
+      .panel-body
+        = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+          = f.input :email
+          = f.input :name, required: true
+          = f.input :password
+          = f.input :password_confirmation
+          %p.text-right
+            = f.action :submit, as: :button, label: 'Sign Up', button_html: {class: 'btn btn-success' }
+        - unless omniauth_configured.empty?
+          .row
+            .col-md-4
+              %hr
+            .col-md-4
+              %h4.text-center
+                or sign up using
+            .col-md-4
+              %hr
+          .row
+            .col-md-12
+              #openidlinks
+                = render 'devise/shared/openid'
+              %p.text-right
+                %a.small{"data-toggle" => "collapse", "data-target" =>  "#devise-help"}
+                  Need Help?
+                #devise-help.collapse
+                  = render 'devise/shared/links'

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

@@ -1,22 +1,34 @@
 .row
-  .page-header
-    %h2.text-center Sign In
-  .col-md-5.col-md-offset-1
-    .well
-      = semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-        = f.input :email
-        = f.input :password
-        - if devise_mapping.rememberable?
-          = f.check_box :remember_me
-          = f.label 'Remember me'
-        %br
-        = f.action :submit, as: :button, label: 'Sign In', button_html: {class: 'btn btn-primary'}
-        %br
-        %br
-        = render "devise/shared/links"
-
-  - if resource_class.omniauth_providers.present?
-    .col-md-4
-      .well
-        %h4 Or use your openID
-        = render 'devise/shared/openid'
+  .col-md-6.col-md-offset-3
+    .panel.panel-default
+      .panel-heading
+        %h3.panel-title
+          Sign In
+      .panel-body
+        = semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+          = f.input :email
+          = f.input :password
+          - if devise_mapping.rememberable?
+            %p.text-right.small
+              = f.label 'Remember me'
+              = f.check_box :remember_me
+          %p.text-right
+            = f.action :submit, as: :button, label: 'Sign In', button_html: {class: 'btn btn-success'}
+        - unless omniauth_configured.empty?
+          .row
+            .col-md-4
+              %hr
+            .col-md-4
+              %h4.text-center
+                or sign in using
+            .col-md-4
+              %hr
+          .row
+            .col-md-12
+              #openidlinks
+                = render 'devise/shared/openid'
+              %p.text-right
+                %a.small{"data-toggle" => "collapse", "data-target" =>  "#devise-help"}
+                  Need Help?
+                #devise-help.collapse
+                  = render 'devise/shared/links'

app/views/devise/shared/_links.html.haml

@@ -1,16 +1,8 @@
-- if controller_name != 'sessions'
-  = link_to "Sign in", new_user_session_path
-  %br
-
-- if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Sign up", new_registration_path(resource_name)
-  %br
-
-- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+- if devise_mapping.recoverable? && controller_name != 'passwords'
   = link_to "Forgot your password?", new_password_path(resource_name)
   %br
 
-- if devise_mapping.confirmable? && controller_name != 'confirmations'
+- if devise_mapping.confirmable? && controller_name != 'confirmations' && controller_name == 'passwords'
   = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
   %br
 

app/views/devise/shared/_openid.html.haml

@@ -1,7 +1,7 @@
-- if devise_mapping.omniauthable?
-  - resource_class.omniauth_providers.each do |provider|
-    - provider_key = "#{provider}_key"
-    - provider_secret = "#{provider}_secret"
-    - unless Rails.application.secrets.send(provider_key).blank? || Rails.application.secrets.send(provider_secret).blank?
-      = link_to image_tag("#{provider}.png", size: '32x32') + provider , omniauth_authorize_path(resource_name, provider)
-      %br
+.btn-group.btn-group-lg
+  - omniauth_configured.each do |provider|
+    = link_to user_omniauth_authorize_path(provider),
+                                      class: "btn btn-success btn-lg",
+                                      id: "omniauth-#{provider}",
+                                      title: "Your #{provider} login" do
+      %i{:class => "fa fa-#{provider}"}