Merge pull request #311 from differentreality/openid

Only show openid options if providers are set in User model.

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

@@ -15,15 +15,15 @@
         %br
       = f.inputs name: 'OpenID' do
         %h4
-          Currently using the following openIDs:
+          Currently the following openIDs are associated with your account
         - @openids.each do |openid|
-          = openid.provider
-          = openid.email
+          %li= "#{openid.provider}:#{openid.email}"
           %br
-        %h4
-          To add an openID to your account using a different email address, sign in with your
-          openID while logged in to OSEM
-        = render 'devise/shared/openid'
+        - if User.omniauth_providers.present?
+          %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'
 
       = f.inputs name: 'Account' do
         = f.input :email, required: false, input_html: {autocomplete: "off"}

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

@@ -13,8 +13,9 @@
         %br
         %h4 Already have an account?
       = render 'devise/shared/links'
-  .col-md-4
-    .well
-      %h4 Or use your openID
+  - if resource_class.omniauth_providers.present?
+    .col-md-4
+      .well
+        %h4 Or use your openID
 
-      = render 'devise/shared/openid'
+        = render 'devise/shared/openid'

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

@@ -15,7 +15,8 @@
         %br
         = render "devise/shared/links"
 
-  .col-md-4
-    .well
-      %h4 Or use your openID
-      = render 'devise/shared/openid'
+  - if resource_class.omniauth_providers.present?
+    .col-md-4
+      .well
+        %h4 Or use your openID
+        = render 'devise/shared/openid'