From af101adb7c66201e175642ff0ef99988b42d2df2 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
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 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'users/app/helpers/users_helper.rb')

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
-- 
cgit v1.2.3


From a2d343619e752f62cb7e3445803e4491696af391 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
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/helpers/users_helper.rb | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'users/app/helpers/users_helper.rb')

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
-- 
cgit v1.2.3


From 4aff08fe9696d2f6b92f8a8c2bbb2f96a26277e7 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'users/app/helpers/users_helper.rb')

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|
-- 
cgit v1.2.3