summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-07 17:26:42 +0100
committerAzul <azul@leap.se>2012-12-07 17:26:42 +0100
commit8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (patch)
tree4df73c0a0f37ee9f16cd3f15fc2d23f458ca09ba /users
parentbc2ead40468f0d9372372f73260d83d30e93bc9a (diff)
parentbfe61e5132b379461425ce868e980e3a1ea0260a (diff)
Merge branch 'feature/email-forwards-for-users'
Diffstat (limited to 'users')
-rw-r--r--users/app/assets/javascripts/users.js.coffee7
-rw-r--r--users/app/controllers/users_controller.rb6
-rw-r--r--users/app/helpers/users_helper.rb30
-rw-r--r--users/app/models/user.rb1
-rw-r--r--users/app/views/users/_email_field.html.haml1
-rw-r--r--users/app/views/users/_email_forward_field.html.haml1
-rw-r--r--users/app/views/users/_form.html.haml8
-rw-r--r--users/app/views/users/_legend_and_submit.html.haml4
-rw-r--r--users/app/views/users/_login_field.html.haml1
-rw-r--r--users/app/views/users/_password_fields.html.haml2
-rw-r--r--users/app/views/users/edit.html.haml17
-rw-r--r--users/app/views/users/new.html.haml10
-rw-r--r--users/config/locales/en.yml20
-rw-r--r--users/test/functional/users_controller_test.rb2
14 files changed, 93 insertions, 17 deletions
diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
index 76a6d79..0595292 100644
--- a/users/app/assets/javascripts/users.js.coffee
+++ b/users/app/assets/javascripts/users.js.coffee
@@ -3,7 +3,7 @@ preventDefault = (event) ->
srp.session = new srp.Session()
srp.signedUp = ->
- srp.login
+ srp.login()
srp.loggedIn = ->
window.location = '/'
@@ -29,7 +29,6 @@ $(document).ready ->
$('#new_user').submit srp.signup
$('#new_session').submit preventDefault
$('#new_session').submit srp.login
- $('.user.form.edit').submit srp.update
- $('.user.form.edit').submit preventDefault
+ $('.user.form.change_password').submit srp.update
+ $('.user.form.change_password').submit preventDefault
$('.user.typeahead').typeahead({source: pollUsers});
-
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index cffc8c6..4921a4a 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -30,8 +30,10 @@ class UsersController < ApplicationController
end
def update
- @user.update_attributes(params[:user])
- respond_with @user
+ if @user.update_attributes(params[:user])
+ flash[:notice] = t(:user_updated_successfully)
+ end
+ respond_with @user, :location => edit_user_path(@user)
end
def destroy
diff --git a/users/app/helpers/users_helper.rb b/users/app/helpers/users_helper.rb
index 2310a24..b017bca 100644
--- a/users/app/helpers/users_helper.rb
+++ b/users/app/helpers/users_helper.rb
@@ -1,2 +1,32 @@
module UsersHelper
+
+ def user_form_with(partial, options = {})
+ user_form(options) do |f|
+ options[:f] = f
+ render :partial => partial,
+ :layout => 'legend_and_submit',
+ :locals => options
+ end
+ end
+
+ def user_form(options = {})
+ simple_form_for @user,
+ :html => user_form_html_options(options),
+ :validate => true do |f|
+ yield f
+ end
+ end
+
+ def user_form_html_options(options)
+ { :class => user_form_html_classes(options).join(" "),
+ :id => dom_id(@user, options[:legend])
+ }
+ end
+
+ def user_form_html_classes(options)
+ classes = %W/form-horizontal user form/
+ classes << options[:legend]
+ classes << (@user.new_record? ? 'new' : 'edit')
+ classes.compact
+ end
end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 325c981..ae271ce 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -2,6 +2,7 @@ class User < CouchRest::Model::Base
property :login, String, :accessible => true
property :email, String, :accessible => true
+ property :email_forward, String, :accessible => true
property :password_verifier, String, :accessible => true
property :password_salt, String, :accessible => true
diff --git a/users/app/views/users/_email_field.html.haml b/users/app/views/users/_email_field.html.haml
new file mode 100644
index 0000000..36bbeca
--- /dev/null
+++ b/users/app/views/users/_email_field.html.haml
@@ -0,0 +1 @@
+= f.input :email
diff --git a/users/app/views/users/_email_forward_field.html.haml b/users/app/views/users/_email_forward_field.html.haml
new file mode 100644
index 0000000..049428f
--- /dev/null
+++ b/users/app/views/users/_email_forward_field.html.haml
@@ -0,0 +1 @@
+= f.input :email_forward
diff --git a/users/app/views/users/_form.html.haml b/users/app/views/users/_form.html.haml
index 39e26a6..cb51175 100644
--- a/users/app/views/users/_form.html.haml
+++ b/users/app/views/users/_form.html.haml
@@ -3,13 +3,9 @@
= simple_form_for @user, :validate => true, :format => :json, :html => html do |f|
%legend
= t(only || :signup_message)
- - if !only || only == :change_login
- = f.input :login, :input_html => { :id => :srp_username }
- - if !only || only == :change_password
- = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
- = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
+ = yield
.pull-right
- = f.button :submit, :class => 'btn-primary'
+ = f.button :submit
- unless only
= link_to t(:cancel), root_url, :class => :btn
.clearfix
diff --git a/users/app/views/users/_legend_and_submit.html.haml b/users/app/views/users/_legend_and_submit.html.haml
new file mode 100644
index 0000000..6fc0e4a
--- /dev/null
+++ b/users/app/views/users/_legend_and_submit.html.haml
@@ -0,0 +1,4 @@
+%legend= t(legend)
+=yield
+.pull-right= f.button :submit, :value => t(legend)
+.clearfix
diff --git a/users/app/views/users/_login_field.html.haml b/users/app/views/users/_login_field.html.haml
new file mode 100644
index 0000000..8ab36c3
--- /dev/null
+++ b/users/app/views/users/_login_field.html.haml
@@ -0,0 +1 @@
+= f.input :login, :input_html => { :id => :srp_username }
diff --git a/users/app/views/users/_password_fields.html.haml b/users/app/views/users/_password_fields.html.haml
new file mode 100644
index 0000000..c2e6a69
--- /dev/null
+++ b/users/app/views/users/_password_fields.html.haml
@@ -0,0 +1,2 @@
+= f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
+= f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
index 25da71a..b33c19b 100644
--- a/users/app/views/users/edit.html.haml
+++ b/users/app/views/users/edit.html.haml
@@ -1,5 +1,16 @@
.span8.offset2
%h2=t :settings
- = render :partial => 'form', :locals => {:only => :change_login}
- = render :partial => 'form', :locals => {:only => :change_password}
- = render 'cancel_account' if @user == current_user
+ %ul.nav.nav-tabs
+ %li.active
+ %a{:href => '#account', 'data-toggle' => 'tab'}Account
+ %li
+ %a{:href => '#email', 'data-toggle' => 'tab'}Email
+
+ .tab-content
+ .tab-pane.active#account
+ = user_form_with 'login_field', :legend => :change_login
+ = user_form_with 'password_fields', :legend => :change_password
+ = render 'cancel_account' if @user == current_user
+ .tab-pane#email
+ = user_form_with 'email_field', :legend => :set_email_address
+ = user_form_with 'email_forward_field', :legend => :forward_email
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index c1c4208..98cccb0 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -1,3 +1,11 @@
.span8.offset2
%h2=t :signup
- = render 'form'
+ = user_form do |f|
+ %legend= t(:signup_message)
+ = render :partial => 'login_field', :locals => {:f => f}
+ = render :partial => 'password_fields', :locals => {:f => f}
+ .pull-right
+ = f.button :submit, :class => 'btn-primary'
+ = link_to t(:cancel), root_url, :class => :btn
+ .clearfix
+
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 1260494..fe7e824 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -6,9 +6,29 @@ en:
login_message: "Please login with your account."
wrong_password: "wrong password"
user_not_found: "could not be found"
+ change_login: "Change Login"
+ change_password: "Change Password"
+ cancel_account: "Cancel your account"
+ set_email_address: "Set email address"
+ forward_email: "Forward email"
+ email_aliases: "Email aliases"
+ user_updated_successfully: "Settings have been updated successfully."
+ user_created_successfully: "Successfully created your account."
activemodel:
models:
user:
one: User
other: "%{count} Users"
+ simple_form:
+ labels:
+ user:
+ email_forward: "Email forward"
+ hints:
+ user:
+ email_forward: "Forward all emails to this address"
+ email: "Your leap web email address"
+ placeholders:
+ user:
+ email_forward: "my_other_email@domain.net"
+
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 939d105..1840a72 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -35,7 +35,7 @@ class UsersControllerTest < ActionController::TestCase
end
test "should get edit view" do
- user = find_record User
+ user = find_record User, :email => nil, :email_forward => nil
login user
get :edit, :id => user.id