diff options
author | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
---|---|---|
committer | spag <spag@golwen.net> | 2013-02-14 10:42:39 +0100 |
commit | 41303b0a2a07b897f7373eebba25708da89085a1 (patch) | |
tree | 88e48da31bdd92d80af76c18d0df992f7d09f91b /lib/generators | |
parent | a1aafe9eec98f91fd76d104964ad98fcafc94a80 (diff) | |
parent | a9bf3a7e1fd802025824668e477a5ec14ce81d5a (diff) |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'lib/generators')
3 files changed, 5 insertions, 5 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 -%> diff --git a/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml index 57cb828..b12f1cb 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml @@ -3,5 +3,5 @@ = render "form_core", :f => f - .actions - = f.button :submit, conditional_t('<%= plural_name %>.form.submit')
\ No newline at end of file + .form-actions + = f.button :submit, conditional_t('<%= plural_name %>.form.submit') |