Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index bbecbb5..9656044 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -448,6 +448,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) {
                         ,false
                     );
                     classification_column_box.appendChild(classification_column_menulist);
+                    classification_column_menulist.value = g.label_class;
 
                     /**** PREFIX COLUMN revisited ****/
                     var prefix_column_menulist = g.render_prefix_menu(call_number_column_textbox);

diff --git a/Open-ILS/xul/staff_client/server/skin/cat.css b/Open-ILS/xul/staff_client/server/skin/cat.css
index 950d24f..151df8a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/skin/cat.css
+++ b/Open-ILS/xul/staff_client/server/skin/cat.css
@@ -8,3 +8,4 @@
 .copy_editor_field_changed { background: lightgreen; }
 .copy_editor_field_required { border: solid thin red; }
 
+hbox#batch_bar { background-color: gray; }

diff --git a/Open-ILS/xul/staff_client/server/skin/global.css b/Open-ILS/xul/staff_client/server/skin/global.css
index bca48dc..b8ffe3b 100644 (file)
--- a/Open-ILS/xul/staff_client/server/skin/global.css
+++ b/Open-ILS/xul/staff_client/server/skin/global.css
@@ -25,10 +25,6 @@ treechildren::-moz-tree-cell-text(selected,focus) {
 }
 */
 
-/*
-* { font-size-adjust: .5; }
-*/
-
 .ALL_FONTS_SMALLER * { font-size-adjust: .3 !important;}
 .ALL_FONTS_LARGER * { font-size-adjust: 1.1 !important; }
 .ALL_FONTS_XX_SMALL * { font-size: xx-small !important; }