diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index fd28c3e2b3..4c034e93bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -1,38 +1,66 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/greybox/gb_styles.css b/koha-tmpl/intranet-tmpl/prog/en/lib/greybox/gb_styles.css index 52fdc17182..3fad900673 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/lib/greybox/gb_styles.css +++ b/koha-tmpl/intranet-tmpl/prog/en/lib/greybox/gb_styles.css @@ -60,7 +60,16 @@ .GB_header table { margin: 0; width: 100%; - border-collapse: collapse; + border-collapse: separate; + border-right: 0px; + border-top: 0px; +} + +.GB_header td { + background-color: #333333; + border-bottom: 0px; + border-left: 0px; + padding: 0em 0em; } .GB_header .caption { @@ -68,6 +77,7 @@ color: #eee; white-space: nowrap; font-size: 20px; + border-collapse: separate; } .GB_header .close { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl index fe256a6786..b599622946 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl @@ -116,8 +116,9 @@ $(document).ready(function(){ - " title="MARC" rel="gb_page_center[600,500]">MARC" title="MARC" rel="gb_page_center[600,500]">Card - ,)">Import + " title="MARC" rel="gb_page_center[600,500]">MARC + " title="MARC" rel="gb_page_center[600,500]">Card + ,)">Import diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl index 4914d2165d..514176c467 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl @@ -3,21 +3,35 @@ @@ -69,16 +70,17 @@ Search results
-
- ,''); return false" /> - -
-
- Select All - - Clear All - +
+ ,''); return false" /> +
+
+ + + + +
+
" /> @@ -114,6 +116,7 @@
+
diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl index 1b9d2d3c9a..0a9877b44b 100755 --- a/labels/label-edit-batch.pl +++ b/labels/label-edit-batch.pl @@ -59,15 +59,20 @@ my $display_columns = [ {_label_number => {label => 'Label Number', link_field {select => {label => 'Select', value => '_label_id'}}, ]; my $op = $cgi->param('op') || undef; -my $label_id = $cgi->param('label_id') || undef; +my @label_ids = $cgi->param('label_id') if $cgi->param('label_id'); my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef; my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); my $branch_code = get_branch_code_from_name($template->param('LoginBranchname')); if ($op eq 'remove') { $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id); + foreach my $label_id (@label_ids) { $err = $batch->remove_item($label_id); - $errstr = "item $label_id was not removed." if $err; + } + $errstr = "item(s) not removed from batch $batch_id." if $err; +# Something like this would be nice to avoid problems with the browser's 'refresh' button, but it needs an error handling mechanism... +# print $cgi->redirect("label-edit-batch.pl?op=edit&batch_id=$batch_id"); +# exit; } elsif ($op eq 'delete') { $err = C4::Labels::Batch::delete(batch_id => $batch_id, branch_code => $branch_code);