diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
| commit | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch) | |
| tree | 6c88289c9f99be0af8635636fcdf64102090e5ec /lib/generators/nifty | |
| parent | 5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff) | |
| parent | 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff) | |
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'lib/generators/nifty')
8 files changed, 10 insertions, 10 deletions
diff --git a/lib/generators/nifty/authentication/templates/views/haml/edit.html.haml b/lib/generators/nifty/authentication/templates/views/haml/edit.html.haml index 4b43a3b..7f21ea3 100644 --- a/lib/generators/nifty/authentication/templates/views/haml/edit.html.haml +++ b/lib/generators/nifty/authentication/templates/views/haml/edit.html.haml @@ -1,3 +1,3 @@ -- title "Sign up" +- content_for :title, "Sign up" = render "form" 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 22fc95b..3aebb44 100644 --- a/lib/generators/nifty/authentication/templates/views/haml/login.html.haml +++ b/lib/generators/nifty/authentication/templates/views/haml/login.html.haml @@ -1,4 +1,4 @@ -- title "Log in" +- content_for :title, "Log in" %p== Don't have an account? #{link_to "Sign up!", signup_path} diff --git a/lib/generators/nifty/authentication/templates/views/haml/signup.html.haml b/lib/generators/nifty/authentication/templates/views/haml/signup.html.haml index dc75c13..8557204 100644 --- a/lib/generators/nifty/authentication/templates/views/haml/signup.html.haml +++ b/lib/generators/nifty/authentication/templates/views/haml/signup.html.haml @@ -1,4 +1,4 @@ -- title "Sign up" +- content_for :title, "Sign up" %p== Already have an account? #{link_to "Log in", login_path}. diff --git a/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml index 9cbea63..a523d32 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/_index_core.html.haml @@ -1,12 +1,12 @@ -%table +%table{:class => 'table table-striped'} %tr <%- for attribute in model_attributes -%> %th= t('<%= plural_name %>.index.<%= attribute.name %>') <%- end -%> - - reset_cycle + - for <%= instance_name %> in <%= instances_name %> - %tr{:class => cycle('odd', 'even')} + %tr <%- for attribute in model_attributes -%> %td= <%= instance_name %>.<%= attribute.name %> <%- end -%> diff --git a/lib/generators/nifty/scaffold/templates/views/haml/edit.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/edit.html.haml index dc7de62..381fba0 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/edit.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/edit.html.haml @@ -1,3 +1,3 @@ -- title t("<%= plural_name %>.edit.page_title") +- content_for :title, t("<%= plural_name %>.edit.page_title") <%= render_form %>
\ No newline at end of file diff --git a/lib/generators/nifty/scaffold/templates/views/haml/index.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/index.html.haml index 86c6b9e..b6642ad 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/index.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/index.html.haml @@ -1,4 +1,4 @@ -- title t("<%= plural_name %>.index.page_title") +- content_for :title, t("<%= plural_name %>.index.page_title") - if @<%= instances_name %> && @<%= instances_name %>.count > 0 = render "index_core", :<%= instances_name %> => @<%= instances_name %> diff --git a/lib/generators/nifty/scaffold/templates/views/haml/new.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/new.html.haml index 4e7f871..d9a6bb5 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/new.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/new.html.haml @@ -1,3 +1,3 @@ -- title t("<%= plural_name %>.new.page_title") +- content_for :title, t("<%= plural_name %>.new.page_title") <%= render_form %>
\ No newline at end of file diff --git a/lib/generators/nifty/scaffold/templates/views/haml/show.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/show.html.haml index 3d01340..bd73c52 100644 --- a/lib/generators/nifty/scaffold/templates/views/haml/show.html.haml +++ b/lib/generators/nifty/scaffold/templates/views/haml/show.html.haml @@ -1,4 +1,4 @@ -- title t("<%= plural_name %>.show.page_title") +- content_for :title, t("<%= plural_name %>.show.page_title") <%- for attribute in model_attributes -%> %p |