From 9c340ec08ed511c63a646764eb39f957eb84137d Mon Sep 17 00:00:00 2001 From: wvengen Date: Mon, 25 Nov 2013 15:13:54 +0100 Subject: [PATCH] more clarity whether a number is number units or boxes --- .../stylesheets/bootstrap_and_overrides.css.less | 12 ++++++++++++ app/views/finance/receive/_edit_article.html.haml | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 1a514396..519614c0 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -252,3 +252,15 @@ tr.unavailable { .input-append button.add-on { height: inherit; } + +// show package icon after amount of package numbers +.package { + background: url(package-bg.png) no-repeat right center; +} +i.package { + width: 18px; + color: transparent; // hide text inside +} +.input-nano { + width: 30px; +} diff --git a/app/views/finance/receive/_edit_article.html.haml b/app/views/finance/receive/_edit_article.html.haml index 8be17a37..96047a7d 100644 --- a/app/views/finance/receive/_edit_article.html.haml +++ b/app/views/finance/receive/_edit_article.html.haml @@ -8,9 +8,14 @@ %td.name{title: order_title.join("\n")}= order_article.article.name %td #{order_article.article.unit_quantity} × #{order_article.article.unit} %td #{order_article.quantity} + #{order_article.tolerance} - %td= order_article.units_to_order - %td= order_article.units_billed %td - = form.text_field :units_received, class: 'input-mini', data: {'units-expected' => units_expected} + = order_article.units_to_order + %i.package pkg + %td + - unless order_article.units_billed.nil? + = order_article.units_billed + %i.package pkg + %td + = form.text_field :units_received, class: 'input-nano package', data: {'units-expected' => units_expected} / TODO add almost invisible text_field for entering single units %td.units_delta