--- loncom/interface/londocs.pm 2010/03/29 12:34:47 1.425 +++ loncom/interface/londocs.pm 2010/08/14 00:20:06 1.431 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.425 2010/03/29 12:34:47 raeburn Exp $ +# $Id: londocs.pm,v 1.431 2010/08/14 00:20:06 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:'). - '

'); + '
  1. '.&mt('Parameters:').'
  2. '. + ($randompick>=0?'
  3. • '.&mt('randomly pick [quant,_1,resource]',$randompick).'
  4. ':''). + ($ishidden?'
  5. • '.&mt('contents hidden').'
  6. ':''). + ($isencrypted?'
  7. • '.&mt('URLs hidden').'
  8. ':''). + ($is_random_order?'
  9. • '.&mt('random order').'
  10. ':''). + '
'); if ($randompick>=0) { $r->print('

' .&mt('Caution: this folder is set to randomly pick a subset' @@ -2264,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; @@ -2484,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++) { @@ -3064,14 +3061,18 @@ 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('
    '); @@ -3287,7 +3288,7 @@ NGFFORM {''.$lt{bull}.''=>$newbulform}, {''.$lt{mypi}.''=>$newaboutmeform}, {''.$lt{abou}.''=>$newaboutsomeoneform}, - {''.$lt{rost}.''=>$newrosterform},); + {''.$lt{rost}.''=>$newrosterform},); $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma)); @@ -3503,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)).'
    '; @@ -3534,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].'
  • ';