Merge acbc7df96a into e2a7e396a2

app/models/user.rb

@@ -54,6 +54,7 @@ class User < ActiveRecord::Base
   scope :admin, -> { where(is_admin: true) }
 
   validates :email, presence: true
+  validates :password, :password_confirmation, presence: true, on: :create
 
   validates :username,
             uniqueness: {

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

@@ -10,11 +10,8 @@
             = f.input :url, as: :hidden, input_html: { value: @back_url }
             = f.input :context, as: :hidden, input_html: { value: @context }
             = f.input :proxypath, as: :hidden, input_html: { value: @proxypath }
-
             = f.input :username, input_html: { autofocus: true }
             = f.input :password, as: :password
-
             %p.text-right
               = f.action :submit, as: :button, label: 'Sign In', button_html: { class: 'btn btn-success' }
-
             = render partial: 'devise/shared/help'

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

@@ -2,21 +2,22 @@
   .row
     .col-md-12
       .page-header
-        %h1 Edit your Account
+        %h1 Edit Your Account
   .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 :email, required: false, input_html: { autocomplete: 'off' }
-        = f.input :email_public
+        = f.input :email_public, label: "Make my email public"
         = f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: { autocomplete: 'off' }
         = f.input :password_confirmation, input_html: { autocomplete: 'off' }
         = f.inputs name: 'OpenID' do
-          %h4
+          - if @openids.present?
-            Currently the following openIDs are associated with your account
+            %h4
-          - @openids.each do |openid|
+              Currently the following openIDs are associated with your account
-            %li= "#{openid.provider}:#{openid.email}"
+              - @openids.each do |openid|
-            %br
+                %li= "#{openid.provider}:#{openid.email}"
+                %br
           %h4
             To add an openID with a different email address to your account, sign in with your
             openID while logged in to OSEM

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

@@ -9,7 +9,7 @@
           = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
             = f.input :username, input_html: { required: true }
             = f.input :email, input_html: { required: true }
-            = f.input :name, input_html: { required: true }
+            = f.input :name
             = f.input :password, input_html: { required: true }
             = f.input :password_confirmation, input_html: { required: true }
             %p.text-right

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

@@ -7,7 +7,7 @@
             Sign In
         .panel-body
           = semantic_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-            = f.input :login
+            = f.input :login, label: "Username / Email"
             = f.input :password
             - if devise_mapping.rememberable?
               %p.text-right.small

app/views/users/edit.html.haml

@@ -11,7 +11,7 @@
         .control-label
           = "Avatar"
         = image_tag(@user.gravatar_url(size: '48'), title: "Yo #{@user.name}!", alt: '')
-        = link_to 'Change your avatar here', 'https://gravatar.com'
+        = link_to 'Change your avatar here', 'https://gravatar.com', target: :_blank
         = f.input :affiliation, as: :string,
           hint: 'This could be a company, a user group, or nothing at all.'
         = f.input :biography, input_html: { rows: 5, data: { provide: 'markdown-editable' } },