version 1.308, 2008/06/09 22:34:55
|
version 1.311, 2008/09/05 00:08:46
|
Line 949 sub group_import {
|
Line 949 sub group_import {
|
} |
} |
|
|
sub breadcrumbs { |
sub breadcrumbs { |
my ($where)=@_; |
my ($where,$allowed,$type)=@_; |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
my (@folders); |
my (@folders); |
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
Line 966 sub breadcrumbs {
|
Line 966 sub breadcrumbs {
|
my $is_random_order=0; |
my $is_random_order=0; |
while (@folders) { |
while (@folders) { |
my $folder=shift(@folders); |
my $folder=shift(@folders); |
my $foldername=shift(@folders); |
my $foldername=shift(@folders); |
if ($folderpath) {$folderpath.='&';} |
if ($folderpath) {$folderpath.='&';} |
$folderpath.=$folder.'&'.$foldername; |
$folderpath.=$folder.'&'.$foldername; |
my $url='/adm/coursedocs?folderpath='. |
my $url='/adm/coursedocs?folderpath='. |
Line 982 sub breadcrumbs {
|
Line 982 sub breadcrumbs {
|
if ($2) { $ishidden=1; } |
if ($2) { $ishidden=1; } |
if ($3) { $isencrypted=1; } |
if ($3) { $isencrypted=1; } |
if ($4 ne '') { $is_random_order = 1; } |
if ($4 ne '') { $is_random_order = 1; } |
|
if ($folder eq 'supplemental') { |
|
if ($allowed) { |
|
$name = &mt('Supplemental '.$type.' Documents'); |
|
} else { |
|
$name = &mt($type.' Documents'); |
|
} |
|
} |
&Apache::lonhtmlcommon::add_breadcrumb( |
&Apache::lonhtmlcommon::add_breadcrumb( |
{'href'=>$url.$cpinfo, |
{'href'=>$url.$cpinfo, |
'title'=>$name, |
'title'=>$name, |
Line 1201 sub update_paste_buffer {
|
Line 1208 sub update_paste_buffer {
|
# Mark for copying |
# Mark for copying |
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]); |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
|
&Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title}); |
($title) = &parse_supplemental_title($title); |
($title) = &parse_supplemental_title($title); |
|
} elsif ($env{'docs.markedcopy_supplemental'}) { |
|
&Apache::lonnet::delenv('docs\\.markedcopy_supplemental'); |
} |
} |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
|
|
Line 1250 ENDPASTE
|
Line 1260 ENDPASTE
|
} |
} |
|
|
sub do_paste_from_buffer { |
sub do_paste_from_buffer { |
my ($coursenum,$coursedom) = @_; |
my ($coursenum,$coursedom,$folder) = @_; |
|
|
return 0 if (!$env{'form.pastemarked'}); |
return 0 if (!$env{'form.pastemarked'}); |
|
|
Line 1292 sub do_paste_from_buffer {
|
Line 1302 sub do_paste_from_buffer {
|
$url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
# Now insert the URL at the bottom |
# Now insert the URL at the bottom |
my $newidx = &LONCAPA::map::getresidx($url); |
my $newidx = &LONCAPA::map::getresidx($url); |
|
if ($env{'docs.markedcopy_supplemental'}) { |
|
if ($folder =~ /^supplemental/) { |
|
$title = $env{'docs.markedcopy_supplemental'}; |
|
} else { |
|
(undef,undef,$title) = |
|
&parse_supplemental_title($env{'docs.markedcopy_supplemental'}); |
|
} |
|
} else { |
|
if ($folder=~/^supplemental/) { |
|
$title=time.'___&&&___'.$env{'user.name'}.'___&&&___'. |
|
$env{'user.domain'}.'___&&&___'.$title; |
|
} |
|
} |
|
|
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
$LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; |
push(@LONCAPA::map::order, $newidx); |
push(@LONCAPA::map::order, $newidx); |
# Store the result |
# Store the result |
Line 1370 sub handle_edit_cmd {
|
Line 1394 sub handle_edit_cmd {
|
} |
} |
|
|
sub editor { |
sub editor { |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$which)=@_; |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_; |
|
|
my $container= ($env{'form.pagepath'}) ? 'page' |
my $container= ($env{'form.pagepath'}) ? 'page' |
: 'sequence'; |
: 'sequence'; |
Line 1387 sub editor {
|
Line 1411 sub editor {
|
} |
} |
|
|
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)= |
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)= |
&breadcrumbs($folder); |
&breadcrumbs($folder,$allowed,$type); |
$r->print($breadcrumbtrail); |
$r->print($breadcrumbtrail); |
|
|
# ------------------------------------------------------------ Process commands |
# ------------------------------------------------------------ Process commands |
Line 1412 sub editor {
|
Line 1436 sub editor {
|
} |
} |
|
|
if ($env{'form.pastemarked'}) { |
if ($env{'form.pastemarked'}) { |
&do_paste_from_buffer($coursenum,$coursedom); |
&do_paste_from_buffer($coursenum,$coursedom,$folder); |
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
} |
} |
Line 1489 sub editor {
|
Line 1513 sub editor {
|
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); |
$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); |
} |
} |
$r->print("\n</table>\n"); |
$r->print("\n</table>\n"); |
|
if ($allowed) { |
&print_paste_buffer($r,$container); |
&print_paste_buffer($r,$container); |
|
} |
return; |
return; |
} |
} |
|
|
Line 2476 sub handler {
|
Line 2501 sub handler {
|
if ($env{'form.pagepath'}) { |
if ($env{'form.pagepath'}) { |
$env{'form.folderpath'}=''; |
$env{'form.folderpath'}=''; |
} |
} |
|
if ($env{'form.folderpath'} =~ /^supplemental_\d+/) { |
|
$env{'form.folderpath'} = 'supplemental&'. |
|
&escape(&mt('Supplemental '.$type.' Documents')).'&'. |
|
$env{'form.folderpath'}; |
|
} |
&Apache::loncommon::store_course_settings('docs_folderpath', |
&Apache::loncommon::store_course_settings('docs_folderpath', |
{'pagepath' => 'scalar', |
{'pagepath' => 'scalar', |
'folderpath' => 'scalar'}); |
'folderpath' => 'scalar'}); |
Line 2740 ENDCOURSEVERIFY
|
Line 2770 ENDCOURSEVERIFY
|
} |
} |
$hadchanges=0; |
$hadchanges=0; |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed, |
$upload_output); |
$upload_output,$type); |
if ($error) { |
if ($error) { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
Line 2986 ENDBLOCK
|
Line 3016 ENDBLOCK
|
$folder='supplemental'; |
$folder='supplemental'; |
} |
} |
if ($folder =~ /^supplemental$/ && |
if ($folder =~ /^supplemental$/ && |
$env{'form.folderpath'} =~ /^default\&/) { |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
$env{'form.folderpath'}='supplemental&'. |
$env{'form.folderpath'} = 'supplemental&'. |
&escape(&mt('Supplemental '.$type.' Documents')); |
&escape(&mt('Supplemental '.$type.' Documents')); |
} |
} |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed); |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); |
if ($error) { |
if ($error) { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |