--- loncom/interface/londocs.pm 2017/05/10 00:03:08 1.627 +++ loncom/interface/londocs.pm 2017/05/10 20:32:27 1.629 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.627 2017/05/10 00:03:08 raeburn Exp $ +# $Id: londocs.pm,v 1.629 2017/05/10 20:32:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -678,7 +678,8 @@ sub group_import { my @deleted; if (ref($ltitoolsref->{$toolid}) eq 'HASH') { $toolhash{'id'} = $toolid; - if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'window')) { + if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || + ($toolhash{'target'} eq 'window')) { if ($toolhash{'target'} eq 'window') { foreach my $item ('width','height') { $toolhash{$item} =~ s/^\s+//; @@ -716,6 +717,15 @@ sub group_import { } } } + } elsif ($toolhash{'target'} eq 'tab') { + foreach my $item ('width','height') { + delete($toolhash{$item}); + if ($residx) { + if ($toolsettings{$item}) { + push(@deleted,$item); + } + } + } } if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { foreach my $item ('label','title','linktext','explanation') { @@ -1339,12 +1349,12 @@ sub print_paste_buffer { } else { $canpaste = 0; $nopaste = &mt('Paste from another course unavailable.'); - } + } } } if ($canpaste) { push(@pasteable,$suffix); - } + } } my $buffer; if ($is_external) {