--- loncom/interface/londocs.pm 2002/12/04 14:02:49 1.38
+++ loncom/interface/londocs.pm 2003/02/14 19:35:54 1.49
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.38 2002/12/04 14:02:49 www Exp $
+# $Id: londocs.pm,v 1.49 2003/02/14 19:35:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,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
@@ -60,6 +66,7 @@ sub mapread {
sub storemap {
my ($coursenum,$coursedom,$map)=@_;
+ $hadchanges=1;
return
&Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
$map,1);
@@ -163,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';
}
@@ -241,7 +249,8 @@ END
}
}
$url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
- if ($isfolder) { $url.='&foldername='.$foldertitle; }
+ 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>'.
@@ -272,7 +281,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(' ');
@@ -337,7 +346,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);
@@ -455,6 +472,7 @@ ENDHEADERS
my $script='';
my $allowed;
my $events='';
+ my $buttons='';
my $showdoc=0;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folder','foldername']);
@@ -473,9 +491,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
@@ -557,19 +576,27 @@ function changename(folder,index,oldtitl
}
}
</script>
-<form name="renameform" method="post" action="/adm/coursedocs">
-<input type="hidden" name="title" />
-<input type="hidden" name="cmd" />
-<input type="hidden" name="folder" />
-</form>
+
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" />
@@ -577,16 +604,24 @@ 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'; }
+ $hadchanges=0;
&editor($r,$coursenum,$coursedom,$folder,$allowed);
+ if ($hadchanges) {
+ $r->print('<form method="post" action="/adm/roles">'.
+'<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="submit" name="'.
+$ENV{'request.role'}.'" value="re-initializing course" />, or the next time you log in.</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>
@@ -602,17 +637,15 @@ Title:<br />
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type="hidden" name="cmd" value="upload_default">
<input type="submit" value="Upload Document">
-</form>
+ $help{'Uploading_From_Harddrive'}</form>
</td>
<td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleedit">
-<input type="hidden" name="folder" value="$folder">
-<input type=hidden name="importdetail" value="">
+<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
<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">
-</form>
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
+$help{'Importing_LON-CAPA_Resource'}</form>
</td><td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="newfolder">
<input type="hidden" name="folder" value="$folder">
@@ -620,35 +653,36 @@ Title:<br />
<input type=hidden name="importdetail" value="">
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" />
+value="New Folder" /> $help{'Adding_Folders'}
</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="">
<input name="newext" type="button" onClick="javascript:makenewext('newext');"
-value="External Resource" />
+value="External Resource" /> $help{'Adding_External_Resource'}
</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" />
-</form>
+<input name="newsyl" type="submit" value="Syllabus" />
+ $help{'Creating_From_Template'}</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">
<input name="newnav" type="submit" value="Navigate Content" />
+$help{'Navigate_Content'}
</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="">
<input name="newsmppg" type="button" value="Simple Page"
-onClick="javascript:makesmppage();" />
+onClick="javascript:makesmppage();" /> $help{'Creating_From_Template'}
</form>
<form action="/adm/coursedocs" method="post" name="newbul">
<input type="hidden" name="folder" value="$folder">
@@ -656,14 +690,14 @@ onClick="javascript:makesmppage();" />
<input type=hidden name="importdetail" value="">
<input name="newbulletin" type="button" value="Bulletin Board"
onClick="javascript:makebulboard();" />
-</form>
+$help{'Creating_From_Template'}</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">
<input name="newaboutme" type="submit" value="My Personal Info" />
-</form>
+$help{'Creating_From_Template'}</form>
</td></tr>
</table>
ENDFORM
@@ -672,7 +706,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);
@@ -682,7 +717,7 @@ 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>
@@ -697,16 +732,15 @@ ENDFORM
<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
<input type="hidden" name="cmd" value="upload_supplemental">
<input type="submit" value="Upload Document">
-</form>
+ $help{'Uploading_From_Harddrive'}</form>
</td>
<td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="simpleedit">
-<input type="hidden" name="folder" value="$folder">
+<form action="/adm/coursedocs" method="post" name="simpleeditsupplement">
<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'}
</form>
</td><td bgcolor="#DDDDDD">
<form action="/adm/coursedocs" method="post" name="supnewfolder">
@@ -715,7 +749,7 @@ ENDFORM
<input type=hidden name="importdetail" value="">
<input name="newfolder" type="button"
onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" />
+value="New Folder" /> $help{'Adding_Folders'}
</form>
<form action="/adm/coursedocs" method="post" name="supnewext">
<input type="hidden" name="folder" value="$folder">
@@ -723,7 +757,7 @@ value="New Folder" />
<input type=hidden name="importdetail" value="">
<input name="newext" type="button"
onClick="javascript:makenewext('supnewext');"
-value="External Resource" />
+value="External Resource" /> $help{'Adding_External_Resource'}
</form>
<form action="/adm/coursedocs" method="post" name="supnewsyl">
<input type="hidden" name="folder" value="$folder">
@@ -731,14 +765,14 @@ value="External Resource" />
<input type=hidden name="importdetail"
value="Syllabus=/public/$coursedom/$coursenum/syllabus">
<input name="newsyl" type="submit" value="Syllabus" />
-</form>
+$help{'Creating_From_Template'}</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">
<input name="newaboutme" type="submit" value="My Personal Info" />
-</form>
+$help{'Creating_From_Template'}</form>
</td></tr>
</table></td></tr>
ENDSUPFORM