--- loncom/interface/londocs.pm 2003/05/13 15:41:20 1.55 +++ loncom/interface/londocs.pm 2003/08/05 12:47:21 1.71 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.55 2003/05/13 15:41:20 www Exp $ +# $Id: londocs.pm,v 1.71 2003/08/05 12:47:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -265,7 +265,7 @@ END } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; - if ($residx) { + if (($residx) && ($folder!~/supplemental/)) { $url.=(($url=~/\?/)?'&':'?').'symb='. &Apache::lonnet::escape(&Apache::lonnet::symbclean( &Apache::lonnet::declutter('uploaded/'. @@ -329,9 +329,12 @@ sub checkonthis { $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) { @@ -375,12 +378,22 @@ sub handler { # --------------------------------------------- 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', + '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); @@ -398,6 +411,7 @@ sub handler { } } &untiehash(); + $r->print('

Done.

'); } elsif ($ENV{'form.versions'}) { $r->print('Check Versions'. &Apache::loncommon::bodytag('Check Course Document Versions')); @@ -485,6 +499,7 @@ ENDHEADERS } } $r->print(''); + $r->print('

Done.

'); } else { $r->print('

No content modifications yet.

'); } @@ -565,6 +580,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) { @@ -578,7 +602,7 @@ function makesmpproblem() { var title=prompt('Listed Title for the Problem'); if (title) { this.document.forms.newsmpproblem.importdetail.value= - title+'=/adm/wrapper/uploaded/$udom/$uname/$now.problem'; + title+'=/res/lib/templates/simpleproblem.problem'; this.document.forms.newsmpproblem.submit(); } } @@ -612,7 +636,7 @@ function changename(folder,index,oldtitl } function removeres(folder,index,oldtitle) { - if (confirm('Remove "'+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(); @@ -666,7 +690,8 @@ ENDCOURSEVERIFY ''. '
'. '

Changes will become active for your current session after , or the next time you log in.

'); +$ENV{'request.role'}.'" value="1" />, or the next time you log in.'. +$help{'Caching'}.''); } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; @@ -680,15 +705,18 @@ $ENV{'request.role'}.'" value="1" /> File:
- +
-Title:
+Title:
- $help{'Uploading_From_Harddrive'}
+ + $help{'Uploading_From_Harddrive'} + +
@@ -696,73 +724,108 @@ Title:
+ -$help{'Importing_LON-CAPA_Resource'}
- - +

+

+
+ +value="Select Map"> +$help{'Load_Map'} +

+ $help{'Adding_Folders'} +value="New Folder" />$help{'Adding_Folders'} +
+ $help{'Adding_External_Resource'} +
+ - $help{'Creating_From_Template'} + $help{'Syllabus'} +
+
+ $help{'Navigate_Content'} +
+ $help{'Creating_From_Template'} +onClick="javascript:makesmppage();" /> $help{'Simple Page'} +
+ $help{'Creating_From_Template'} +onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} + +
+
+ + + + + +$help{'Score_Upload_Form'} +
+ -$help{'Creating_From_Template'} +$help{'Bulletin Board'} +
+
+ -$help{'Creating_From_Template'} +$help{'My Personal Info'} +
+ ENDFORM @@ -789,15 +852,18 @@ ENDFORM
- +
Comment:
+ - $help{'Uploading_From_Harddrive'} + $help{'Uploading_From_Harddrive'} +
+
@@ -808,43 +874,55 @@ ENDFORM "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search"> $help{'Importing_LON-CAPA_Resource'} -
+

+

+value="Select Map"> +

+ $help{'Adding_Folders'} +
+ $help{'Adding_External_Resource'} +
+ -$help{'Creating_From_Template'} +$help{'Syllabus'} +
+
+ -$help{'Creating_From_Template'} +$help{'My Personal Info'} +
+ ENDSUPFORM