--- loncom/interface/londocs.pm 2003/09/08 19:21:10 1.75
+++ loncom/interface/londocs.pm 2003/11/07 23:22:21 1.95
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.75 2003/09/08 19:21:10 www Exp $
+# $Id: londocs.pm,v 1.95 2003/11/07 23:22:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@ use Apache::lonxml;
use Apache::loncreatecourse;
use HTML::Entities;
use GDBM_File;
+use Apache::lonlocal;
my $iconpath;
@@ -114,10 +115,11 @@ sub dumpbutton {
my $output='
';
if ($home) {
return ' '.
- ' ';
+ ' ';
} else {
return' '.
- 'Dump Course DOCS to Construction Space: available on other servers';
+ &mt('Dump Course DOCS to Construction Space: available on other servers');
}
}
@@ -126,15 +128,108 @@ sub dumpbutton {
sub dumpcourse {
my $r=shift;
$r->print('Dump DOCS '.
- &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space'));
+ &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
+ '');
}
}
+
# Imports the given (name, url) resources into the course
# coursenum, coursedom, and folder must precede the list
sub group_import {
@@ -155,7 +250,7 @@ sub group_import {
join ':', ($name, $url, $ext, 'normal', 'res');
}
}
- &storemap($coursenum, $coursedom, $folder);
+ &storemap($coursenum, $coursedom, $folder.'.sequence');
}
sub editor {
@@ -300,27 +395,31 @@ sub entryline {
) {
$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
$renametitle=$4;
- $title=''.localtime($1).' '.
- &Apache::loncommon::plainname($2,$3).': '.
+ $title=''.&Apache::lonlocal::locallocaltime($1).' '.
+ &Apache::loncommon::plainname($2,$3).': '.
$foldertitle;
}
$renametitle=~s/\"\;/\\\"/g;
my $line=' ';
# Edit commands
- if ($allowed) {
- $line.=(< 'Move Up',
+ 'dw' => 'Move Down',
+ 'rm' => 'Remove',
+ 'rn' => 'Rename');
+ $line.=(<
-Remove
+$lt{'rm'}
-Rename
+$lt{'rn'}
END
}
# Figure out what kind of a resource this is
@@ -395,7 +494,7 @@ sub checkonthis {
my $result=&Apache::lonnet::repcopy(
&Apache::lonnet::filelocation('',$url));
if ($result==OK) {
- $r->print('ok ');
+ $r->print(''.&mt('ok').' ');
$r->rflush();
&Apache::lonnet::countacc($url);
$url=~/\.(\w+)$/;
@@ -405,25 +504,28 @@ sub checkonthis {
for (my $i=0;$i<=$level*5;$i++) {
$r->print(' ');
}
- $r->print('- Rendering: ');
+ $r->print('- '.&mt('Rendering').': ');
my $oldpath=$ENV{'request.filename'};
$ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url);
&Apache::lonxml::xmlparse($r,'web',
&Apache::lonnet::getfile(
&Apache::lonnet::filelocation('',$url)));
+ undef($Apache::lonhomework::parsing_a_problem);
$ENV{'request.filename'}=$oldpath;
if (($Apache::lonxml::errorcount) ||
($Apache::lonxml::warningcount)) {
if ($Apache::lonxml::errorcount) {
$r->print(''.
- $Apache::lonxml::errorcount.' error(s) ');
+ $Apache::lonxml::errorcount.' '.
+ &mt('error(s)').' ');
}
if ($Apache::lonxml::warningcount) {
$r->print(''.
- $Apache::lonxml::warningcount.' warning(s) ');
+ $Apache::lonxml::warningcount.' '.
+ &mt('warning(s)').'');
}
} else {
- $r->print('ok ');
+ $r->print(''.&mt('ok').' ');
}
$r->rflush();
}
@@ -435,11 +537,11 @@ sub checkonthis {
}
}
} elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
- $r->print('connection down ');
+ $r->print(''.&mt('connection down').' ');
} elsif ($result==HTTP_NOT_FOUND) {
- $r->print('not found ');
+ $r->print(''.&mt('not found').' ');
} else {
- $r->print('access denied ');
+ $r->print(''.&mt('access denied').' ');
}
}
}
@@ -466,110 +568,231 @@ sub verifycontent {
}
}
&untiehash();
- $r->print('Done. ');
+ $r->print(''.&mt('Done').'. ');
}
# -------------------------------------------------------------- Check Versions
sub checkversions {
my $r=shift;
- $r->print('Check Versions '.
+ $r->print('Check Versions '.
&Apache::loncommon::bodytag('Check Course Document Versions'));
- $hashtied=0;
- &tiehash();
- my %changes=&Apache::lonnet::dump
- ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
- my $firstkey=(keys %changes)[0];
- unless ($firstkey=~/^error\:/) {
- unless ($ENV{'form.timerange'}) {
- $ENV{'form.timerange'}=604800;
- }
- my $seltext='during the last '.$ENV{'form.timerange'}.' seconds';
- my $startsel='';
- my $monthsel='';
- my $weeksel='';
- my $daysel='';
- if ($ENV{'form.timerange'}==-1) {
- $seltext='since start of course';
- $startsel='selected';
- $ENV{'form.timerange'}=time;
- }
- my $starttime=time-$ENV{'form.timerange'};
- if ($ENV{'form.timerange'}==2592000) {
- $seltext='during the last month ('.localtime($starttime).')';
- $monthsel='selected';
- } elsif ($ENV{'form.timerange'}==604800) {
- $seltext='during the last week ('.localtime($starttime).')';
- $weeksel='selected';
- } elsif ($ENV{'form.timerange'}==86400) {
- $seltext='since yesterday ('.localtime($starttime).')';
- $daysel='selected';
- }
+ my $header='';
+ my $startsel='';
+ my $monthsel='';
+ my $weeksel='';
+ my $daysel='';
+ my $allsel='';
+ my %changes=();
+ my $starttime=0;
+ my $haschanged=0;
+ my %setversions=&Apache::lonnet::dump('resourceversions',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
- $r->print(<0) {
+ $newsetversions{$1}=$getvers;
+ }
+ }
+ }
+ } elsif ($ENV{'form.setversions'}) {
+ $haschanged=1;
+ foreach (keys %ENV) {
+ if ($_=~/^form\.set_version_(.+)$/) {
+ my $src=$1;
+ &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
+ if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
+ $newsetversions{$src}=$ENV{$_};
+ }
+ }
+ }
+ }
+ if ($haschanged) {
+ if (&Apache::lonnet::put('resourceversions',\%newsetversions,
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') {
+ $r->print(''.&mt('Your Version Settings have been Stored').' ');
+ } else {
+ $r->print(''.&mt('An Error Occured while Attempting to Store your Version Settings').' ');
+ }
+ &changewarning($r,'');
+ }
+ if ($ENV{'form.timerange'} eq 'all') {
+# show all documents
+ $header=&mt('All Documents in Course');
+ $allsel=1;
+ foreach (keys %hash) {
+ if ($_=~/^ids\_(\/res\/.+)$/) {
+ my $src=$1;
+ $changes{$src}=1;
+ }
+ }
+ } else {
+# show documents which changed
+ %changes=&Apache::lonnet::dump
+ ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my $firstkey=(keys %changes)[0];
+ unless ($firstkey=~/^error\:/) {
+ unless ($ENV{'form.timerange'}) {
+ $ENV{'form.timerange'}=604800;
+ }
+ my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' '
+ .&mt('seconds');
+ if ($ENV{'form.timerange'}==-1) {
+ $seltext='since start of course';
+ $startsel='selected';
+ $ENV{'form.timerange'}=time;
+ }
+ $starttime=time-$ENV{'form.timerange'};
+ if ($ENV{'form.timerange'}==2592000) {
+ $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+ $monthsel='selected';
+ } elsif ($ENV{'form.timerange'}==604800) {
+ $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+ $weeksel='selected';
+ } elsif ($ENV{'form.timerange'}==86400) {
+ $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
+ $daysel='selected';
+ }
+ $header=&mt('Content changed').' '.$seltext;
+ } else {
+ $header=&mt('No content modifications yet.');
+ }
+ }
+ %setversions=&Apache::lonnet::dump('resourceversions',
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ my %lt=&Apache::lonlocal::texthash
+ ('st' => 'Version changes since start of Course',
+ 'lm' => 'Version changes since last Month',
+ 'lw' => 'Version changes since last Week',
+ 'sy' => 'Version changes since Yesterday',
+ 'al' => 'All Resources (possibly large output)',
+ 'sd' => 'Display',
+ 'fi' => 'File',
+ 'md' => 'Modification Date',
+ 'mr' => 'Most recently published Version',
+ 've' => 'Version used in Course',
+ 'vu' => 'Set Version to be used in Course',
+'sv' => 'Set Versions to be used in Course according to Selections below',
+'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
+'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
+ 'di' => 'Differences');
+ $r->print(<
+
+
+
-Since Start of Course
-Last Month
-Last Week
-Since Yesterday
+$lt{'al'}
+$lt{'st'}
+$lt{'lm'}
+$lt{'lw'}
+$lt{'sy'}
-
-
-Content changed $seltext
+
+$header
+
-File Modification Date
-Version Differences
+$lt{'fi'} $lt{'md'} $lt{'mr'}
+$lt{'ve'} $lt{'vu'} $lt{'di'}
ENDHEADERS
- foreach (keys %changes) {
- if ($changes{$_}>$starttime) {
- my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
- my $currentversion=&Apache::lonnet::getversion($_);
- my $linkurl=&Apache::lonnet::clutter($_);
- $r->print(
- ''.$linkurl.
- ' '.
- localtime($changes{$_}).' '.$currentversion.' '.
- '');
- my $lastold=1;
- for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
- my $url=$root.'.'.$prevvers.'.'.$extension;
- if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
- $starttime) {
- $lastold=$prevvers;
- }
- }
+ foreach (sort keys %changes) {
+ if ($changes{$_}>$starttime) {
+ my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
+ my $currentversion=&Apache::lonnet::getversion($_);
+ if ($currentversion<0) {
+ $currentversion=&mt('Could not be determined.');
+ }
+ my $linkurl=&Apache::lonnet::clutter($_);
+ $r->print(
+ ' '.
+ &Apache::lonnet::gettitle($linkurl).
+ ' '.$linkurl.
+ ' '.
+ &Apache::lonlocal::locallocaltime($changes{$_}).
+ ' '.
+ $currentversion.' ');
+# Used in course
+ my $usedversion=$hash{'version_'.$linkurl};
+ if (($usedversion) && ($usedversion ne 'mostrecent')) {
+ $r->print($usedversion);
+ } else {
+ $r->print($currentversion);
+ }
+ $r->print(' ');
+# Set version
+ $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
+ 'set_version_'.$linkurl,
+ ('' => '',
+ 'mostrecent' => 'most recent',
+ map {$_,$_} (1..$currentversion))));
+ $r->print(' ');
+ my $lastold=1;
+ for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
+ my $url=$root.'.'.$prevvers.'.'.$extension;
+ if (&Apache::lonnet::metadata($url,'lastrevisiondate')<
+ $starttime) {
+ $lastold=$prevvers;
+ }
+ }
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
- my $url=$root.'.'.$prevvers.'.'.$extension;
- $r->print('Version '.$prevvers.' ('.
- localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
- ') ');
- if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
+ my $url=$root.'.'.$prevvers.'.'.$extension;
+ $r->print(''.&mt('Version').' '.$prevvers.' ('.
+ &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
+ ')');
+ if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
$r->print(' Diffs ');
- }
- $r->print(' ');
- }
- $r->print(' ');
- }
- }
- $r->print('
');
- $r->print('Done. ');
- } else {
- $r->print('No content modifications yet.
');
- }
- &untiehash();
+ &Apache::lonnet::clutter($root.'.'.$extension).
+ '&versionone='.$prevvers.
+ '">'.&mt('Diffs').'');
+ }
+ $r->print('');
+ }
+ $r->print(' ');
+ }
+ }
+ $r->print('');
+ $r->print(''.&mt('Done').'. ');
+
+ &untiehash();
+}
+
+sub changewarning {
+ my ($r,$postexec)=@_;
+ $r->print(
+''.
+'');
}
# ================================================================ Main Handler
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
@@ -586,6 +809,8 @@ sub handler {
'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
$help{'Simple Page'} = &Apache::loncommon::help_open_topic(
'Docs_About_Simple_Page,Docs_Editing_Templated_Pages');
+ $help{'Simple Problem'} = &Apache::loncommon::help_open_topic(
+ 'Option_Response_Simple');
$help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
$help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
@@ -618,7 +843,7 @@ sub handler {
$forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
# does this user have privileges to post, etc?
- $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+ $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
if ($allowed) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
$script=&Apache::lonratedt::editscript('simple');
@@ -743,8 +968,34 @@ ENDNEWSCRIPT
&Apache::loncommon::bodytag('Course Documents','',$events,
'','',$showdoc));
unless ($showdoc) {
+# -----------------------------------------------------------------------------
+ my %lt=&Apache::lonlocal::texthash(
+ 'uplm' => 'Upload a new main course document',
+ 'upls' => 'Upload a new supplemental course document',
+ 'impp' => 'Import a published document',
+ 'spec' => 'Special documents',
+ 'upld' => 'Upload Document',
+ 'srch' => 'Search',
+ 'impo' => 'Import',
+ 'selm' => 'Select Map',
+ 'load' => 'Load Map',
+ 'newf' => 'New Folder',
+ 'extr' => 'External Resource',
+ 'syll' => 'Syllabus',
+ 'navc' => 'Navigate Contents',
+ 'sipa' => 'Simple Page',
+ 'sipr' => 'Simple Problem',
+ 'scuf' => 'Score Upload Form',
+ 'bull' => 'Bulletin Board',
+ 'mypi' => 'My Personal Info'
+ );
+# -----------------------------------------------------------------------------
if ($allowed) {
my $dumpbut=&dumpbutton();
+ my %lt=&Apache::lonlocal::texthash(
+ 'vc' => 'Verify Content',
+ 'cv' => 'Check/Set Resource Versions',
+ );
$r->print(<
@@ -758,9 +1009,9 @@ ENDNEWSCRIPT
@@ -771,7 +1022,7 @@ ENDCOURSEVERIFY
# --------------------------------------------------------- Standard documents
$r->print('');
if (($standard) && ($allowed) && (!$forcesupplement)) {
- $r->print('Main Course Documents'.
+ $r->print(''.&mt('Main Course Documents').
($allowed?' '.$help{'Main_Course_Documents'}:'').' ');
my $folder=$ENV{'form.folder'};
unless ($folder=~/^default/) { $folder='default'; }
@@ -784,21 +1035,15 @@ ENDCOURSEVERIFY
$hadchanges=0;
&editor($r,$coursenum,$coursedom,$folder,$allowed);
if ($hadchanges) {
- $r->print(
-''.
-'');
+ &changewarning($r,$postexec);
}
my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
'.sequence';
-
$r->print(<
-Upload a new main course document
-Import a published document
-Special documents
+$lt{'uplm'}
+$lt{'impp'}
+$lt{'spec'}
File:
@@ -810,7 +1055,7 @@ Title:
-
+
$help{'Uploading_From_Harddrive'}
@@ -821,10 +1066,10 @@ Title:
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">
$help{'Importing_LON-CAPA_Resource'}
@@ -832,7 +1077,7 @@ $help{'Importing_LON-CAPA_Resource'}
+value="$lt{'selm'}">
$help{'Load_Map'}
@@ -844,7 +1089,7 @@ $help{'Load_Map'}
$help{'Adding_Folders'}
+value="$lt{'newf'}" />$help{'Adding_Folders'}
@@ -872,7 +1117,7 @@ value="Syllabus=/public/$coursedom/$cour
-
+
$help{'Navigate_Content'}
@@ -881,7 +1126,7 @@ $help{'Navigate_Content'}
- $help{'Simple Page'}
@@ -890,7 +1135,7 @@ onClick="javascript:makesmppage();" /> $
- $help{'Simple Problem'}
@@ -899,7 +1144,7 @@ onClick="javascript:makesmpproblem();" /
-
$help{'Score_Upload_Form'}
@@ -909,7 +1154,7 @@ $help{'Score_Upload_Form'}
-
$help{'Bulletin Board'}
@@ -920,7 +1165,7 @@ $help{'Bulletin Board'}
-
+
$help{'My Personal Info'}
@@ -932,7 +1177,7 @@ ENDFORM
# ----------------------------------------------------- Supplemental documents
if (!$forcestandard) {
$r->print(
- ' Supplemental Course Documents'.
+ ''.&mt('Supplemental Course Documents').
($allowed?' '.$help{'Supplemental'}:'').' ');
my $folder=$ENV{'form.folder'};
unless ($folder=~/supplemental/) { $folder='supplemental'; }
@@ -944,9 +1189,9 @@ ENDFORM
$r->print(<
-Upload a new supplemental course document
-Import a published document
-Special documents
+$lt{'upls'}
+$lt{'impp'}
+$lt{'spec'}
@@ -969,15 +1214,15 @@ ENDFORM
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
$help{'Importing_LON-CAPA_Resource'}
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}
+value="$lt{'selm'}"> $help{'Load_Map'}
@@ -988,7 +1233,7 @@ value="Select Map">
$help{'Adding_Folders'}
+value="$lt{'newf'}" /> $help{'Adding_Folders'}
@@ -1017,7 +1262,7 @@ $help{'Syllabus'}
-
+
$help{'My Personal Info'}
@@ -1032,8 +1277,9 @@ ENDSUPFORM
$r->print('
');
} else {
# -------------------------------------------------------- This is showdoc mode
- $r->print("Uploaded Document It is recommended that you use an up-to-date virus scanner before handling this file.
".
- &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'
');
+ $r->print("".&mt('Uploaded Document').' '.
+&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).'
');
}
}
$r->print('');