From 014a62aa110c7da3c5f459800f4b2b4c951aa858 Mon Sep 17 00:00:00 2001 From: wvengen Date: Fri, 3 Jan 2014 10:59:42 +0100 Subject: [PATCH] use disabled property for input and fix style --- app/assets/stylesheets/bootstrap_and_overrides.css.less | 5 +++++ app/helpers/orders_helper.rb | 2 +- app/views/orders/_edit_amounts.html.haml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index feccf178..de47897f 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -265,6 +265,10 @@ tr.unavailable { // show package icon after amount of package numbers input.package { background: url(package-bg.png) no-repeat right center; + // disabled and readonly definitions though + &[disabled], &[readonly] { + background-color: @inputDisabledBackground; + } } i.package { background: url(package-bg.png) no-repeat left center; @@ -275,6 +279,7 @@ i.package { .package { color: #999; } + .input-nano { width: 30px; } diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb index 46f9b079..3d2d5bbe 100644 --- a/app/helpers/orders_helper.rb +++ b/app/helpers/orders_helper.rb @@ -45,7 +45,7 @@ module OrdersHelper units_expected = (order_article.units_billed or order_article.units_to_order) form.text_field :units_received, class: 'input-nano package units_received', data: {'units-expected' => units_expected}, - readonly: order_article.result_manually_changed? ? "readonly" : nil, + disabled: order_article.result_manually_changed?, title: order_article.result_manually_changed? ? t('.locked_to_protect_manual_update') : nil, autocomplete: 'off' end diff --git a/app/views/orders/_edit_amounts.html.haml b/app/views/orders/_edit_amounts.html.haml index ab143f92..ef8db3df 100644 --- a/app/views/orders/_edit_amounts.html.haml +++ b/app/views/orders/_edit_amounts.html.haml @@ -62,7 +62,7 @@ } function unlock_receive_input_field() { - $('.units_received', $(this).closest('tr')).prop('readonly', false); + $('.units_received', $(this).closest('tr')).prop('disabled', false); $(this).remove(); }