--- loncom/interface/londocs.pm 2002/10/16 20:18:19 1.30 +++ loncom/interface/londocs.pm 2003/07/24 22:06:07 1.69.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.30 2002/10/16 20:18:19 www Exp $ +# $Id: londocs.pm,v 1.69.2.1 2003/07/24 22:06:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,7 @@ use Apache::loncommon; use Apache::lonratedt; use Apache::lonratsrv; use Apache::lonxml; +use HTML::Entities; use GDBM_File; my $iconpath; @@ -44,6 +45,12 @@ my %hash; my $hashtied; my %alreadyseen=(); +my $hadchanges; + +# Available help topics + +my %help=(); + # Mapread read maps into lonratedt::global arrays # @order and @resources, determines status # sets @order - pointer to resources in right order @@ -59,6 +66,7 @@ sub mapread { sub storemap { my ($coursenum,$coursedom,$map)=@_; + $hadchanges=1; return &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); @@ -118,15 +126,32 @@ sub editor { } $#Apache::lonratedt::order--; } elsif ($cmd eq 'up') { + if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) { my $i=$Apache::lonratedt::order[$idx-1]; $Apache::lonratedt::order[$idx-1]= $Apache::lonratedt::order[$idx]; $Apache::lonratedt::order[$idx]=$i; + } } elsif ($cmd eq 'down') { + if (defined($Apache::lonratedt::order[$idx+1])) { my $i=$Apache::lonratedt::order[$idx+1]; $Apache::lonratedt::order[$idx+1]= $Apache::lonratedt::order[$idx]; $Apache::lonratedt::order[$idx]=$i; + } + } elsif ($cmd eq 'rename') { + my ($rtitle,@rrest)=split(/\:/, + $Apache::lonratedt::resources[ + $Apache::lonratedt::order[$idx]]); + my $comment= + &HTML::Entities::decode($ENV{'form.title'}); + $comment=~s/\</\<\;/g; + $comment=~s/\>/\>\;/g; + $comment=~s/\:/\:/g; + $Apache::lonratedt::resources[ + $Apache::lonratedt::order[$idx]]= + $comment.':'.join(':',@rrest); + } # Store the changed version &storemap($coursenum,$coursedom,$folder.'.sequence'); @@ -145,6 +170,7 @@ sub editor { my $ext='false'; if ($url=~/^http\:\/\//) { $ext='true'; } $url=~s/\:/\:/g; + $name=~s/\:/\:/g; $Apache::lonratedt::resources[$idx]= $name.':'.$url.':'.$ext.':normal:res'; } @@ -153,6 +179,20 @@ sub editor { # Store the changed version &storemap($coursenum,$coursedom,$folder.'.sequence'); } +# Loading a complete map + if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { + foreach +(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { + my $idx=$#Apache::lonratedt::resources; + $idx++; + $Apache::lonratedt::resources[$idx]=$_; + $Apache::lonratedt::order + [$#Apache::lonratedt::order+1]=$idx; + } + +# Store the changed version + &storemap($coursenum,$coursedom,$folder.'.sequence'); + } } # ---------------------------------------------------------------- End commands # ---------------------------------------------------------------- Print screen @@ -161,8 +201,8 @@ sub editor { foreach (@Apache::lonratedt::order) { my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); unless ($name) { $name=(split(/\//,$url))[-1]; } - unless ($name) { $name='EMPTY'; } - $r->print(&entryline($idx,$name,$url,$folder,$allowed)); + unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); $idx++; } $r->print('</table>'); @@ -172,18 +212,38 @@ sub editor { # --------------------------------------------------------------- An entry line sub entryline { - my ($index,$title,$url,$folder,$allowed)=@_; + my ($index,$title,$url,$folder,$allowed,$residx)=@_; + $title=~s/\&colon\;/\:/g; + $title=&HTML::Entities::encode(&HTML::Entities::decode( + &Apache::lonnet::unescape($title)),'\"\<\>\&\''); + my $renametitle=$title; + my $foldertitle=$title; + if ($title=~ + /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/ + ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $renametitle=$4; + $title='<i>'.localtime($1).'</i> '. + &Apache::loncommon::plainname($2,$3).': <br>'. + $foldertitle; + } + $renametitle=~s/\"\;/\\\"/g; my $line='<tr>'; # Edit commands if ($allowed) { $line.=(<<END); -<td><table border='0' cellspacing='0' cellpadding='0'> -<tr><td><a href='/adm/coursedocs?folder=$folder&cmd=up_$index'> +<td><table border='0' cellspacing='2' cellpadding='0'> +<tr><td bgcolor="#DDDDDD"> +<a href='/adm/coursedocs?folder=$folder&cmd=up_$index'> <img src="${iconpath}move_up.gif" alt='UP' border='0' /></a></td></tr> -<tr><td><a href='/adm/coursedocs?folder=$folder&cmd=down_$index'> +<tr><td bgcolor="#DDDDDD"> +<a href='/adm/coursedocs?folder=$folder&cmd=down_$index'> <img src="${iconpath}move_down.gif" alt='DOWN' border='0' /></a></td></tr> -</table></td><td> -<a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>Remove</td> +</table></td><td bgcolor="#DDDDDD"> +<a href='javascript:removeres("$folder","$index","$renametitle");'> +<font size="-2" color="#990000">Remove</font></a> +<a href='javascript:changename("$folder","$index","$renametitle");'> +<font size="-2" color="#009900">Rename</font></a></td> END } # Figure out what kind of a resource this is @@ -205,18 +265,18 @@ END } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; -# Title - $title=&Apache::lonnet::unescape($title); - my $foldertitle=$title; - if ($title=~ - /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/ - ) { - $foldertitle=&Apache::lontexconvert::msgtexconverted($4); - $title='<i>'.localtime($1).'</i> '. - &Apache::loncommon::plainname($2,$3).': <br>'. - $foldertitle; - } - if ($isfolder) { $url.='&foldername='.$foldertitle; } + if ($residx) { + $url.=(($url=~/\?/)?'&':'?').'symb='. + &Apache::lonnet::escape(&Apache::lonnet::symbclean( + &Apache::lonnet::declutter('uploaded/'. + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'. + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder. + '.sequence'). + '___'.$residx.'___'. + &Apache::lonnet::declutter($url))); + } + if ($isfolder) { $url.='&foldername='. + &Apache::lonnet::escape($foldertitle); } $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder. '"><img src="/adm/lonIcons/'. $icon.'.gif" border="0"></a></td>'. @@ -247,7 +307,7 @@ sub checkonthis { my ($r,$url,$level,$title)=@_; $alreadyseen{$url}=1; $r->rflush(); - if ($url) { + if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { $r->print('<br />'); for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); @@ -260,6 +320,36 @@ sub checkonthis { if ($result==OK) { $r->print('<font color="green">ok</font>'); $r->rflush(); + &Apache::lonnet::countacc($url); + $url=~/\.(\w+)$/; + if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { + $r->print('<br />'); + $r->rflush(); + for (my $i=0;$i<=$level*5;$i++) { + $r->print(' '); + } + $r->print('- 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))); + $ENV{'request.filename'}=$oldpath; + if (($Apache::lonxml::errorcount) || + ($Apache::lonxml::warningcount)) { + if ($Apache::lonxml::errorcount) { + $r->print('<font color="red"><b>'. + $Apache::lonxml::errorcount.' error(s)</b></font> '); + } + if ($Apache::lonxml::warningcount) { + $r->print('<font color="blue">'. + $Apache::lonxml::warningcount.' warning(s)</font>'); + } + } else { + $r->print('<font color="green">ok</font>'); + } + $r->rflush(); + } my $dependencies= &Apache::lonnet::metadata($url,'dependencies'); foreach (split(/\,/,$dependencies)) { @@ -285,7 +375,25 @@ sub handler { $r->send_http_header; return OK if $r->header_only; - +# --------------------------------------------- Initialize help topics for this + foreach ('Adding_Course_Doc','Main_Course_Documents', + 'Adding_External_Resource','Navigate_Content', + 'Adding_Folders','Docs_Overview', 'Load_Map', + 'Supplemental', 'Score_Upload_Form', + 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') { + $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); + } + # Composite help files + $help{'Syllabus'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); + $help{'Simple Page'} = &Apache::loncommon::help_open_topic( + 'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); + $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( + 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); + $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); + if ($ENV{'form.verify'}) { my $loaderror=&Apache::lonnet::overloaderror($r); @@ -311,9 +419,87 @@ sub handler { my %changes=&Apache::lonnet::dump ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - foreach (keys %changes) { - $r->print('<br /><a href="'.$_.'" target="cat">'.$_.'</a> - '. - localtime($changes{$_})); + 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'; + } + + $r->print(<<ENDHEADERS); +<form action="/adm/coursedocs" method="post"> +<select name="timerange"> +<option value="-1" $startsel>Since Start of Course</option> +<option value="2592000" $monthsel>Last Month</option> +<option value="604800" $weeksel>Last Week</option> +<option value="86400" $daysel>Since Yesterday</option> +</select> +<input type="submit" name="versions" value="Display" /> +</form> +<h3>Content changed $seltext</h3> +<table border="2"> +<tr> +<th>File</th><th>Modification Date</th> +<th>Version</th><th>Differences</th></tr> +ENDHEADERS + foreach (keys %changes) { + if ($changes{$_}>$starttime) { + my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($_); + my $linkurl=&Apache::lonnet::clutter($_); + $r->print( + '<tr><td><a href="'.$linkurl.'" target="cat">'.$linkurl. + '</a></td><td>'. + localtime($changes{$_}).'</td><td>'.$currentversion.'</td>'. + '<td>'); + 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('<a href="'.&Apache::lonnet::clutter($url). + '">Version '.$prevvers.' ('. + localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')). + ')</a>'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print(' <a href="/adm/diff?filename='. + &Apache::lonnet::clutter($root.'.'.$extension). + '&versionone='.$prevvers. + '">Diffs</a>'); + } + $r->print('<br />'); + } + $r->print('</td></tr>'); + } + } + $r->print('</table>'); + } else { + $r->print('<p>No content modifications yet.</p>'); } &untiehash(); } else { @@ -325,6 +511,7 @@ sub handler { my $script=''; my $allowed; my $events=''; + my $buttons=''; my $showdoc=0; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folder','foldername']); @@ -343,9 +530,10 @@ sub handler { } } else { # got called in sequence from course $allowed=0; - $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>'; - $events='onLoad="'.&Apache::lonxml::loadevents. - '" onUnload="'.&Apache::lonxml::unloadevents.'"'; + $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>'; + $events='onLoad="'.&Apache::lonmenu::loadevents. + '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; + $buttons=&Apache::lonmenu::menubuttons(1,undef); } # get course data @@ -390,18 +578,40 @@ function makenewext(targetname) { window.open('/adm/rat/extpickframe.html'); } +function makeexamupload() { + var title=prompt('Listed Title for the Uploaded Score'); + if (title) { + this.document.forms.newexamupload.importdetail.value= + title+'=/res/lib/templates/examupload.problem'; + this.document.forms.newexamupload.submit(); + } +} + function makesmppage() { - var title=prompt('Listed Title for the Page'); + var title=prompt('Listed Title for the Page'); + if (title) { this.document.forms.newsmppg.importdetail.value= title+'=/adm/$udom/$uname/$now/smppg'; this.document.forms.newsmppg.submit(); + } +} + +function makesmpproblem() { + var title=prompt('Listed Title for the Problem'); + if (title) { + this.document.forms.newsmpproblem.importdetail.value= + title+'=/res/lib/templates/simpleproblem.problem'; + this.document.forms.newsmpproblem.submit(); + } } function makebulboard() { - var title=prompt('Listed Title for the Bulletin Board'); + var title=prompt('Listed Title for the Bulletin Board'); + if (title) { this.document.forms.newbul.importdetail.value= title+'=/adm/$udom/$uname/$now/bulletinboard'; this.document.forms.newbul.submit(); + } } function finishpick() { @@ -412,15 +622,46 @@ function finishpick() { ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+ '";this.document.forms.'+form+'.submit();'); } + +function changename(folder,index,oldtitle) { + var title=prompt('New Title',oldtitle); + if (title) { + this.document.forms.renameform.title.value=title; + this.document.forms.renameform.cmd.value='rename_'+index; + this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.submit(); + } +} + +function removeres(folder,index,oldtitle) { + if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) { + this.document.forms.renameform.cmd.value='del_'+index; + this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.submit(); + } +} </script> + ENDNEWSCRIPT } # -------------------------------------------------------------------- Body tag $r->print('</head>'. - &Apache::loncommon::bodytag('Course Documents','',$events)); + &Apache::loncommon::bodytag('Course Documents','',$events). + $buttons); unless ($showdoc) { if ($allowed) { + $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', + 'Editing the Table of Contents for your Course')); $r->print(<<ENDCOURSEVERIFY); +<form name="renameform" method="post" action="/adm/coursedocs"> +<input type="hidden" name="title" /> +<input type="hidden" name="cmd" /> +<input type="hidden" name="folder" /> +</form> +<form name="simpleedit" method="post" action="/adm/coursedocs"> +<input type=hidden name="importdetail" value=""> +<input type="hidden" name="folder" /> +</form> <form action="/adm/coursedocs" method="post" name="courseverify"> <input type="submit" name="verify" value="Verify Content" /> <input type="submit" name="versions" value="Check Resource Versions" /> @@ -428,16 +669,33 @@ ENDNEWSCRIPT ENDCOURSEVERIFY } # --------------------------------------------------------- Standard documents - $r->print('<table>'); + $r->print('<table border=2 cellspacing=4 cellpadding=4>'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td bgcolor="#FFFFBB"><h2>Main Course Documents</h2>'); + $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents'. + ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } + my $postexec=''; + if ($folder eq 'default') { + $r->print('<script>this.window.name="loncapaclient";</script>'); + } else { + $postexec='self.close();'; + } + $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); + if ($hadchanges) { + $r->print( +'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. +'<form method="post" action="/adm/roles" target="loncapaclient">'. +'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'. +$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'. +$help{'Caching'}.'</font></h3></form>'); + } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; + $r->print(<<ENDFORM); -<table cellspacing=2><tr> +<table cellspacing=4 cellpadding=4><tr> <th bgcolor="#DDDDDD">Upload a new main course document</th> <th bgcolor="#DDDDDD">Import a published document</th> <th bgcolor="#DDDDDD">Special documents</th> @@ -445,75 +703,117 @@ ENDCOURSEVERIFY <tr><td bgcolor="#DDDDDD"> File:<br /> <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> -<input type="file" name="uploaddoc" size="50"> +<input type="file" name="uploaddoc" size="40"> <br /> -Title:<br /> +Title:<br /> <input type="text" size="50" name="comment"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type="hidden" name="cmd" value="upload_default"> <input type="submit" value="Upload Document"> +<nobr> + $help{'Uploading_From_Harddrive'} +</nobr> </form> </td> <td bgcolor="#DDDDDD"> -<form action="/adm/coursedocs" method="post" name="simpleedit"> +<form action="/adm/coursedocs" method="post" name="simpleeditdefault"> <input type="hidden" name="folder" value="$folder"> -<input type=hidden name="importdetail" value=""> +<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=button onClick= -"javascript:groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +<nobr> <input type=button onClick= -"javascript:groupimport();" value="Import"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import"> +$help{'Importing_LON-CAPA_Resource'} +</nobr> +<p> +<hr /> +<input type="text" size="20" name="importmap"><br /> +<nobr><input type=button +onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" +value="Select Map"> <input type="submit" name="loadmap" value="Load Map"> +$help{'Load_Map'}</nobr> +</p> </form> </td><td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="newfolder"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> +<nobr> <input name="newfolder" type="button" onClick="javascript:makenewfolder(this.form,'$folderseq');" -value="New Folder" /> +value="New Folder" />$help{'Adding_Folders'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="newext"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> +<nobr> <input name="newext" type="button" onClick="javascript:makenewext('newext');" -value="External Resource" /> +value="External Resource" /> $help{'Adding_External_Resource'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="newsyl"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> -<input name="newsyl" type="submit" value="Syllabus" /> +<nobr> +<input name="newsyl" type="submit" value="Syllabus" /> + $help{'Syllabus'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="newnav"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value="Navigate Content=/adm/navmaps"> +<nobr> <input name="newnav" type="submit" value="Navigate Content" /> +$help{'Navigate_Content'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="newsmppg"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> +<nobr> <input name="newsmppg" type="button" value="Simple Page" -onClick="javascript:makesmppage();" /> +onClick="javascript:makesmppage();" /> $help{'Simple Page'} +</nobr> +</form> +<form action="/adm/coursedocs" method="post" name="newexamupload"> +<input type="hidden" name="folder" value="$folder"> +<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> +<input type=hidden name="importdetail" value=""> +<nobr> +<input name="newexamupload" type="button" value="Score Upload Form" +onClick="javascript:makeexamupload();" /> +$help{'Score_Upload_Form'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="newbul"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> +<nobr> <input name="newbulletin" type="button" value="Bulletin Board" onClick="javascript:makebulboard();" /> +$help{'Bulletin Board'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="newaboutme"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> +<nobr> <input name="newaboutme" type="submit" value="My Personal Info" /> +$help{'My Personal Info'} +</nobr> </form> </td></tr> </table> @@ -523,7 +823,8 @@ ENDFORM # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { $r->print( - '<tr><td bgcolor="#BBFFFF"><h2>Supplemental Course Documents</h2>'); + '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents'. + ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } &editor($r,$coursenum,$coursedom,$folder,$allowed); @@ -533,62 +834,83 @@ ENDFORM '.sequence'; $r->print(<<ENDSUPFORM); -<table cellspacing=2><tr> +<table cellspacing=4 cellpadding=4><tr> <th bgcolor="#DDDDDD">Upload a new supplemental course document</th> <th bgcolor="#DDDDDD">Import a published document</th> <th bgcolor="#DDDDDD">Special documents</th> </tr> <tr><td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> -<input type="file" name="uploaddoc" size="50"> +<input type="file" name="uploaddoc" size="40"> <br />Comment:<br /> <textarea cols=50 rows=4 name='comment'> </textarea> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type="hidden" name="cmd" value="upload_supplemental"> +<nobr> <input type="submit" value="Upload Document"> + $help{'Uploading_From_Harddrive'} +</nobr> </form> </td> <td bgcolor="#DDDDDD"> -<form action="/adm/coursedocs" method="post" name="simpleedit"> +<form action="/adm/coursedocs" method="post" name="simpleeditsupplement"> <input type="hidden" name="folder" value="$folder"> +<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> <input type=button onClick= -"javascript:groupsearch()" value="Search"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> <input type=button onClick= -"javascript:groupimport();" value="Import"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'} +<p> +<hr /> +<input type="text" size="20" name="importmap"> +<input type=button +onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')" +value="Select Map"><input type="submit" name="loadmap" value="Load Map"> +</p> </form> </td><td bgcolor="#DDDDDD"> <form action="/adm/coursedocs" method="post" name="supnewfolder"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> +<nobr> <input name="newfolder" type="button" onClick="javascript:makenewfolder(this.form,'$folderseq');" -value="New Folder" /> +value="New Folder" /> $help{'Adding_Folders'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="supnewext"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value=""> +<nobr> <input name="newext" type="button" onClick="javascript:makenewext('supnewext');" -value="External Resource" /> +value="External Resource" /> $help{'Adding_External_Resource'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="supnewsyl"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value="Syllabus=/public/$coursedom/$coursenum/syllabus"> +<nobr> <input name="newsyl" type="submit" value="Syllabus" /> +$help{'Syllabus'} +</nobr> </form> <form action="/adm/coursedocs" method="post" name="subnewaboutme"> <input type="hidden" name="folder" value="$folder"> <input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=hidden name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme"> +<nobr> <input name="newaboutme" type="submit" value="My Personal Info" /> +$help{'My Personal Info'} +</nobr> </form> </td></tr> </table></td></tr>