--- loncom/interface/londocs.pm 2010/03/18 16:33:44 1.423 +++ loncom/interface/londocs.pm 2010/10/27 01:00:38 1.439 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.423 2010/03/18 16:33:44 onken Exp $ +# $Id: londocs.pm,v 1.439 2010/10/27 01:00:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1607,13 +1607,12 @@ sub editor { my $shown=0; if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) { $r->print('
'. - '

'.&mt('Parameters:'). - '

'); + ''); if ($randompick>=0) { $r->print('

' .&mt('Caution: this folder is set to randomly pick a subset' @@ -1637,7 +1636,9 @@ sub editor { $r->print('

'); } - my $output; + my $output; + + &Apache::loncommon::start_data_table_count(); #setup a row counter foreach my $res (@LONCAPA::map::order) { my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); $name=&LONCAPA::map::qtescape($name); @@ -1649,6 +1650,8 @@ sub editor { $idx++; $shown++; } + &Apache::loncommon::end_data_table_count(); + if ($shown) { $r->print(&Apache::loncommon::start_data_table()); if ($allowed) { @@ -1717,7 +1720,7 @@ sub process_file_upload { # probably the only place in the system where this should be "1" my $newidx=&LONCAPA::map::getresidx(); $destination .= $newidx; - my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination, + my $url=&Apache::lonnet::userfileupload('uploaddoc','coursedoc',$destination, $parseaction,$allfiles, $codebase); my $ext='false'; @@ -1778,7 +1781,7 @@ sub process_secondary_uploads { } $destination .= $newidx; my ($url,$filename); - $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination); + $url=&Apache::lonnet::userfileupload($formname.$num,'coursedoc',$destination); ($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$}); return $filename; } @@ -2260,8 +2263,6 @@ sub list_symbs { sub verifycontent { my ($r) = @_; my $crstype = &Apache::loncommon::course_type(); - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents')); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents')); $hashtied=0; @@ -2480,11 +2481,11 @@ ENDHEADERS # Set version $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, 'set_version_'.$linkurl, - ('select_form_order' => + {'select_form_order' => ['',1..$currentversion,'mostrecent'], '' => '', 'mostrecent' => &mt('most recent'), - map {$_,$_} (1..$currentversion)))); + map {$_,$_} (1..$currentversion)})); $r->print(''); my $lastold=1; for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { @@ -2717,9 +2718,22 @@ sub handler { $env{'form.pagename'}=&unescape(pop(@pagepath)); $env{'form.folder'}=pop(@pagepath); $containertag = ''. - ''; - $uploadtag = ''. - ''; + ''; + $uploadtag = + ''. + ''. + ''; + } else { + my $folderpath=$env{'form.folderpath'}; + if (!$folderpath) { + if ($env{'form.folder'} eq '' || + $env{'form.folder'} eq 'supplemental') { + $folderpath='default&'. + &escape(&mt('Main '.$crstype.' Documents')); + } + } + $containertag = ''; + $uploadtag = ''; } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; @@ -2906,7 +2920,7 @@ sub create_form_ul { 'upld' => 'Import Document', 'srch' => 'Search', 'impo' => 'Import', - 'book' => 'Import Bookmarks', + 'wish' => 'Import from Wishlist', 'selm' => 'Select Map', 'load' => 'Load Map', 'reco' => 'Recover Deleted Documents', @@ -2914,7 +2928,7 @@ sub create_form_ul { 'newp' => 'New Composite Page', 'extr' => 'External Resource', 'syll' => 'Syllabus', - 'navc' => 'Navigate Contents', + 'navc' => 'Table of Contents', 'sipa' => 'Simple Course Page', 'sipr' => 'Simple Problem', 'drbx' => 'Drop Box', @@ -2957,7 +2971,7 @@ CHBO $fileupload
$lt{'title'}:
- + $uploadtag
@@ -2979,7 +2993,7 @@ SEDFFORM my @simpleeditdefaultforma = ( { ''.$lt{srch}.'' => "$uploadtag$lt{'srch'}" }, { ''.$lt{impo}.'' => "$lt{'impo'}$help{'Importing_LON-CAPA_Resource'}" }, - { ''.$lt{book}.'' => "$lt{'book'}" }, + { ''.$lt{wish}.'' => "$lt{'wish'}" }, ); $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma)); $simpleeditdefaultform .=(< 'Show Log' ); - my $folderpath=$env{'form.folderpath'}; - if (!$folderpath) { - if ($env{'form.folder'} eq '' || - $env{'form.folder'} eq 'supplemental') { - $folderpath='default&'. - &escape(&mt('Main '.$crstype.' Documents')); - } - } - unless ($env{'form.pagepath'}) { - $containertag = ''; - $uploadtag = ''; - } $r->print(< @@ -3060,14 +3062,16 @@ HIDDENFORM $activeClass = 0; } } - $r->print('
  • '.$tabtitles{'main'}{$crstype}.'
    • '); + $r->print('
  • '.$tabtitles{'main'}{$crstype}.'
    • '); $active = ''; if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) { if($activeClass == 1){ $active = 'class="active"'; } } - $r->print('
  • '.$tabtitles{'supplemental'}{$crstype}.'
    • '); + $r->print('
  • '.$tabtitles{'supplemental'}{$crstype}.'
    • '); $r->print(''); } else { $r->print('
    '); @@ -3115,7 +3119,7 @@ HIDDENFORM my $recoverform=(< - $lt{'reco'} + $lt{'reco'} RFORM @@ -3272,9 +3276,13 @@ NGFFORM {''.$lt{newp}.''=>$newpageform}, {''.$lt{syll}.''=>$newsylform}, {''.$lt{grpo}.''=>$newgroupfileform}, - ); - - } + ); + + my @importdoc = ( + {''.$lt{extr}.''=>$extresourcesform}, + {''.$lt{imsf}.''=>$imspform},); + $fileuploadform = create_form_ul(create_list_elements(@importdoc)) . '
    ' . $fileuploadform; + push @specialdocumentsforma, ({''.$lt{navc}.''=>$newnavform}, {''.$lt{sipa}.''=>$newsmppageform}, {''.$lt{sipr}.''=>$newsmpproblemform}, @@ -3283,9 +3291,10 @@ NGFFORM {''.$lt{bull}.''=>$newbulform}, {''.$lt{mypi}.''=>$newaboutmeform}, {''.$lt{abou}.''=>$newaboutsomeoneform}, - {''.$lt{rost}.''=>$newrosterform},); + {''.$lt{rost}.''=>$newrosterform},); $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma)); + } if($env{'form.pagepath'}) { @@ -3299,21 +3308,19 @@ if($env{'form.pagepath'}) { my @tools = ( # {''.$lt{extr}.''=>$extresourcesform}, # {''.$lt{imsf}.''=>$imspform}, - {''.$lt{reco}.''=>$recoverform}, + {''.$lt{reco}.''=>$recoverform}, ); -my @importdoc = ( - {''.$lt{extr}.''=>$extresourcesform}, - {''.$lt{imsf}.''=>$imspform}, -); -$fileuploadform = create_form_ul(create_list_elements(@importdoc)) . '
    ' . $fileuploadform; my %orderhash = ( - '00' => ['Newfolder',$newfolderform], 'aa' => ['Import Documents',$fileuploadform], 'bb' => ['Published Resources',$simpleeditdefaultform], 'cc' => ['Special Documents',$specialdocumentsform], - 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)], + 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options(\%help,\%env)], ); +unless($env{'form.pagepath'}) { + $orderhash{'00'} = ['Newfolder',$newfolderform]; +} + my $tid='1'; $hadchanges=0; my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype); @@ -3329,8 +3336,6 @@ $r->print(&generate_edit_table($tid,\%or $r->print(''); } - if ($env{'form.pagepath'}) { - } # ----------------------------------------------------- Supplemental documents $active = 'style="display: none;"'; if($activeClass == 1){ @@ -3477,8 +3482,8 @@ $r->print(''); } sub generate_admin_options { - my ($containertag,$uploadtag,$help_ref,$env_ref) = @_; - my %lt=&Apache::lonlocal::texthash( + my ($help_ref,$env_ref) = @_; + my %lt=&Apache::lonlocal::texthash( 'vc' => 'Verify Content', 'cv' => 'Check/Set Resource Versions', 'ls' => 'List Symbs', @@ -3499,11 +3504,11 @@ sub generate_admin_options { if($dumpbut ne ''){ push @list, {''.$lt{dcd}.''=>$dumpbut}; } - push @list, ({''.$lt{imse}.'' + push @list, ({''.$lt{imse}.'' =>$exportbut}, {''.$lt{ls}.'' =>"$lt{'ls'}"}, - {''.$lt{sl}.'' + {''.$lt{sl}.'' =>"$lt{'sl'}"}, ); return '
    '.create_form_ul(create_list_elements(@list)).'
    '; @@ -3530,7 +3535,9 @@ sub generate_edit_table { }elsif($activetab eq $name){ $active = 'class="active"'; } - $form .= '
  • '.&mt(${$orderhash{$name}}[0]).'
    • '; + $form .= '
  • '.&mt(${$orderhash{$name}}[0]).'
    • '; } else { $form .= '
  • '.${$orderhash{$name}}[1].'
    • '; @@ -3582,6 +3589,18 @@ sub editing_js { p_ctr2b => '?[_98]' ); + my $crstype = &Apache::loncommon::course_type(); + my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"'); + my $docs_pagepath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.pagepath'},'<>&"'); + my $main_container_page; + if ($docs_folderpath eq '') { + if ($docs_pagepath ne '') { + $main_container_page = 1; + } + } + my $toplevelmain = 'default&Main%20'.$crstype.'%20Documents'; + my $toplevelsupp = 'supplemental&Supplemental%20'.$crstype.'%20Documents'; + return <