--- loncom/interface/londocs.pm 2007/06/29 23:25:30 1.281 +++ loncom/interface/londocs.pm 2007/07/03 23:02:53 1.285 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.281 2007/06/29 23:25:30 albertel Exp $ +# $Id: londocs.pm,v 1.285 2007/07/03 23:02:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -122,16 +122,17 @@ sub dumpbutton { my ($home,$other,%outhash)=&authorhosts(); my $type = &Apache::loncommon::course_type(); if ($home+$other==0) { return ''; } - my $output='
'.$errtext.'
'); + $r->print(''.$errtext.'
'); } else { # ------------------------------------------------------------ Process commands @@ -1296,7 +1297,7 @@ sub editor { # store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1336,7 +1337,7 @@ sub editor { # store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1370,7 +1371,7 @@ sub editor { # Store the result ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } @@ -1427,7 +1428,7 @@ sub editor { ($errtext,$fatal)=&storemap($coursenum,$coursedom, $folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1447,7 +1448,7 @@ sub editor { ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, $container,'londocs',@imports); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1464,11 +1465,12 @@ sub editor { ($errtext,$fatal)=&storemap($coursenum,$coursedom, $folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } else { - $r->print(''.&mt('No map selected.').'
'); + $r->print(''.&mt('No map selected.').'
'); + } } &log_differences($plain); @@ -1487,7 +1489,7 @@ sub editor { if ($randompick>=0) { $r->print(''.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'
'); } - $r->print('
-
$selectbox
|
-
- $lt{'rm'}
+ |
+ $lt{'rm'}
$cutlink
- $lt{'rn'}
+ $lt{'rn'}
$copylink
|
END
@@ -1902,7 +1904,7 @@ END
(&LONCAPA::map::getparameter($orderidx,
'parameter_randompick'))[0].
'" />'.
-''.&mt('Save').'';
+''.&mt('Save').'';
}
if ($ispage) {
@@ -1921,12 +1923,15 @@ END
$path.$pagearg.'.page');
}
$url.='pagepath='.&escape($pagepath).
- '&pagesymb='.&escape($symb).$cpinfo;
+ '&pagesymb='.&escape($symb).$cpinfo;
}
- $line.=' | '.
- "".($url?"":'').$title.
- ($url?'':' '.&mt('(re-initialize course to access)').'')." | ";
+ $line.='
+
+ |
+
+ '.($url?"":'').$title.($url?'':' '.&mt('(re-initialize course to access)').'')."
+ | ";
if (($allowed) && ($folder!~/^supplemental/)) {
my %lt=&Apache::lonlocal::texthash(
'hd' => 'Hidden',
@@ -1936,11 +1941,13 @@ END
my $hidtext=
((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
$line.=(<
- |
-$parameterset |
+
+
+ |
+
+
+ |
+ $parameterset |
ENDPARMS
}
$line.="";
@@ -2009,17 +2016,17 @@ sub checkonthis {
if (($errorcount) ||
($warningcount)) {
if ($errorcount) {
- $r->print('![]() ![]() '. + $r->print(' '. &mt('The following sequence or page is included more than once in your '.$type.': '). - &unescape($hash{$_}).' '. + &unescape($hash{$_}).' '. &mt('Note that grading records for problems included in this sequence or folder will overlap. ')); } } @@ -2163,7 +2170,7 @@ sub checkversions { $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { $r->print(' '.&mt('Your Version Settings have been Saved').''); } else { - $r->print(''.&mt('An Error Occured while Attempting to Save your Version Settings').''); + $r->print(''.&mt('An Error Occured while Attempting to Save your Version Settings').''); } &mark_hash_old(); } @@ -2270,10 +2277,10 @@ ENDHEADERS 'lastrevisiondate') ). ''. - 'Most Recent: '.
''.$currentversion.''.
- ' | '.
- ' | '.
+ 'In '.$type.': '.
'');
# Used in course
my $usedversion=$hash{'version_'.$linkurl};
@@ -2282,8 +2289,8 @@ ENDHEADERS
} else {
$r->print($currentversion);
}
- $r->print(' | '.
- ' | '.
+ 'Use: ');
# Set version
$r->print(&Apache::loncommon::select_form($setversions{$linkurl},
'set_version_'.$linkurl,
@@ -2292,7 +2299,7 @@ ENDHEADERS
'' => '',
'mostrecent' => 'most recent',
map {$_,$_} (1..$currentversion))));
- $r->print(' | ');
+ $r->print(' | ');
my $lastold=1;
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
@@ -2316,7 +2323,7 @@ ENDHEADERS
my $cols_output = 1;
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
- $r->print(' | '); + $r->print(' '); if (++$entries_count % $entries_per_col == 0) { $r->print(''); if ($cols_output != 4) { @@ -2394,11 +2401,11 @@ sub changewarning { ''."\n". ''."\n\n"); +$help{'Caching'}.''."\n\n"); } # =========================================== Breadcrumbs for special functions @@ -2492,8 +2499,8 @@ sub handler { $env{'form.folder'}=pop(@pagepath); $containertag = ''. ''; - $uploadtag = ''. - ''; + $uploadtag = ''. + ''; } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; @@ -2675,44 +2682,50 @@ sub handler { } unless ($env{'form.pagepath'}) { $containertag = ''; - $uploadtag = ''; + $uploadtag = ''; } $r->print(<
|