Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views

This commit is contained in:
Julius 2013-06-07 09:49:32 +02:00
commit ff343933dd
19 changed files with 75 additions and 41 deletions

View file

@ -2,7 +2,7 @@
= f.hidden_field :shared_updated_on
= f.hidden_field :supplier_id
.modal-header
= button_tag "x", class: 'close', data: {dismiss: 'modal'}
= link_to 'x', '#', class: 'close', data: {dismiss: 'modal'}
%h3 Neuen Artikel einfügen
.modal-body
= f.input :availability
@ -21,6 +21,6 @@
%span.add-on %
= f.input :deposit
.modal-footer
= button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'}
= link_to 'Schließen', '#', class: 'btn', data: {dismiss: 'modal'}
= f.submit class: 'btn btn-primary'