From 618c40ff8d03c970c541b8226ec881932d2f6e99 Mon Sep 17 00:00:00 2001 From: Christophe Croullebois Date: Mon, 13 Aug 2012 17:09:30 +0200 Subject: [PATCH 1/1] Bug 8637: Lack of control on mandatory in orderreveive.tt Just add a check in Jscript when the form is submited, the same as in additem.tt On Owen's suggestion I have added the red color and 'Required', the same as in additem. On Jonathan's suggestion I have used the CSS class for red and italic and I have changed a variable's name (alertString2). Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer On other Jonathan's suggestion I have created a new class "missing" and I have added the background to staff-global.css. --- .../intranet-tmpl/prog/en/css/staff-global.css | 4 ++++ .../prog/en/modules/acqui/orderreceive.tt | 22 ++++++++++++++++++++ .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/services/itemrecorddisplay.tt | 16 ++++++-------- 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 436b728..c642d0d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1260,6 +1260,10 @@ span.required { margin-left : .5em; } +.missing{ + background-color : #FFFFCC; +} + .term { background-color: #FFC; color : #990000; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 821dcd3..e187399 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -7,6 +7,28 @@ // div:last"); var tobedeleted = true; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 6692274..05750b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -44,7 +44,7 @@ function Check(f) { if($(this).val() == 1){ var mandatory_field = $("input[name='field_value'],select[name='field_value']").eq(i); if(mandatory_field.val() == ''){ - mandatory_field.css("background-color","#FFFFCC"); + mandatory_field.addClass("missing"); total_errors++; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt index 6790b3d..78a5ab2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/services/itemrecorddisplay.tt @@ -2,22 +2,18 @@ [% FOREACH iteminfo IN iteminformation %]
  • - + [% IF (iteminfo.mandatory) %] + + [% ELSE %] + + [% END %] [% iteminfo.marc_value %] + [% IF (iteminfo.mandatory) %] Required[% END %]
  • [% END %] -- 1.7.9.5