--- loncom/interface/londocs.pm 2010/03/22 13:24:16 1.424
+++ loncom/interface/londocs.pm 2010/08/14 04:28:21 1.432
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.424 2010/03/22 13:24:16 onken Exp $
+# $Id: londocs.pm,v 1.432 2010/08/14 04:28:21 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:').
- '
'.
+ '- '.&mt('Parameters:').'
'.
($randompick>=0?'- '.&mt('randomly pick [quant,_1,resource]',$randompick).'
':'').
($ishidden?'- '.&mt('contents hidden').'
':'').
($isencrypted?'- '.&mt('URLs hidden').'
':'').
($is_random_order?'- '.&mt('random order').'
':'').
- '
');
+ '');
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++) {
@@ -2918,7 +2915,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',
@@ -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
{'
'=>$newbulform},
{'
'=>$newaboutmeform},
{'
'=>$newaboutsomeoneform},
- {'
'=>$newrosterform},);
+ {'
'=>$newrosterform},);
$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
@@ -3503,11 +3504,11 @@ sub generate_admin_options {
if($dumpbut ne ''){
push @list, {'
'=>$dumpbut};
}
- push @list, ({'
'
+ push @list, ({'
'
=>$exportbut},
{'
'
=>""},
- {'
'
+ {'
'
=>""},
);
return '';
@@ -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].'';