--- loncom/interface/londocs.pm 2007/07/03 00:17:42 1.283 +++ 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.283 2007/07/03 00:17:42 albertel Exp $ +# $Id: londocs.pm,v 1.285 2007/07/03 23:02:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1489,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(''); + $r->print('
'); foreach my $res (@LONCAPA::map::order) { my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); $name=&LONCAPA::map::qtescape($name); @@ -1783,14 +1783,12 @@ sub entryline { if (!$nocopy) { $copylink=(< -$lt{'cp'} +$lt{'cp'} ENDCOPY } if (!$nocut) { $cutlink=(< -$lt{'ct'} +$lt{'ct'} ENDCUT } $line.=(<
- +
- - @@ -1816,10 +1814,10 @@ ENDCUT - END @@ -1906,7 +1904,7 @@ END (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]. '" />'. -''.&mt('Save').''; +''.&mt('Save').''; } if ($ispage) { @@ -1927,10 +1925,13 @@ END $url.='pagepath='.&escape($pagepath). '&pagesymb='.&escape($symb).$cpinfo; } - $line.=''. - ""; + $line.=' + + "; if (($allowed) && ($folder!~/^supplemental/)) { my %lt=&Apache::lonlocal::texthash( 'hd' => 'Hidden', @@ -1940,11 +1941,13 @@ END my $hidtext= ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); $line.=(< - - - + + + ENDPARMS } $line.=""; @@ -2274,10 +2277,10 @@ ENDHEADERS 'lastrevisiondate') ). ''. - ''. - ''. + ''); + $r->print(''); my $lastold=1; for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; @@ -2320,7 +2323,7 @@ ENDHEADERS my $cols_output = 1; for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print(''.&mt('Version').' '.$prevvers.' ('. &Apache::lonlocal::locallocaltime( &Apache::lonnet::metadata($url, @@ -2333,7 +2336,7 @@ ENDHEADERS '&versionone='.$prevvers. '">'.&mt('Diffs').''); } - $r->print('
'); + $r->print('
'); if (++$entries_count % $entries_per_col == 0) { $r->print('
'); if ($cols_output != 4) { @@ -2720,9 +2723,9 @@ ENDCOURSEVERIFY &mt('Editing the Table of Contents for your '.$type))); } # --------------------------------------------------------- Standard documents - $r->print('
+ $lt{
+ $lt{
$selectbox - $lt{'rm'} + + $lt{'rm'} $cutlink - $lt{'rn'} + $lt{'rn'} $copylink ".($url?"":'').$title. - ($url?'':' '.&mt('(re-initialize course to access)').'')." + + + '.($url?"":'').$title.($url?'':' '.&mt('(re-initialize course to access)').'')." + -$parameterset + + + + $parameterset
Most Recent: '. + 'Most Recent: '. ''.$currentversion.''. - 'In '.$type.': '. + 'In '.$type.': '. ''); # Used in course my $usedversion=$hash{'version_'.$linkurl}; @@ -2286,8 +2289,8 @@ ENDHEADERS } else { $r->print($currentversion); } - $r->print(''. - 'Use: '); + $r->print(''. + 'Use: '); # Set version $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, 'set_version_'.$linkurl, @@ -2296,7 +2299,7 @@ ENDHEADERS '' => '', 'mostrecent' => 'most recent', map {$_,$_} (1..$currentversion)))); - $r->print('
'); + $r->print('
');#border=2 cellspacing=4 cellpadding=4>'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print(' - - - +
'); + $r->print('
'); # '

'.&mt('Main Course Documents'). # ($allowed?' '.$help{'Main_Course_Documents'}:'').'

'); my $folder=$env{'form.folder'}; @@ -2752,12 +2755,14 @@ ENDCOURSEVERIFY } my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; $r->print(<
$lt{'uplm'}$lt{'impp'}$lt{'spec'}
+ + + + - + - - - +
$lt{'uplm'}$lt{'impp'}$lt{'spec'}
+
$lt{'file'}:
@@ -2767,39 +2772,39 @@ $lt{'title'}:
$uploadtag
- + - +

- + $help{'Uploading_From_Harddrive'} - +
+
$lt{'pubd'}
$uploadtag
- + $help{'Importing_LON-CAPA_Resource'} - +


$lt{'copm'}

- -$help{'Load_Map'} +$help{'Load_Map'}


@@ -2813,10 +2818,10 @@ ENDFORM
$uploadtag - + $help{'Adding_External_Resource'} - +

@@ -2824,113 +2829,113 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
ENDFORM } - $r->print('
'); + $r->print(''); unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); $r->print(<
- + $help{'Adding_Folders'} - +

- + $help{'Adding_Pages'} - +

$uploadtag - + $help{'Syllabus'} - +

$uploadtag - + $help{'Navigate_Content'} - +

$uploadtag - + $help{'Simple Page'} - +

$uploadtag - + $help{'Simple Problem'} - +

$uploadtag - + - +

$uploadtag - + $help{'Score_Upload_Form'} - +

$uploadtag - + $help{'Bulletin Board'} - +

$uploadtag - + $help{'My Personal Info'} - +

$uploadtag - + - +

$uploadtag - + $help{'Group Files'} - +
ENDFORM } @@ -2939,19 +2944,19 @@ ENDFORM
$uploadtag - + $help{'Simple Problem'} - +

$uploadtag - + $help{'Score_Upload_Form'} - +
ENDBLOCK } @@ -2961,7 +2966,7 @@ ENDBLOCK } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print('
'); + $r->print('
'); # '

'.&mt('Supplemental Course Documents'). # ($allowed?' '.$help{'Supplemental'}:'').'

'); my $folder=$env{'form.folder'}; @@ -2981,20 +2986,20 @@ ENDBLOCK my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); $r->print(<
$lt{'upls'}$lt{'spec'}
+ + -
$lt{'upls'}$lt{'spec'}
+


- + - +

$lt{'comment'}: