diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-16 11:10:02 +0100 |
| commit | 5d8ce5f4775ac8bc5f523964e6e36f63ff3c4683 (patch) | |
| tree | 49ed889b1d10cda98c475f3453abff1b97afb4e7 /lib/generators/nifty/authentication/templates/views/haml | |
| parent | c9066760fd1f5f2f892ce2be5cf2a83bb5210246 (diff) | |
| parent | 55784bcffc0678ce6102c0b81447434a8030ebd2 (diff) | |
Merge branch 'develop'5.1-beta5
Diffstat (limited to 'lib/generators/nifty/authentication/templates/views/haml')
| -rw-r--r-- | lib/generators/nifty/authentication/templates/views/haml/_form.html.haml | 2 | ||||
| -rw-r--r-- | lib/generators/nifty/authentication/templates/views/haml/login.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml b/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml index 992ee9c..e740959 100644 --- a/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml +++ b/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml @@ -12,5 +12,5 @@ .field = f.label :password_confirmation, "Confirm Password" = f.password_field :password_confirmation - .actions + .form-actions = f.submit (@<%= user_singular_name %>.new_record? ? "Sign up" : "Update") diff --git a/lib/generators/nifty/authentication/templates/views/haml/login.html.haml b/lib/generators/nifty/authentication/templates/views/haml/login.html.haml index 3aebb44..877d8f9 100644 --- a/lib/generators/nifty/authentication/templates/views/haml/login.html.haml +++ b/lib/generators/nifty/authentication/templates/views/haml/login.html.haml @@ -11,7 +11,7 @@ .field = f.label :password = f.password_field :password - .actions + .form-actions = f.submit "Log in" <%- else -%> - form_tag <%= session_plural_name %>_path do @@ -21,6 +21,6 @@ .field = label_tag :password = password_field_tag :password - .actions + .form-actions = submit_tag "Log in" <%- end -%> |