From: Jozef Zigmund <[email protected]>
---
src/app/controllers/users_controller.rb | 6 +++++-
src/app/views/users/_form.haml | 14 +++++++-------
src/app/views/users/new.haml | 13 ++++++-------
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/app/controllers/users_controller.rb
b/src/app/controllers/users_controller.rb
index 8488509..0c82b1a 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -70,4 +70,8 @@ class UsersController < ApplicationController
def index
@users = User.all
end
-end
\ No newline at end of file
+
+ def section_id
+ "loginpage"
+ end
+end
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index 7c4ee81..f433a99 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -1,19 +1,19 @@
%ul
%li
- = form.label :login, "Choose a username"
+ = form.label :login, "User ID:"
= form.text_field :login
%li
- = form.label :password, form.object.new_record? ? "Choose a password" :
"Change password"
- = form.password_field :password
- %li
- = form.label :password_confirmation, "Confirm password"
- = form.password_field :password_confirmation
- %li
= form.label :first_name
= form.text_field :first_name
%li
= form.label :last_name
= form.text_field :last_name
%li
+ = form.label :password, form.object.new_record? ? "Password" : "Change
password"
+ = form.password_field :password
+ %li
+ = form.label :password_confirmation, "Confirm"
+ = form.password_field :password_confirmation
+ %li
= form.label :email
= form.text_field :email
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml
index 600cee3..c80fc46 100644
--- a/src/app/views/users/new.haml
+++ b/src/app/views/users/new.haml
@@ -1,7 +1,6 @@
-.dcloud_form
- %h2 New Account
- - form_for @user, :url => account_path do |f|
- = f.error_messages
- = render :partial => "form", :object => f
- = f.submit "Create Account", :class => "submit"
- = link_to "Cancel", root_path, :class => 'actionlink'
+- form_for @user, :url => account_path , :html => { :id =>"login"}do |f|
+ %h2 Create an Account
+ = f.error_messages
+ = render :partial => "form", :object => f
+ = f.submit "Create Account", :class => "formbutton"
+ = link_to "Cancel", root_path, :class => "formbutton"
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
