--- loncom/interface/londocs.pm 2002/12/26 16:13:11 1.43 +++ loncom/interface/londocs.pm 2003/07/07 07:32:16 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.43 2002/12/26 16:13:11 www Exp $ +# $Id: londocs.pm,v 1.63 2003/07/07 07:32:16 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,6 +47,10 @@ 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 @@ -166,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'; } @@ -174,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 @@ -183,7 +202,7 @@ sub editor { my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); unless ($name) { $name=(split(/\//,$url))[-1]; } unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } - $r->print(&entryline($idx,$name,$url,$folder,$allowed)); + $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); $idx++; } $r->print('</table>'); @@ -193,7 +212,7 @@ 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)),'\"\<\>\&\''); @@ -213,16 +232,18 @@ sub entryline { # 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'> -<font size="-2">Remove</font></a> +</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">Rename</font></a></td> +<font size="-2" color="#009900">Rename</font></a></td> END } # Figure out what kind of a resource this is @@ -244,7 +265,18 @@ END } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; - 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>'. @@ -340,7 +372,15 @@ 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', + 'Creating_From_Template','Supplemental', + 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') { + $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); + } + if ($ENV{'form.verify'}) { my $loaderror=&Apache::lonnet::overloaderror($r); @@ -458,6 +498,7 @@ ENDHEADERS my $script=''; my $allowed; my $events=''; + my $buttons=''; my $showdoc=0; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folder','foldername']); @@ -476,9 +517,10 @@ ENDHEADERS } } 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 @@ -497,7 +539,13 @@ ENDHEADERS $iconpath = $r->dir_config('lonIconsURL') . "/"; my $now=time; - +# +# FIXME: hack to disable new problem +# + my $noeggforyou=''; + unless ($ENV{'user.debug'}) { + $noeggforyou='alert("Sorry, not implemented yet."); return 0;'; + } # print screen $r->print(<<ENDDOCUMENT); <html> @@ -523,6 +571,15 @@ 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'); if (title) { @@ -532,6 +589,16 @@ function makesmppage() { } } +function makesmpproblem() { + $noeggforyou + 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'); if (title) { @@ -559,15 +626,26 @@ function changename(folder,index,oldtitl 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" /> @@ -587,16 +665,28 @@ ENDCOURSEVERIFY # --------------------------------------------------------- Standard documents $r->print('<table border=2 cellspacing=4 cellpadding=4>'); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td bgcolor="#BBBBBB"><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('<h3><font color="red">Changes will become active after <a href="/adm/roles">re-initializing course</a> or at next login.</font></h3>'); + $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.</font></h3></form>'); } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; + $r->print(<<ENDFORM); <table cellspacing=4 cellpadding=4><tr> <th bgcolor="#DDDDDD">Upload a new main course document</th> @@ -606,73 +696,124 @@ 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="simpleeditdefault"> +<input type="hidden" name="folder" value="$folder"> +<input type="hidden" name="foldername" value="$ENV{'form.foldername'}"> <input type=button onClick= "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> +<nobr> <input type=button onClick= "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"> +<input type=button +onClick="javascript:openbrowser('simpleeditdefault','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="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{'Creating_From_Template'} +</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{'Creating_From_Template'} +</nobr> +</form> +<form action="/adm/coursedocs" method="post" name="newsmpproblem"> +<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="newsmpproblem" type="button" value="Simple Problem" +onClick="javascript:makesmpproblem();" />$help{'Creating_From_Template'} +</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();" /> +</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{'Creating_From_Template'} +</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{'Creating_From_Template'} +</nobr> </form> </td></tr> </table> @@ -682,7 +823,8 @@ ENDFORM # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { $r->print( - '<tr><td bgcolor="#BBBBBB"><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); @@ -699,54 +841,76 @@ ENDFORM </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="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:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> <input type=button onClick= -"javascript:document.forms.simpleedit.folder.value='$folder';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{'Creating_From_Template'} +</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{'Creating_From_Template'} +</nobr> </form> </td></tr> </table></td></tr>