From be4179c84c5fe960f00defef16094f64df58813b Mon Sep 17 00:00:00 2001 From: Charles Farmer Date: Tue, 3 Apr 2018 17:01:43 -0400 Subject: [PATCH] Bug 8643: (QA follow-up) Use paler yellow and better column order Signed-off-by: Katrin Fischer --- .../data/mysql/atomicupdate/bug-8643-add_important_constraint.sql | 2 +- installer/data/mysql/kohastructure.sql | 2 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql b/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql index 4eda4ce..4f25189 100644 --- a/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql +++ b/installer/data/mysql/atomicupdate/bug-8643-add_important_constraint.sql @@ -4,7 +4,7 @@ ALTER TABLE marc_tag_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT -- $DBversion = "3.23.00.XXX"; -- if ( CheckVersion($DBversion) ) { -- $dbh->do("ALTER TABLE marc_subfield_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT 0 AFTER mandatory"); --- $dbh->do("ALTER TABLE marc_tag_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT 0 AFTER frameworkcode"); +-- $dbh->do("ALTER TABLE marc_tag_structure ADD COLUMN important TINYINT(4) NOT NULL DEFAULT 0 AFTER mandatory"); -- print "Upgrade to $DBversion done (Bug 8643 - Add important constraint to marc subfields)\n"; -- SetVersion($DBversion); -- } diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index eedafd6..3a3bde5 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1141,11 +1141,11 @@ CREATE TABLE `marc_tag_structure` ( `libopac` varchar(255) NOT NULL default '', `repeatable` tinyint(4) NOT NULL default 0, `mandatory` tinyint(4) NOT NULL default 0, + `important` tinyint(4) NOT NULL DEFAULT '0', `authorised_value` varchar(10) default NULL, `ind1_defaultvalue` varchar(1) NOT NULL default '', `ind2_defaultvalue` varchar(1) NOT NULL default '', `frameworkcode` varchar(4) NOT NULL default '', - `important` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`frameworkcode`,`tagfield`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 32a614b..dd265be 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -899,6 +899,10 @@ fieldset.rows .inputnote { .subfield_not_filled { background-color : #FFFF99; } + +.important_subfield_not_filled { + background-color : #FFFFCC; +} .content_hidden { visibility:hidden; /* you propably don't need to change this one */ display:none; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 4e6d907..64d78a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -400,7 +400,7 @@ function AreImportantsNotOk(){ tabflag[tag+subfield+tagnumber][0]=0; if( ! document.getElementById(importants[i]).value){ tabflag[tag+subfield+tagnumber][0] = 0 + tabflag[tag+subfield+tagnumber] ; - document.getElementById(importants[i]).setAttribute('class','subfield_not_filled'); + document.getElementById(importants[i]).setAttribute('class','important_subfield_not_filled'); document.getElementById(importants[i]).focus(); tabflag[tag+subfield+tagnumber][1]=label[i]; tabflag[tag+subfield+tagnumber][2]=tab[i]; -- 2.7.4