mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge commit 'jose/generators'
This commit is contained in:
commit
7e3abbfdc2
3 changed files with 4 additions and 3 deletions
|
@ -2,12 +2,12 @@
|
|||
<%%= f.error_messages %>
|
||||
|
||||
<% for attribute in attributes -%>
|
||||
<div class="attribute">
|
||||
<div class="field">
|
||||
<%%= f.label :<%= attribute.name %> %><br />
|
||||
<%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
|
||||
</div>
|
||||
<% end -%>
|
||||
<div class="action">
|
||||
<div class="actions">
|
||||
<%% if @<%= singular_name %>.new_record? %>
|
||||
<%%= f.submit 'Create' %>
|
||||
<%% else %>
|
||||
|
|
|
@ -16,7 +16,7 @@ a { color: #000; }
|
|||
a:visited { color: #666; }
|
||||
a:hover { color: #fff; background-color:#000; }
|
||||
|
||||
div.attribute, div.action {
|
||||
div.field, div.actions {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
|
|
|
@ -75,6 +75,7 @@ class ScaffoldGeneratorTest < GeneratorsTestCase
|
|||
edit
|
||||
new
|
||||
show
|
||||
_form
|
||||
).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
|
||||
assert_file "app/views/layouts/product_lines.html.erb"
|
||||
|
||||
|
|
Loading…
Reference in a new issue