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

Merge branch 'master' into article-dialog

Browse source 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
This commit is contained in:
wvengen 2013-12-06 14:26:50 +01:00
commit 923b579bd1
30 changed files with 451 additions and 677 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/articles/_form.html.haml
View file

@ -3,7 +3,7 @@
= f.hidden_field :supplier_id
.modal-header
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
%h3= @article.new_record? ? t('.title_new') : t('.title_edit')
.modal-body
/= f.input :availability
= f.input :name