Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Resolve merge conflicts with i18n

Browse source
This commit is contained in:
Julius 2013-06-10 20:05:47 +02:00
commit 9753e6db00
6 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/articles/_edit_all_table.html.haml
View file

@ -28,7 +28,9 @@
%td= form.text_field 'note', class: 'input-medium'
%td= form.collection_select 'article_category_id', ArticleCategory.all,
:id, :name, { :include_blank => true }, class: 'input-small'
%td= form.text_field 'tax', class: 'input-mini'
%td.input-append
= form.text_field 'tax', class: 'input-mini'
%span.add-on %
%td= form.text_field 'deposit', class: 'input-mini'
- unless article.errors.empty?
%tr.alert