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

change layout of receive unlock

Browse source
This commit is contained in:
wvengen 2014-01-03 11:26:39 +01:00
parent 014a62aa11
commit 4c9e84ecc6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/orders/_edit_amount.html.haml
View file

@ -21,9 +21,10 @@
%td.units_received_cell %td.units_received_cell
= receive_input_field(form) = receive_input_field(form)
= pkg_helper order_article.article_price, false = pkg_helper order_article.article_price, false
- if order_article.result_manually_changed?
%input{type: :button, value: t('.override', default: 'Override'), class: 'btn btn-small unlocker'}
/ TODO add almost invisible text_field for entering single units / TODO add almost invisible text_field for entering single units
%td.units_delta %td.units_delta
%td %td
= link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-mini' = link_to t('ui.edit'), edit_order_order_article_path(order_article.order, order_article), remote: true, class: 'btn btn-small'
- if order_article.result_manually_changed?
= button_tag nil, class: 'btn btn-small unlocker', title: t('.locked_to_protect_unlock_button') do
%i.icon-unlock

3
config/locales/en.yml
View file

@ -1103,7 +1103,8 @@ en:
edit: edit:
title: Edit order title: Edit order
edit_amount: edit_amount:
locked_to_protect_manual_update: The distribution of this article among the ordergroups was changed manually. This field is locked in order to protect those changes. locked_to_protect_manual_update: The distribution of this article among the ordergroups was changed manually. This field is locked in order to protect those changes. To redistribute anyway, press the unlock button and change the amount.
locked_to_protect_unlock_button: Press this button to unlock the received field. Any previous manual changes will be overwritten and the article will be redistributed over the ordergroups.
fax: fax:
amount: Amount amount: Amount
articles: Articles articles: Articles