--- loncom/interface/londocs.pm 2007/07/03 00:17:42 1.283 +++ loncom/interface/londocs.pm 2007/07/04 00:21:42 1.286 @@ -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.286 2007/07/04 00:21:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1209,7 +1209,7 @@ sub print_paste_buffer { return if (!defined($env{'docs.markedcopy_url'})); $r->print(<
+

ENDPASTE $r->print(' '); @@ -1221,20 +1221,20 @@ ENDPASTE my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1]; my $type = &Apache::loncommon::filedescription($extension); my $icon = ''; + '" alt="" class="LC_icon" />'; $r->print($icon.$type.': '. &parse_supplemental_title($env{'docs.markedcopy_title'})); } if ($container eq 'page') { - $r->print(< - -PAGEINFO + $r->print(' + + +'); } else { - $r->print(< -FOLDERINFO + $r->print(' + +'); } - $r->print('

'); + $r->print('

'); } sub editor { @@ -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); @@ -1715,7 +1715,9 @@ sub entryline { $renametitle=~s/\\/\\\\/g; $renametitle=~s/\"\;/\\\"/g; + $renametitle=~s/ /%20/g; my $line=''; + my ($form_start,$form_end); # Edit commands my $container; my ($container, $type, $esc_path, $path, $symb); @@ -1783,43 +1785,46 @@ sub entryline { if (!$nocopy) { $copylink=(< -$lt{'cp'} +$lt{'cp'} ENDCOPY } if (!$nocut) { $cutlink=(< -$lt{'ct'} +$lt{'ct'} ENDCUT } - $line.=(< + $form_start = (< +END + $form_end = ''; + $line.=(< -
+
- -
+ $lt{
+ $lt{
+ $form_start $selectbox + $form_end - - $lt{'rm'} + + $lt{'rm'} $cutlink - $lt{'rn'} + $lt{'rn'} $copylink END @@ -1906,7 +1911,7 @@ END (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]. '" />'. -''.&mt('Save').''; +''.&mt('Save').''; } if ($ispage) { @@ -1927,10 +1932,13 @@ END $url.='pagepath='.&escape($pagepath). '&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', @@ -1940,14 +1948,20 @@ END my $hidtext= ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); $line.=(< - - - -$parameterset + + $form_start + + $form_end + + + $form_start + + $form_end + + $form_start $parameterset $form_end ENDPARMS } - $line.=""; + $line.=""; return $line; } @@ -2274,10 +2288,10 @@ ENDHEADERS 'lastrevisiondate') ). ''. - 'Most Recent: '. + 'Most Recent: '. ''.$currentversion.''. - ''. - 'In '.$type.': '. + ''. + 'In '.$type.': '. ''); # Used in course my $usedversion=$hash{'version_'.$linkurl}; @@ -2286,8 +2300,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 +2310,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; @@ -2320,7 +2334,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 +2347,7 @@ ENDHEADERS '&versionone='.$prevvers. '">'.&mt('Diffs').''); } - $r->print('
'); + $r->print('
'); if (++$entries_count % $entries_per_col == 0) { $r->print(''); if ($cols_output != 4) { @@ -2395,7 +2409,7 @@ sub changewarning { $message='Changes will become active for your current session after [_1], or the next time you log in.'; } $r->print("\n\n". -''."\n". +''."\n". '
'. '

'. @@ -2720,9 +2734,9 @@ ENDCOURSEVERIFY &mt('Editing the Table of Contents for your '.$type))); } # --------------------------------------------------------- Standard documents - $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'}; @@ -2732,7 +2746,7 @@ ENDCOURSEVERIFY } my $postexec=''; if ($folder eq 'default') { - $r->print(''); + $r->print(''); } else { #$postexec='self.close();'; } @@ -2752,54 +2766,56 @@ ENDCOURSEVERIFY } my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; $r->print(<
$lt{'uplm'}$lt{'impp'}$lt{'spec'}
+ + + + - + - - - +
$lt{'uplm'}$lt{'impp'}$lt{'spec'}
+
$lt{'file'}:
- +
$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 +2829,10 @@ ENDFORM
$uploadtag - + $help{'Adding_External_Resource'} - +

@@ -2824,113 +2840,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 +2955,19 @@ ENDFORM
$uploadtag - + $help{'Simple Problem'} - +

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

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

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

- + - +

$lt{'comment'}:

- - - + + + $help{'Uploading_From_Harddrive'} - +
+
- + $help{'Adding_Folders'} - +

- + $help{'Adding_External_Resource'} - +

- + $help{'Syllabus'} - +

- + $help{'My Personal Info'} - +
ENDSUPFORM } } + $r->print(''); if ($allowed) { - $r->print('
'); + $r->print('
'); } - $r->print(''); } else { unless ($upload_result eq 'phasetwo') { # -------------------------------------------------------- This is showdoc mode $r->print("

".&mt('Uploaded Document').' - '. &Apache::lonnet::gettitle($r->uri).'

'. -&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."

". - &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'

'); +&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."

". + &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'
'); } } }