--- loncom/interface/londocs.pm 2004/04/07 21:40:21 1.115 +++ loncom/interface/londocs.pm 2004/04/24 05:20:54 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.115 2004/04/07 21:40:21 albertel Exp $ +# $Id: londocs.pm,v 1.118 2004/04/24 05:20:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -261,45 +261,25 @@ sub group_import { sub breadcrumbs { my ($where)=@_; &Apache::lonhtmlcommon::clear_breadcrumbs(); - if ($where =~ /^default/) { - &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs', - 'title'=>'Main Course Documents', - 'text' =>'Main Course Documents'}); - } elsif ($where =~ /^supplemental/) { - &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs', - 'title'=>'Supplemental Course Documents', - 'text' =>'Supplemental Course Documents'}); - - } else { - &Apache::lonhtmlcommon::add_breadcrumb({'href'=>'/adm/coursedocs', - 'title'=>$where, - 'text' =>$where}); - } - if ($ENV{'form.foldername'}) { - my @folders; - if (defined($ENV{'form.folders'})) { - @folders=@{$ENV{'form.folders'}}; - } - @folders=(@folders,$ENV{'form.folder'}, - &Apache::lonnet::escape($ENV{'form.foldername'})); - - my $folderpath; - while (@folders) { - my $folder=shift(@folders); - my $foldername=shift(@folders); - if ($folderpath) {$folderpath.='&';} - $folderpath.=$folder.'&'.$foldername; - my $url='/adm/coursedocs?folderpath='. - &Apache::lonnet::escape($folderpath); + my (@folders)=split('&',$ENV{'form.folderpath'}); + my $folderpath; + while (@folders) { + my $folder=shift(@folders); + my $foldername=shift(@folders); + if ($folderpath) {$folderpath.='&';} + $folderpath.=$folder.'&'.$foldername; + my $url='/adm/coursedocs?folderpath='. + &Apache::lonnet::escape($folderpath); &Apache::lonhtmlcommon::add_breadcrumb( {'href'=>$url, 'title'=>&Apache::lonnet::unescape($foldername), - 'text'=>&Apache::lonnet::unescape($foldername)}); + 'text'=>'<font size="+1">'. + &Apache::lonnet::unescape($foldername).'</font>' + }); - } } - return &Apache::lonhtmlcommon::breadcrumbs(); + return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0); } sub editor { @@ -505,9 +485,7 @@ END $url='/adm/coursedocs?'; $folderarg=$1; $isfolder=1; - } else { - $url=&Apache::lonnet::tokenwrapper($url); - } + } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) { @@ -896,7 +874,9 @@ sub changewarning { $r->print( '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. '<form method="post" action="/adm/roles" target="loncapaclient">'. -'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. +'<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='. +&Apache::lonnet::escape($ENV{'form.folderpath'}). +'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. &mt('Changes will become active for your current session after'). ' <input type="hidden" name="'. $ENV{'request.role'}.'" value="1" /><input type="button" value="'. @@ -954,8 +934,7 @@ sub handler { my (@folderpath)=split('&',$ENV{'form.folderpath'}); $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath)); $ENV{'form.folder'}=pop(@folderpath); - $ENV{'form.folders'}=\@folderpath; - } + } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc=$1; } @@ -1147,6 +1126,15 @@ ENDNEWSCRIPT 'vc' => 'Verify Content', 'cv' => 'Check/Set Resource Versions', ); + + my $folderpath=$ENV{'form.folderpath'}; + if (!$folderpath) { + if ($ENV{'form.folder'} eq '' || + $ENV{'form.folder'} eq 'supplemental') { + $folderpath='default&'. + &Apache::lonnet::escape(&mt('Main Course Documents')); + } + } $r->print(<<ENDCOURSEVERIFY); <form name="renameform" method="post" action="/adm/coursedocs"> <input type="hidden" name="title" /> @@ -1155,7 +1143,7 @@ ENDNEWSCRIPT </form> <form name="simpleedit" method="post" action="/adm/coursedocs"> <input type=hidden name="importdetail" value=""> -<input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" /> +<input type="hidden" name="folderpath" value="$folderpath" /> </form> <form action="/adm/coursedocs" method="post" name="courseverify"> <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4"> @@ -1171,20 +1159,21 @@ ENDCOURSEVERIFY &mt('Editing the Table of Contents for your Course'))); } # --------------------------------------------------------- Standard documents - #my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); $r->print('<table border=2 cellspacing=4 cellpadding=4>'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents'). - ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); + $r->print('<tr><td bgcolor="#BBBBBB">'); +# '<h2>'.&mt('Main Course Documents'). +# ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; - if ($folder eq '') { + if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; + $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents')); } my $postexec=''; if ($folder eq 'default') { $r->print('<script>this.window.name="loncapaclient";</script>'); } else { - $postexec='self.close();'; + #$postexec='self.close();'; } $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -1319,7 +1308,7 @@ onClick="javascript:makeabout();" /> </nobr> </form> <form action="/adm/imsimportdocs" method="post" name="ims"> -<input type="hidden" name="folder" value="$ENV{'form.folder'}" /> +<input type="hidden" name="folder" value="$folder" /> <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" /> </nobr> </form> @@ -1330,11 +1319,18 @@ ENDFORM } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print( - '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents'). - ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); + $r->print('<tr><td bgcolor="#BBBBBB">'); +# '<h2>'.&mt('Supplemental Course Documents'). +# ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; - unless ($folder=~/supplemental/) { $folder='supplemental'; } + unless ($folder=~/^supplemental/) { + $folder='supplemental'; + } + if ($folder =~ /^supplemental$/ && + $ENV{'form.folderpath'} =~ /^default\&/) { + $ENV{'form.folderpath'}='supplemental&'. + &Apache::lonnet::escape(&mt('Supplemental Course Documents')); + } &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($allowed) { my $folderseq=