From 1de597b338f0622a7732676907365de673c34dfb Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 3 Dec 2012 10:24:49 +0100 Subject: enable admin to edit users --- users/app/views/users/_user.html.haml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'users/app') diff --git a/users/app/views/users/_user.html.haml b/users/app/views/users/_user.html.haml index 5eb7941..7db0041 100644 --- a/users/app/views/users/_user.html.haml +++ b/users/app/views/users/_user.html.haml @@ -2,6 +2,9 @@ %td= user.login %td= time_ago_in_words(user.created_at) + " ago" %td + = link_to edit_user_path(user), :class => "btn btn-mini btn-primary" do + %i.icon-edit.icon-white + Edit = link_to user_path(user), :method => :delete, :class => "btn btn-danger btn-mini" do %i.icon-remove.icon-white Remove -- cgit v1.2.3 From 2a928455f9dcefa465b80b79768ba1d1a423e6e9 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 3 Dec 2012 10:52:01 +0100 Subject: enable users to cancel their account --- users/app/controllers/users_controller.rb | 2 +- users/app/views/users/edit.html.haml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'users/app') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 3407191..cffc8c6 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -36,7 +36,7 @@ class UsersController < ApplicationController def destroy @user.destroy - redirect_to users_path + redirect_to admin? ? users_path : login_path end protected diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 8298443..cfcf220 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -1,3 +1,10 @@ .span8.offset2 %h2=t :settings = render 'form' + - if @user == current_user + %legend + =t :cancel_account + %small You will not be able to login anymore. + = link_to user_path(@user), :method => :delete, :class => "btn btn-danger" do + %i.icon-remove.icon-white + Remove my Account -- cgit v1.2.3 From 059b6fca8468e7b9a2507f24b84e09ce4b8c3ddd Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 6 Dec 2012 16:03:59 +0100 Subject: seperated login and password changes in settings --- users/app/views/users/_form.html.haml | 18 ++++++++++++------ users/app/views/users/edit.html.haml | 11 +++-------- 2 files changed, 15 insertions(+), 14 deletions(-) (limited to 'users/app') diff --git a/users/app/views/users/_form.html.haml b/users/app/views/users/_form.html.haml index fc835af..39e26a6 100644 --- a/users/app/views/users/_form.html.haml +++ b/users/app/views/users/_form.html.haml @@ -1,9 +1,15 @@ +- only = local_assigns[:only] - html = {:class => 'form-horizontal user form ' + (@user.new_record? ? 'new' : 'edit')} = simple_form_for @user, :validate => true, :format => :json, :html => html do |f| %legend - = @user.new_record? ? t(:signup_message) : t(:edit_settings) - = f.input :login, :input_html => { :id => :srp_username } - = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password } - = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation } - = f.button :submit, :class => 'btn-primary' - = link_to t(:cancel), root_url, :class => :btn + = 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 } + .pull-right + = f.button :submit, :class => 'btn-primary' + - unless only + = link_to t(:cancel), root_url, :class => :btn + .clearfix diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index cfcf220..25da71a 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -1,10 +1,5 @@ .span8.offset2 %h2=t :settings - = render 'form' - - if @user == current_user - %legend - =t :cancel_account - %small You will not be able to login anymore. - = link_to user_path(@user), :method => :delete, :class => "btn btn-danger" do - %i.icon-remove.icon-white - Remove my Account + = render :partial => 'form', :locals => {:only => :change_login} + = render :partial => 'form', :locals => {:only => :change_password} + = render 'cancel_account' if @user == current_user -- cgit v1.2.3 From f65b0bc32fd2785458d4076faf89683effca5031 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 6 Dec 2012 17:00:53 +0100 Subject: forgot to add new partial --- users/app/views/users/_cancel_account.html.haml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 users/app/views/users/_cancel_account.html.haml (limited to 'users/app') diff --git a/users/app/views/users/_cancel_account.html.haml b/users/app/views/users/_cancel_account.html.haml new file mode 100644 index 0000000..41580b0 --- /dev/null +++ b/users/app/views/users/_cancel_account.html.haml @@ -0,0 +1,6 @@ +%legend + =t :cancel_account + %small You will not be able to login anymore. += link_to user_path(@user), :method => :delete, :class => "btn btn-danger" do + %i.icon-remove.icon-white + Remove my Account -- cgit v1.2.3 From af101adb7c66201e175642ff0ef99988b42d2df2 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 10:00:21 +0100 Subject: refactored views to ease adding of email form --- users/app/helpers/users_helper.rb | 20 ++++++++++++++++++++ users/app/models/user.rb | 1 + users/app/views/users/_email_field.html.haml | 1 + users/app/views/users/_email_forward_field.html.haml | 1 + users/app/views/users/_form.html.haml | 8 ++------ users/app/views/users/_legend_and_submit.html.haml | 10 ++++++++++ users/app/views/users/_login_field.html.haml | 1 + users/app/views/users/_password_fields.html.haml | 2 ++ users/app/views/users/_signup.html.haml | 2 ++ users/app/views/users/edit.html.haml | 17 ++++++++++++++--- users/app/views/users/new.html.haml | 2 +- 11 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 users/app/views/users/_email_field.html.haml create mode 100644 users/app/views/users/_email_forward_field.html.haml create mode 100644 users/app/views/users/_legend_and_submit.html.haml create mode 100644 users/app/views/users/_login_field.html.haml create mode 100644 users/app/views/users/_password_fields.html.haml create mode 100644 users/app/views/users/_signup.html.haml (limited to 'users/app') diff --git a/users/app/helpers/users_helper.rb b/users/app/helpers/users_helper.rb index 2310a24..dec8904 100644 --- a/users/app/helpers/users_helper.rb +++ b/users/app/helpers/users_helper.rb @@ -1,2 +1,22 @@ module UsersHelper + + def user_form_with(partial, legend, locals) + user_form do |f| + locals.reverse_merge! :legend => legend, :f => f + render :partial => partial, + :layout => 'legend_and_submit', + :locals => locals + end + end + + def user_form + html_class = 'form-horizontal user form ' + html_class += (@user.new_record? ? 'new' : 'edit') + simple_form_for @user, + :validate => true, + :format => :json, + :html => {:class => html_class} do |f| + yield f + end + 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..cc172e9 --- /dev/null +++ b/users/app/views/users/_legend_and_submit.html.haml @@ -0,0 +1,10 @@ +%legend + = t(legend) += yield +.pull-right + - if local_assigns[:with_cancel] + = f.button :submit, :class => 'btn-primary' + = link_to t(:cancel), root_url, :class => :btn + - else + = f.button :submit +.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/_signup.html.haml b/users/app/views/users/_signup.html.haml new file mode 100644 index 0000000..51bfaef --- /dev/null +++ b/users/app/views/users/_signup.html.haml @@ -0,0 +1,2 @@ += render :partial => 'login_field', :locals => local_assigns += render :partial => 'password_fields', :locals => local_assigns diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 25da71a..4192959 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', :change_login + = user_form_with 'password_fields', :change_password + = render 'cancel_account' if @user == current_user + .tab-pane#email + = user_form_with 'email_field', :set_email_address + = user_form_with 'email_forward_field', :forward_email diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml index c1c4208..81588b1 100644 --- a/users/app/views/users/new.html.haml +++ b/users/app/views/users/new.html.haml @@ -1,3 +1,3 @@ .span8.offset2 %h2=t :signup - = render 'form' + = user_form_with 'signup', :signup_message, :with_cancel => true -- cgit v1.2.3 From a2d343619e752f62cb7e3445803e4491696af391 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 12:30:15 +0100 Subject: using normal requests for user updates except password password requires ajax for secure remote password to work --- users/app/assets/javascripts/users.js.coffee | 5 ++--- users/app/controllers/users_controller.rb | 2 +- users/app/helpers/users_helper.rb | 30 ++++++++++++++++++---------- users/app/views/users/edit.html.haml | 8 ++++---- users/app/views/users/new.html.haml | 2 +- 5 files changed, 28 insertions(+), 19 deletions(-) (limited to 'users/app') diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee index 76a6d79..9a2af7a 100644 --- a/users/app/assets/javascripts/users.js.coffee +++ b/users/app/assets/javascripts/users.js.coffee @@ -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..320ed96 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -31,7 +31,7 @@ class UsersController < ApplicationController def update @user.update_attributes(params[:user]) - respond_with @user + 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 dec8904..5d9eff7 100644 --- a/users/app/helpers/users_helper.rb +++ b/users/app/helpers/users_helper.rb @@ -1,22 +1,32 @@ module UsersHelper - def user_form_with(partial, legend, locals) - user_form do |f| - locals.reverse_merge! :legend => legend, :f => f + def user_form_with(partial, options = {}) + user_form(options) do |f| + options[:f] = f render :partial => partial, :layout => 'legend_and_submit', - :locals => locals + :locals => options end end - def user_form - html_class = 'form-horizontal user form ' - html_class += (@user.new_record? ? 'new' : 'edit') + def user_form(options) simple_form_for @user, - :validate => true, - :format => :json, - :html => {:class => html_class} do |f| + :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/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 4192959..b33c19b 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -8,9 +8,9 @@ .tab-content .tab-pane.active#account - = user_form_with 'login_field', :change_login - = user_form_with 'password_fields', :change_password + = 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', :set_email_address - = user_form_with 'email_forward_field', :forward_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 81588b1..1814847 100644 --- a/users/app/views/users/new.html.haml +++ b/users/app/views/users/new.html.haml @@ -1,3 +1,3 @@ .span8.offset2 %h2=t :signup - = user_form_with 'signup', :signup_message, :with_cancel => true + = user_form_with 'signup', :legend => :signup_message, :with_cancel => true -- cgit v1.2.3 From 4aff08fe9696d2f6b92f8a8c2bbb2f96a26277e7 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 12:48:04 +0100 Subject: refactor: use seperate form for signup creating and editing users differ so much now it's not worth reusing the complex user_form_with for the signup. --- users/app/helpers/users_helper.rb | 2 +- users/app/views/users/_legend_and_submit.html.haml | 12 +++--------- users/app/views/users/_signup.html.haml | 2 -- users/app/views/users/new.html.haml | 10 +++++++++- 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 users/app/views/users/_signup.html.haml (limited to 'users/app') diff --git a/users/app/helpers/users_helper.rb b/users/app/helpers/users_helper.rb index 5d9eff7..b017bca 100644 --- a/users/app/helpers/users_helper.rb +++ b/users/app/helpers/users_helper.rb @@ -9,7 +9,7 @@ module UsersHelper end end - def user_form(options) + def user_form(options = {}) simple_form_for @user, :html => user_form_html_options(options), :validate => true do |f| diff --git a/users/app/views/users/_legend_and_submit.html.haml b/users/app/views/users/_legend_and_submit.html.haml index cc172e9..c20a226 100644 --- a/users/app/views/users/_legend_and_submit.html.haml +++ b/users/app/views/users/_legend_and_submit.html.haml @@ -1,10 +1,4 @@ -%legend - = t(legend) -= yield -.pull-right - - if local_assigns[:with_cancel] - = f.button :submit, :class => 'btn-primary' - = link_to t(:cancel), root_url, :class => :btn - - else - = f.button :submit +%legend= t(legend) +=yield +.pull-right= f.button :submit .clearfix diff --git a/users/app/views/users/_signup.html.haml b/users/app/views/users/_signup.html.haml deleted file mode 100644 index 51bfaef..0000000 --- a/users/app/views/users/_signup.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -= render :partial => 'login_field', :locals => local_assigns -= render :partial => 'password_fields', :locals => local_assigns diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml index 1814847..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 - = user_form_with 'signup', :legend => :signup_message, :with_cancel => true + = 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 + -- cgit v1.2.3 From 85be030a434cfab4b7728e4883624d362ec7afbd Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 13:00:44 +0100 Subject: first stub at displaying success messages --- users/app/controllers/users_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'users/app') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 320ed96..24db13b 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -22,7 +22,9 @@ class UsersController < ApplicationController end def create - @user = User.create(params[:user]) + if @user = User.create(params[:user]) + flash[:notice] = t(:user_created_successfully) + end respond_with @user end @@ -30,7 +32,9 @@ class UsersController < ApplicationController end def update - @user.update_attributes(params[:user]) + if @user.update_attributes(params[:user]) + flash[:notice] = t(:user_updated_successfully) + end respond_with @user, :location => edit_user_path(@user) end -- cgit v1.2.3 From b6c32177efa351e6550840ad508b59c4e722fbb6 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 14:17:57 +0100 Subject: adding a bunch of translation --- users/app/views/users/_legend_and_submit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/app') diff --git a/users/app/views/users/_legend_and_submit.html.haml b/users/app/views/users/_legend_and_submit.html.haml index c20a226..6fc0e4a 100644 --- a/users/app/views/users/_legend_and_submit.html.haml +++ b/users/app/views/users/_legend_and_submit.html.haml @@ -1,4 +1,4 @@ %legend= t(legend) =yield -.pull-right= f.button :submit +.pull-right= f.button :submit, :value => t(legend) .clearfix -- cgit v1.2.3 From 7273dab05b68f033de26bb68cca4b72c17b9908a Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 7 Dec 2012 14:24:10 +0100 Subject: fixed signup and removed flash that was not getting displayed I also tried flash.keep(:notice) but that did not help - not sure how to keep the flash until the root url has rendered. --- users/app/assets/javascripts/users.js.coffee | 2 +- users/app/controllers/users_controller.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'users/app') diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee index 9a2af7a..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 = '/' diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 24db13b..4921a4a 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -22,9 +22,7 @@ class UsersController < ApplicationController end def create - if @user = User.create(params[:user]) - flash[:notice] = t(:user_created_successfully) - end + @user = User.create(params[:user]) respond_with @user end -- cgit v1.2.3