--- loncom/interface/londocs.pm 2010/02/02 01:33:02 1.314.2.8 +++ loncom/interface/londocs.pm 2009/02/10 12:20:18 1.338 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.314.2.8 2010/02/02 01:33:02 raeburn Exp $ +# $Id: londocs.pm,v 1.338 2009/02/10 12:20:18 ehlerst Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,8 @@ # http://www.lon-capa.org/ # + + package Apache::londocs; use strict; @@ -53,15 +55,9 @@ my %alreadyseen=(); my $hadchanges; -# Available help topics my %help=(); -# Mapread read maps into LONCAPA::map:: global arrays -# @order and @resources, determines status -# sets @order - pointer to resources in right order -# sets @resources - array with the resources with correct idx -# sub mapread { my ($coursenum,$coursedom,$map)=@_; @@ -81,20 +77,20 @@ sub storemap { return ($errtext,0); } -# ----------------------------------------- Return hash with valid author names + sub authorhosts { my %outhash=(); my $home=0; my $other=0; - foreach (keys %env) { - if ($_=~/^user\.role\.(au|ca)\.(.+)$/) { + foreach my $key (keys(%env)) { + if ($key=~/^user\.role\.(au|ca)\.(.+)$/) { my $role=$1; my $realm=$2; - my ($start,$end)=split(/\./,$env{$_}); + my ($start,$end)=split(/\./,$env{$key}); if (($start) && ($start>time)) { next; } if (($end) && (time>$end)) { next; } - my $ca; my $cd; + my ($ca,$cd); if ($1 eq 'au') { $ca=$env{'user.name'}; $cd=$env{'user.domain'}; @@ -116,18 +112,16 @@ sub authorhosts { } return ($home,$other,%outhash); } -# ------------------------------------------------------ Generate "dump" button + sub dumpbutton { my ($home,$other,%outhash)=&authorhosts(); my $type = &Apache::loncommon::course_type(); if ($home+$other==0) { return ''; } if ($home) { - return '<div>'. - '<input type="submit" name="dumpcourse" value="'. + return '<input type="submit" name="dumpcourse" value="'. &mt('Dump '.$type.' DOCS to Construction Space').'" />'. - &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'). - '</div>'; + &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'); } else { return '<div>'. &mt('Dump '.$type. @@ -141,7 +135,8 @@ sub clean { $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs; return $title; } -# -------------------------------------------------------- Actually dump course + + sub dumpcourse { my ($r) = @_; @@ -161,15 +156,15 @@ sub dumpcourse { my $title=$env{'form.authorfolder'}; $title=&clean($title); my %replacehash=(); - foreach (keys %env) { - if ($_=~/^form\.namefor\_(.+)/) { - $replacehash{$1}=$env{$_}; + foreach my $key (keys(%env)) { + if ($key=~/^form\.namefor\_(.+)/) { + $replacehash{$1}=$env{$key}; } } my $crs='/uploaded/'.$env{'request.course.id'}.'/'; $crs=~s/\_/\//g; - foreach (keys %replacehash) { - my $newfilename=$title.'/'.$replacehash{$_}; + foreach my $item (keys(%replacehash)) { + my $newfilename=$title.'/'.$replacehash{$item}; $newfilename=~s/\.(\w+)$//; my $ext=$1; $newfilename=&clean($newfilename); @@ -184,16 +179,16 @@ sub dumpcourse { unless(mkdir($makepath,0777)) { $fail=1; } } } - $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: '); + $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: '); if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { - if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) { + if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) { print $fh &Apache::lonclonecourse::rewritefile( - &Apache::lonclonecourse::readfile($env{'request.course.id'},$_), + &Apache::lonclonecourse::readfile($env{'request.course.id'},$item), (%replacehash,$crs => '') ); } else { print $fh - &Apache::lonclonecourse::readfile($env{'request.course.id'},$_); + &Apache::lonclonecourse::readfile($env{'request.course.id'},$item); } $fh->close(); } else { @@ -211,8 +206,8 @@ sub dumpcourse { $r->print( '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">'); } - foreach (sort keys %outhash) { - if ($_=~/^home_(.+)$/) { + foreach my $key (sort(keys(%outhash))) { + if ($key=~/^home_(.+)$/) { if ($home==1) { $r->print( '<input type="hidden" name="authorspace" value="'.$1.'" />'); @@ -238,22 +233,22 @@ sub dumpcourse { .'<th>'.&mt('Title').'</th>' .'<th>'.&mt('Save as ...').'</th>' .&Apache::loncommon::end_data_table_header_row()); - foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { + foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { $r->print(&Apache::loncommon::start_data_table_row() - .'<td>'.$_.'</td>'); - my ($ext)=($_=~/\.(\w+)$/); + .'<td>'.$file.'</td>'); + my ($ext)=($file=~/\.(\w+)$/); my $title=$hash{'title_'.$hash{ - 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}}; + 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}}; $r->print('<td>'.($title?$title:' ').'</td>'); if (!$title) { - $title=$_; + $title=$file; } else { $title=~s|/|_|g; } $title=~s/\.(\w+)$//; $title=&clean($title); $title.='.'.$ext; - $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td>" + $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>" .&Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table()); @@ -263,22 +258,23 @@ sub dumpcourse { } } -# ------------------------------------------------------ Generate "export" button + sub exportbutton { my $type = &Apache::loncommon::course_type(); - return '<div>'. - '<input type="submit" name="exportcourse" value="'. + return '<input type="submit" name="exportcourse" value="'. &mt('Export '.$type.' to IMS').'" />'. - &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>'; + &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs'); } + + sub exportcourse { my $r=shift; my $type = &Apache::loncommon::course_type(); my %discussiontime = &Apache::lonnet::dump('discussiontimes', $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); - my $numdisc = keys %discussiontime; + my $numdisc = keys(%discussiontime); my $navmap = Apache::lonnavmaps::navmap->new(); if (!defined($navmap)) { $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'). @@ -457,8 +453,8 @@ function containerCheck(item) { } |; - foreach my $container (sort { $a <=> $b } keys %children) { - my @contents = split/:/,$children{$container}; + foreach my $container (sort { $a <=> $b } (keys(%children))) { + my @contents = split(/:/,$children{$container}); for (my $i=0; $i<@contents; $i ++) { $scripttag .= ' parents['.$container.']['.$i.'] = '.$contents[$i]."\n"; } @@ -565,7 +561,7 @@ sub build_package { if ($curRes->is_sequence() || $curRes->is_page()) { $lastcontainer = $count; } - if (grep/^$count$/,@$exportitems) { + if (grep(/^$count$/,@$exportitems)) { &get_dependencies($exportitems,\%parent,$depth,\@dependencies); } } @@ -589,7 +585,7 @@ sub build_package { if (ref($curRes)) { $count ++; - if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) { + if ((grep(/^$count$/,@$exportitems)) || (grep(/^$count$/,@dependencies))) { my $symb = $curRes->symb(); my $isvisible = 'true'; my $resourceref; @@ -623,11 +619,11 @@ sub build_package { ' <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count. '" type="webcontent" href="'.$content_file.'">'."\n". ' <file href="'.$content_file.'" />'."\n"; - foreach (@hrefs) { + foreach my $item (@hrefs) { $imsresources .= - ' <file href="'.$_.'" />'."\n"; + ' <file href="'.$item.'" />'."\n"; } - if (grep/^$count$/,@$discussions) { + if (grep(/^$count$/,@$discussions)) { my $ressymb = $symb; my $mode; if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) { @@ -668,8 +664,8 @@ sub build_package { sub get_dependencies { my ($exportitems,$parent,$depth,$dependencies) = @_; if ($depth > 1) { - if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) { - push @$dependencies, $$parent{$depth}; + if ((!grep(/^$$parent{$depth}$/,@$exportitems)) && (!grep(/^$$parent{$depth}$/,@$dependencies))) { + push(@{$dependencies},$$parent{$depth}); if ($depth > 2) { &get_dependencies($exportitems,$parent,$depth-1,$dependencies); } @@ -875,7 +871,7 @@ sub extract_media { my $copiedfile; if ($copiedfile = Apache::File->new('>'.$destination)) { print $copiedfile $embed_content; - push @{$href}, 'resources/'.$count.'/res/'.$filename; + push(@{$href},'resources/'.$count.'/res/'.$filename); my $attrib_regexp = ''; if (@{$allfiles{$embed_file}} > 1) { $attrib_regexp = join('|',@{$allfiles{$embed_file}}); @@ -919,8 +915,7 @@ sub store_template { } } -# Imports the given (name, url) resources into the course -# coursenum, coursedom, and folder must precede the list + sub group_import { my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; @@ -1055,7 +1050,7 @@ sub log_docs { 'currentfolder' => $env{'form.folder'}); if ($parmidx) { $storehash{'parameter_res'}=$oldresources[$parmidx]; - foreach my $parm (keys %parmaction) { + foreach my $parm (keys(%parmaction)) { $storehash{'parameter_action_'.$parm}=$parmaction{$parm}; $storehash{'parameter_value_'.$parm}=$parmvalue{$parm}; } @@ -1082,9 +1077,9 @@ sub log_docs { } -# -# Docs Change Log -# + + + sub docs_change_log { my ($r)=@_; my $folder=$env{'form.folder'}; @@ -1228,7 +1223,7 @@ sub update_paste_buffer { &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title}); ($title) = &parse_supplemental_title($title); } elsif ($env{'docs.markedcopy_supplemental'}) { - &Apache::lonnet::delenv('docs.markedcopy_supplemental'); + &Apache::lonnet::delenv('docs\\.markedcopy_supplemental'); } $url=~s{http(:|:)//https(:|:)//}{https$2//}; @@ -1279,7 +1274,9 @@ ENDPASTE sub do_paste_from_buffer { my ($coursenum,$coursedom,$folder) = @_; - return 0 if (!$env{'form.pastemarked'}); + if (!$env{'form.pastemarked'}) { + return; + } # paste resource to end of list my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'}); @@ -1287,7 +1284,7 @@ sub do_paste_from_buffer { # Maps need to be copied first if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) { $title=&mt('Copy of').' '.$title; - my $newid=$$.int(rand(100)).time; + my $newid=$$.int(rand(100)).time; my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/); if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) { my $path = $1; @@ -1316,13 +1313,21 @@ sub do_paste_from_buffer { } my $storefn=$newurl; $storefn=~s{^/\w+/$match_domain/$match_username/}{}; - &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, - &Apache::lonnet::getfile($url)); + my $paste_map_result = + &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn, + &Apache::lonnet::getfile($url)); + if ($paste_map_result eq '/adm/notfound.html') { + if ($url=~/\.page$/) { + return &mt('Paste failed: an error occurred saving the composite page'); + } else { + return &mt('Paste failed: an error occurred saving the folder'); + } + } $url = $newurl; } # published maps can only exists once, so remove it from paste buffer when done if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) { - &Apache::lonnet::delenv('docs.markedcopy'); + &Apache::lonnet::delenv('docs\\.markedcopy'); } if ($url=~ m{/smppg$}) { my $db_name = &Apache::lonsimplepage::get_db_name($url); @@ -1359,6 +1364,7 @@ sub do_paste_from_buffer { $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res'; push(@LONCAPA::map::order, $newidx); + return 'ok'; # Store the result } @@ -1491,9 +1497,14 @@ sub editor { } if ($env{'form.pastemarked'}) { - &do_paste_from_buffer($coursenum,$coursedom,$folder); - ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); - return $errtext if ($fatal); + my $paste_res = + &do_paste_from_buffer($coursenum,$coursedom,$folder); + if ($paste_res eq 'ok') { + ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container); + return $errtext if ($fatal); + } elsif ($paste_res ne '') { + $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>'); + } } $r->print($upload_output); @@ -1505,10 +1516,10 @@ sub editor { # Group import/search if ($env{'form.importdetail'}) { my @imports; - foreach (split(/\&/,$env{'form.importdetail'})) { - if (defined($_)) { + foreach my $item (split(/\&/,$env{'form.importdetail'})) { + if (defined($item)) { my ($name,$url,$residx)= - map {&unescape($_)} split(/\=/,$_); + map {&unescape($_)} split(/\=/,$item); push(@imports, [$name, $url, $residx]); } } @@ -1699,7 +1710,6 @@ sub parse_supplemental_title { $foldertitle=&Apache::lontexconvert::msgtexconverted($4); my $name = &Apache::loncommon::plainname($uname,$udom); $name = &HTML::Entities::encode($name,'"<>&\''); - $renametitle = &HTML::Entities::encode($renametitle,'"<>&\''); $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '. $name.': <br />'.$foldertitle; } @@ -1765,7 +1775,7 @@ sub entryline { '<select name="newpos" onChange="this.form.submit()">'; for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) { if ($i==$incindex) { - $selectbox.='<option value="" selected="selected">('.$i.')</option>'; + $selectbox.='<option value="" selected="1">('.$i.')</option>'; } else { $selectbox.='<option value="'.$i.'">'.$i.'</option>'; } @@ -1786,8 +1796,8 @@ sub entryline { # no copy for published maps $nocopy = 1; } else { - foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) { - my ($title,$url,$ext,$type)=split(/\:/,$_); + foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) { + my ($title,$url,$ext,$type)=split(/\:/,$item); if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) { $nocopy=1; last; @@ -1889,7 +1899,6 @@ END } my $orig_url = $url; - $orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}); if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) { my $symb=&Apache::lonnet::symbclean( @@ -1952,7 +1961,7 @@ END my $ro_set= ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':''); $rand_order_text =' -<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'; +<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>'; } if ($ispage) { my $pagename=&escape($pagetitle); @@ -1990,9 +1999,9 @@ END 'hd' => 'Hidden', 'ec' => 'URL hidden'); my $enctext= - ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':''); + ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':''); my $hidtext= - ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':''); + ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); $line.=(<<ENDPARMS); <td class="LC_docs_entry_parameter"> $form_start @@ -2012,7 +2021,13 @@ ENDPARMS return $line; } -# ---------------------------------------------------------------- tie the hash +=pod + +=item tiehash() + +tie the hash + +=cut sub tiehash { my ($mode)=@_; @@ -2038,7 +2053,8 @@ sub untiehash { return OK; } -# --------------------------------------------------------------- check on this + + sub checkonthis { my ($r,$url,$level,$title)=@_; @@ -2091,9 +2107,9 @@ sub checkonthis { } my $dependencies= &Apache::lonnet::metadata($url,'dependencies'); - foreach (split(/\,/,$dependencies)) { - if (($_=~/^\/res\//) && (!$alreadyseen{$_})) { - &checkonthis($r,$_,$level+1); + foreach my $dep (split(/\,/,$dependencies)) { + if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) { + &checkonthis($r,$dep,$level+1); } } } elsif ($result eq 'unavailable') { @@ -2112,9 +2128,15 @@ sub checkonthis { } -# -# ----------------------------------------------------------------- List Symbs -# + +=pod + +=item list_symbs() + +List Symbs + +=cut + sub list_symbs { my ($r) = @_; @@ -2139,9 +2161,6 @@ sub list_symbs { } -# -# -------------------------------------------------------------- Verify Content -# sub verifycontent { my ($r) = @_; my $type = &Apache::loncommon::course_type(); @@ -2153,17 +2172,17 @@ sub verifycontent { undef %alreadyseen; %alreadyseen=(); &tiehash(); - foreach (keys %hash) { - if ($hash{$_}=~/\.(page|sequence)$/) { - if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) { + foreach my $key (keys(%hash)) { + if ($hash{$key}=~/\.(page|sequence)$/) { + if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) { $r->print('<hr /><span class="LC_error">'. &mt('The following sequence or page is included more than once in your '.$type.': '). - &unescape($hash{$_}).'</span><br />'. + &unescape($hash{$key}).'</span><br />'. &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />')); } } - if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) { - &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); + if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) { + &checkonthis($r,$hash{$key},0,$hash{'title_'.$1}); } } &untiehash(); @@ -2172,8 +2191,6 @@ sub verifycontent { } -# -------------------------------------------------------------- Check Versions - sub devalidateversioncache { my $src=shift; &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'. @@ -2203,16 +2220,16 @@ sub checkversions { my %newsetversions=(); if ($env{'form.setmostrecent'}) { $haschanged=1; - foreach (keys %hash) { - if ($_=~/^ids\_(\/res\/.+)$/) { + foreach my $key (keys(%hash)) { + if ($key=~/^ids\_(\/res\/.+)$/) { $newsetversions{$1}='mostrecent'; &devalidateversioncache($1); } } } elsif ($env{'form.setcurrent'}) { $haschanged=1; - foreach (keys %hash) { - if ($_=~/^ids\_(\/res\/.+)$/) { + foreach my $key (keys(%hash)) { + if ($key=~/^ids\_(\/res\/.+)$/) { my $getvers=&Apache::lonnet::getversion($1); if ($getvers>0) { $newsetversions{$1}=$getvers; @@ -2222,11 +2239,11 @@ sub checkversions { } } elsif ($env{'form.setversions'}) { $haschanged=1; - foreach (keys %env) { - if ($_=~/^form\.set_version_(.+)$/) { + foreach my $key (keys(%env)) { + if ($key=~/^form\.set_version_(.+)$/) { my $src=$1; - if (($env{$_}) && ($env{$_} ne $setversions{$src})) { - $newsetversions{$src}=$env{$_}; + if (($env{$key}) && ($env{$key} ne $setversions{$src})) { + $newsetversions{$src}=$env{$key}; &devalidateversioncache($src); } } @@ -2247,8 +2264,8 @@ sub checkversions { # show all documents $header=&mt('All Documents in '.$type); $allsel=1; - foreach (keys %hash) { - if ($_=~/^ids\_(\/res\/.+)$/) { + foreach my $key (keys(%hash)) { + if ($key=~/^ids\_(\/res\/.+)$/) { my $src=$1; $changes{$src}=1; } @@ -2258,7 +2275,7 @@ sub checkversions { %changes=&Apache::lonnet::dump ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); - my $firstkey=(keys %changes)[0]; + my $firstkey=(keys(%changes))[0]; unless ($firstkey=~/^error\:/) { unless ($env{'form.timerange'}) { $env{'form.timerange'}=604800; @@ -2322,14 +2339,14 @@ sub checkversions { <input type="submit" name="setversions" value="$lt{'sv'}" /> <table border="0"> ENDHEADERS - foreach (sort keys %changes) { - if ($changes{$_}>$starttime) { - my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); - my $currentversion=&Apache::lonnet::getversion($_); + foreach my $key (sort(keys(%changes))) { + if ($changes{$key}>$starttime) { + my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($key); if ($currentversion<0) { $currentversion=&mt('Could not be determined.'); } - my $linkurl=&Apache::lonnet::clutter($_); + my $linkurl=&Apache::lonnet::clutter($key); $r->print( '<tr><td colspan="5"><br /><br /><font size="+1"><b>'. &Apache::lonnet::gettitle($linkurl). @@ -2476,7 +2493,6 @@ sub changewarning { $help{'Caching'}.'</span></h3></form>'."\n\n"); } -# =========================================== Breadcrumbs for special functions sub init_breadcrumbs { my ($form,$text)=@_; @@ -2492,7 +2508,9 @@ sub init_breadcrumbs { bug=>'Instructor Interface'}); } -# ================================================================ Main Handler + + + sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); @@ -2500,14 +2518,15 @@ sub handler { return OK if $r->header_only; my $type = &Apache::loncommon::course_type(); + # --------------------------------------------- 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','Adding_Pages', - 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive', - 'Check_Resource_Versions','Verify_Content') { - $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); + foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', + 'Adding_External_Resource','Navigate_Content', + 'Adding_Folders','Docs_Overview', 'Load_Map', + 'Supplemental','Score_Upload_Form','Adding_Pages', + 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive', + 'Check_Resource_Versions','Verify_Content') { + $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); } # Composite help files $help{'Syllabus'} = &Apache::loncommon::help_open_topic( @@ -2553,6 +2572,8 @@ sub handler { my $showdoc=0; my $containertag; my $uploadtag; + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folderpath','pagepath', 'pagesymb']); @@ -2626,8 +2647,10 @@ sub handler { } # -------------------------------------------------------------------- Body tag $script = '<script type="text/javascript">'."\n".$script."\n".'</script>'; + my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}]; $r->print(&Apache::loncommon::start_page("$type Documents", $script, - {'force_register' => $showdoc,}). + {'force_register' => $showdoc, + 'bread_crumbs' => $brcrum}). &Apache::loncommon::help_open_menu('','',273,'RAT')); my %allfiles = (); @@ -2666,12 +2689,12 @@ sub handler { } my @attributes = (); if ($env{'form.embedded_attrib_'.$i} =~ /:/) { - @attributes = split/:/,$env{'form.embedded_attrib_'.$i}; + @attributes = split(/:/,$env{'form.embedded_attrib_'.$i}); } else { @attributes = ($env{'form.embedded_attrib_'.$i}); } - foreach (@attributes) { - push(@{$attribs{$i}},&unescape($_)); + foreach my $attr (@attributes) { + push(@{$attribs{$i}},&unescape($attr)); } if ($javacodebase) { $codebase{$i} = $javacodebase; @@ -2689,7 +2712,7 @@ sub handler { my $updateflag = 0; my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode); if ($getstatus eq 'ok') { - foreach my $item (keys %newname) { + foreach my $item (keys(%newname)) { if ($newname{$item} ne $origname{$item}) { my $attrib_regexp = ''; if (@{$attribs{$item}} > 1) { @@ -2723,9 +2746,8 @@ sub handler { 'uplm' => 'Upload a new main '.lc($type).' document', 'upls' => 'Upload a new supplemental '.lc($type).' document', 'impp' => 'Import a document', - 'pubd' => 'Published documents', + 'pubd' => 'Published Documents', 'copm' => 'All documents out of a published map into this folder', - 'spec' => 'Special documents', 'upld' => 'Upload Document', 'srch' => 'Search', 'impo' => 'Import', @@ -2742,7 +2764,7 @@ sub handler { 'sipr' => 'Simple Problem', 'drbx' => 'Drop Box', 'scuf' => 'Score Upload Form', - 'bull' => 'Bulletin Board', + 'bull' => 'Discussion Board', 'mypi' => 'My Personal Info', 'grpo' => 'Group Files', 'rost' => 'Course Roster', @@ -2751,13 +2773,86 @@ sub handler { 'file' => 'File', 'title' => 'Title', 'comment' => 'Comment', - 'parse' => 'If HTML file, upload embedded images/multimedia files' + 'parse' => 'Upload embedded images/multimedia files if HTML file!', + 'nd' => 'New Document', + 'pm' => 'Published Map', + 'sd' => 'Special Document', + 'mo' => 'More Options', + 'hao' => 'Hide all Options' ); # ----------------------------------------------------------------------------- + my $fileupload=(<<FIUP); + $lt{'file'}:<br /> + <input type="file" name="uploaddoc" size="40" /> +FIUP + + my $checkbox=(<<CHBO); + <!-- <label>$lt{'parse'}? + <input type="checkbox" name="parserflag" /> + </label> --> + <label> + <input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'} + </label> +CHBO + + my $fileuploadform=(<<FUFORM); + <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> + $fileupload + <br /> + $lt{'title'}:<br /> + <input type="text" size="50" name="comment" /> + $uploadtag + <input type="hidden" name="cmd" value="upload_default" /> + <br /> + <span class="LC_nobreak"> + $checkbox + </span> + <br /> + <br /> + <span class="LC_nobreak"> + <input type="submit" value="$lt{'upld'}" /> + $help{'Uploading_From_Harddrive'} + </span> + </form> +FUFORM + + my $simpleeditdefaultform=(<<SEDFFORM); + <form action="/adm/coursedocs" method="post" name="simpleeditdefault"> + $lt{'pubd'}<br /> + $uploadtag + <input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" /> + <br /> + <span class="LC_nobreak"> + <input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" /> + $help{'Importing_LON-CAPA_Resource'} + </span> + <br /> + <input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" /> + <hr /> + <p> + $lt{'copm'}<br /> + <input type="text" size="40" name="importmap" /><br /> + <span class="LC_nobreak"><input type="button" + onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" + value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" /> + $help{'Load_Map'}</span> + </p> + </form> +SEDFFORM + + my $extresourcesform=(<<ERFORM); + <form action="/adm/coursedocs" method="post" name="newext"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newext" type="button" onClick="javascript:makenewext('newext');" + value="$lt{'extr'}" /> $help{'Adding_External_Resource'} + </span> + </form> +ERFORM + if ($allowed) { &update_paste_buffer($coursenum,$coursedom); - my $dumpbut=&dumpbutton(); - my $exportbut=&exportbutton(); my %lt=&Apache::lonlocal::texthash( 'vc' => 'Verify Content', 'cv' => 'Check/Set Resource Versions', @@ -2777,51 +2872,49 @@ sub handler { $containertag = '<input type="hidden" name="folderpath" value="" />'; $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />'; } - - $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="markcopy" /> - <input type="hidden" name="copyfolder" /> - $containertag -</form> -<form name="simpleedit" method="post" action="/adm/coursedocs"> - <input type="hidden" name="importdetail" value="" /> - $uploadtag -</form> -<form action="/adm/coursedocs" method="post" name="courseverify"> - <div class="LC_docs_course_commands"> - - <div> - <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'} - </div> - <div> - <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'} - </div> - $dumpbut - $exportbut - <div> - <input type="submit" name="listsymbs" value="$lt{'ls'}" /> - </div> - <div> - <input type="hidden" name="folder" value="$env{'form.folder'}" /> - <input type="submit" name="docslog" value="$lt{'sl'}" /> - </div> - </div> -</form> -<div style="clear: both; height: 0px;"> </div> -ENDCOURSEVERIFY - $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', - &mt('Editing the Table of Contents for your '.$type))); + $r->print(<<HIDDENFORM); + <form name="renameform" method="post" action="/adm/coursedocs"> + <input type="hidden" name="title" /> + <input type="hidden" name="cmd" /> + <input type="hidden" name="markcopy" /> + <input type="hidden" name="copyfolder" /> + $containertag + </form> + <form name="simpleedit" method="post" action="/adm/coursedocs"> + <input type="hidden" name="importdetail" value="" /> + $uploadtag + </form> +HIDDENFORM + } +# --------------------------------------------------------- Main tab structure + my $activeClass = 1; + $r->print('<div class="LC_ContentBoxSpecial"><ul class="LC_TabContentBigger" id="mainnav">'); + if (($standard) && ($allowed) && (!$forcesupplement)) { + my $active = ''; + if($activeClass == 1){ + $active = 'class="active"'; + $activeClass = 0; + } + $r->print('<li '.$active.'onclick="javascript:showPage(this,\'Main Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>'); + } + if (!$forcestandard) { + my $active = ''; + if($activeClass == 1){ + $active = 'class="active"'; + } + $r->print('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>'); } + $r->print('<li onclick="javascript:showPage(this,\'Special Admin Options\',\'mainnav\',\'maincoursedoc\');">'.&mt('Special Admin Options').'</li>'); + $r->print('</ul><div id="maincoursedoc" style="margin:0 0;padding:0 0;">'); # --------------------------------------------------------- Standard documents - $r->print('<table class="LC_docs_documents">'); - if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print('<tr><td class="LC_docs_document">'); -# '<h2>'.&mt('Main Course Documents'). -# ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>'); + my $active = 'style="display: none;"'; + if($activeClass == 0){ + $active = 'style="display: block;"'; + } + $r->print('<div class="LC_ContentBox" id="Main Course Documents" '.$active.'>'); + $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', + &mt('Editing the Table of Contents for your '.$type))); my $folder=$env{'form.folder'}; if ($folder eq '' || $folder eq 'supplemental') { $folder='default'; @@ -2836,13 +2929,8 @@ ENDCOURSEVERIFY #$postexec='self.close();'; } $hadchanges=0; - my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed, - $upload_output,$type); - if ($error) { - $r->print('<p><span class="LC_error">'.$error.'</span></p>'); - } if ($hadchanges) { - &mark_hash_old() + &mark_hash_old(); } &changewarning($r,$postexec); my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. @@ -2854,230 +2942,230 @@ ENDCOURSEVERIFY $container='page'; } my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container; - $r->print(<<ENDFORM); -<table class="LC_docs_adddocs"> -<tr> -<th>$lt{'uplm'}</th> -<th>$lt{'impp'}</th> -<th>$lt{'spec'}</th> -</tr> -<tr> -<td> -$lt{'file'}:<br /> -<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> -<input type="file" name="uploaddoc" size="40" /> -<br /> -$lt{'title'}:<br /> -<input type="text" size="50" name="comment" /> -$uploadtag -<input type="hidden" name="cmd" value="upload_default" /> -<br /> -<span class="LC_nobreak"> -<label>$lt{'parse'}? -<input type="checkbox" name="parserflag" checked="checked" /> -</label> -</span> -<br /> -<br /> -<span class="LC_nobreak"> -<input type="submit" value="$lt{'upld'}" /> - $help{'Uploading_From_Harddrive'} -</span> -</form> -</td> -<td> -<form action="/adm/coursedocs" method="post" name="simpleeditdefault"> -$lt{'pubd'}<br /> -$uploadtag -<input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" /> -<br /> -<span class="LC_nobreak"> -<input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" /> -$help{'Importing_LON-CAPA_Resource'} -</span> -<br /> -<input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" /> -<hr /> -<p> -$lt{'copm'}<br /> -<input type="text" size="40" name="importmap" /><br /> -<span class="LC_nobreak"><input type="button" -onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" -value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" /> -$help{'Load_Map'}</span> -</p> -</form> -<hr /> -<form action="/adm/groupsort" method="post" name="recover"> -<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" /> -</form> -ENDFORM - unless ($env{'form.pagepath'}) { - $r->print(<<ENDFORM); -<hr /> -<form action="/adm/coursedocs" method="post" name="newext"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newext" type="button" onClick="javascript:makenewext('newext');" -value="$lt{'extr'}" /> $help{'Adding_External_Resource'} -</span> -</form> -<br /><form action="/adm/imsimportdocs" method="post" name="ims"> -<input type="hidden" name="folder" value="$folder" /> -<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" /> -</form> -ENDFORM - } - $r->print('</td><td>'); + + + + my $recoverform=(<<RFORM); + <form action="/adm/groupsort" method="post" name="recover"> + <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" /> + </form> +RFORM + + my $imspform=(<<IMSPFORM); + <form action="/adm/imsimportdocs" method="post" name="ims"> + <input type="hidden" name="folder" value="$folder" /> + <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" /> + </form> +IMSPFORM + + my $newnavform=(<<NNFORM); + <form action="/adm/coursedocs" method="post" name="newnav"> + $uploadtag + <input type="hidden" name="importdetail" + value="$lt{'navc'}=/adm/navmaps" /> + <span class="LC_nobreak"> + <input name="newnav" type="submit" value="$lt{'navc'}" /> + $help{'Navigate_Content'} + </span> + </form> +NNFORM + my $newsmppageform=(<<NSPFORM); + <form action="/adm/coursedocs" method="post" name="newsmppg"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newsmppg" type="button" value="$lt{'sipa'}" + onClick="javascript:makesmppage();" /> $help{'Simple Page'} + </span> + </form> +NSPFORM + + my $newsmpproblemform=(<<NSPROBFORM); + <form action="/adm/coursedocs" method="post" name="newsmpproblem"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newsmpproblem" type="button" value="$lt{'sipr'}" + onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} + </span> + </form> + +NSPROBFORM + + my $newdropboxform=(<<NDBFORM); + <form action="/adm/coursedocs" method="post" name="newdropbox"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newdropbox" type="button" value="$lt{'drbx'}" + onClick="javascript:makedropbox();" /> + </span> + </form> +NDBFORM + + my $newexuploadform=(<<NEXUFORM); + <form action="/adm/coursedocs" method="post" name="newexamupload"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newexamupload" type="button" value="$lt{'scuf'}" + onClick="javascript:makeexamupload();" /> + $help{'Score_Upload_Form'} + </span> + </form> +NEXUFORM + + my $newbulform=(<<NBFORM); + <form action="/adm/coursedocs" method="post" name="newbul"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newbulletin" type="button" value="$lt{'bull'}" + onClick="javascript:makebulboard();" /> + $help{'Bulletin Board'} + </span> + </form> +NBFORM + + my $newaboutmeform=(<<NAMFORM); + <form action="/adm/coursedocs" method="post" name="newaboutme"> + $uploadtag + <input type="hidden" name="importdetail" + value="$plainname=/adm/$udom/$uname/aboutme" /> + <span class="LC_nobreak"> + <input name="newaboutme" type="submit" value="$lt{'mypi'}" /> + $help{'My Personal Info'} + </span> + </form> +NAMFORM + + my $newaboutsomeoneform=(<<NASOFORM); + <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> + $uploadtag + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newaboutsomeone" type="button" value="$lt{'abou'}" + onClick="javascript:makeabout();" /> + </span> + </form> +NASOFORM + + + my $newrosterform=(<<NROSTFORM); + <form action="/adm/coursedocs" method="post" name="newroster"> + $uploadtag + <input type="hidden" name="importdetail" + value="$lt{'rost'}=/adm/viewclasslist" /> + <span class="LC_nobreak"> + <input name="newroster" type="submit" value="$lt{'rost'}" /> + $help{'Course Roster'} + </span> + </form> +NROSTFORM + unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); - $r->print(<<ENDFORM); -<br /><form action="/adm/coursedocs" method="post" name="newfolder"> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newfolder" type="button" -onClick="javascript:makenewfolder(this.form,'$folderseq');" -value="$lt{'newf'}" />$help{'Adding_Folders'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newpage"> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newpage" type="button" -onClick="javascript:makenewpage(this.form,'$pageseq');" -value="$lt{'newp'}" />$help{'Adding_Pages'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newsyl"> -$uploadtag -<input type="hidden" name="importdetail" -value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> -<span class="LC_nobreak"> -<input name="newsyl" type="submit" value="$lt{'syll'}" /> - $help{'Syllabus'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newnav"> -$uploadtag -<input type="hidden" name="importdetail" -value="$lt{'navc'}=/adm/navmaps" /> -<span class="LC_nobreak"> -<input name="newnav" type="submit" value="$lt{'navc'}" /> -$help{'Navigate_Content'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newsmppg"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newsmppg" type="button" value="$lt{'sipa'}" -onClick="javascript:makesmppage();" /> $help{'Simple Page'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newsmpproblem"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newsmpproblem" type="button" value="$lt{'sipr'}" -onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newdropbox"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newdropbox" type="button" value="$lt{'drbx'}" -onClick="javascript:makedropbox();" /> -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newexamupload"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newexamupload" type="button" value="$lt{'scuf'}" -onClick="javascript:makeexamupload();" /> -$help{'Score_Upload_Form'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newbul"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newbulletin" type="button" value="$lt{'bull'}" -onClick="javascript:makebulboard();" /> -$help{'Bulletin Board'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newaboutme"> -$uploadtag -<input type="hidden" name="importdetail" -value="$plainname=/adm/$udom/$uname/aboutme" /> -<span class="LC_nobreak"> -<input name="newaboutme" type="submit" value="$lt{'mypi'}" /> -$help{'My Personal Info'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newaboutsomeone" type="button" value="$lt{'abou'}" -onClick="javascript:makeabout();" /> -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newgroupfiles"> -$uploadtag -<input type="hidden" name="importdetail" -value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> -<span class="LC_nobreak"> -<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" /> -$help{'Group Files'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newroster"> -$uploadtag -<input type="hidden" name="importdetail" -value="$lt{'rost'}=/adm/viewclasslist" /> -<span class="LC_nobreak"> -<input name="newroster" type="submit" value="$lt{'rost'}" /> -$help{'Course Roster'} -</span> -</form> -ENDFORM + + my $newpageform=(<<NPFORM); + <form action="/adm/coursedocs" method="post" name="newpage"> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newpage" type="button" + onClick="javascript:makenewpage(this.form,'$pageseq');" + value="$lt{'newp'}" />$help{'Adding_Pages'} + </span> + </form> +NPFORM + + my $newfolderform=(<<NFFORM); + <form action="/adm/coursedocs" method="post" name="newfolder"> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newfolder" type="button" + onClick="javascript:makenewfolder(this.form,'$folderseq');" + value="$lt{'newf'}" />$help{'Adding_Folders'} + </span> + </form> +NFFORM + + my $newsylform=(<<NSYLFORM); + <form action="/adm/coursedocs" method="post" name="newsyl"> + $uploadtag + <input type="hidden" name="importdetail" + value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> + <span class="LC_nobreak"> + <input name="newsyl" type="submit" value="$lt{'syll'}" /> + $help{'Syllabus'} + </span> + </form> +NSYLFORM + + my $newgroupfileform=(<<NGFFORM); + <form action="/adm/coursedocs" method="post" name="newgroupfiles"> + $uploadtag + <input type="hidden" name="importdetail" + value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> + <span class="LC_nobreak"> + <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" /> + $help{'Group Files'} + </span> + </form> +NGFFORM + + + my $specialdocumentsform=(<<SPDOFORM); + <br />$newfolderform + <br />$newpageform + <br />$newsylform + <br />$newnavform + <br />$newsmppageform + <br />$newsmpproblemform + <br />$newdropboxform + <br />$newexuploadform + <br />$newbulform + <br />$newaboutmeform + <br />$newaboutsomeoneform + <br />$newgroupfileform + <br />$newrosterform +SPDOFORM + + +my %orderhash = ( + 'aa' => 'New Document', + 'bb' => 'Published Documents', + 'cc' => 'Special Documents', + 'dd' => 'More Options', + 'zz' => 'Hide all Options', + ); +my %namehash = ( + 'New Document' => $fileuploadform, + 'Published Documents' => $simpleeditdefaultform, + 'Special Documents' => $specialdocumentsform, + 'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform, + ); +my $tid='1'; +my $content='content'; +my $navigation='navigation'; +my $varcd = 'Main Course Documents'; +$r->print(&generate_edit_table($tid,$content,$navigation,$varcd,\%namehash,\%orderhash)); +my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); + if ($error) { + $r->print('<p><span class="LC_error">'.$error.'</span></p>'); } +$r->print('</div>'); + } if ($env{'form.pagepath'}) { - $r->print(<<ENDBLOCK); -<form action="/adm/coursedocs" method="post" name="newsmpproblem"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newsmpproblem" type="button" value="$lt{'sipr'}" -onClick="javascript:makesmpproblem();" />$help{'Simple Problem'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="newexamupload"> -$uploadtag -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newexamupload" type="button" value="$lt{'scuf'}" -onClick="javascript:makeexamupload();" /> -$help{'Score_Upload_Form'} -</span> -</form> -ENDBLOCK } - $r->print('</td></tr>'."\n". -'</table>'); - $r->print('</td></tr>'); } # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { - $r->print('<tr><td class="LC_docs_document">'); -# '<h2>'.&mt('Supplemental Course Documents'). -# ($allowed?' '.$help{'Supplemental'}:'').'</h2>'); + my $active = 'style="display: none;"'; + if($activeClass == 1){ + $active = 'style="display: block;"'; + } + $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>'); my $folder=$env{'form.folder'}; unless ($folder=~/^supplemental/) { $folder='supplemental'; @@ -3087,87 +3175,114 @@ ENDBLOCK $env{'form.folderpath'} = 'supplemental&'. &escape(&mt('Supplemental '.$type.' Documents')); } - my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); - if ($error) { - $r->print('<p><span class="LC_error">'.$error.'</span></p>'); - } if ($allowed) { my $folderseq= '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. '.sequence'; my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); - $r->print(<<ENDSUPFORM); -<table class="LC_docs_adddocs"><tr> -<th>$lt{'upls'}</th> -<th>$lt{'spec'}</th> -</tr> -<tr><td> -<form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> -<input type="file" name="uploaddoc" size="40" /> -<br /> -<br /> -<span class="LC_nobreak"> -<label>$lt{'parse'}? -<input type="checkbox" name="parserflag" /> -</label> -</span> -<br /><br /> -$lt{'comment'}:<br /> -<textarea cols="50" rows="4" name="comment"> -</textarea> -<br /> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="cmd" value="upload_supplemental" /> -<span class="LC_nobreak"> -<input type="submit" value="$lt{'upld'}" /> - $help{'Uploading_From_Harddrive'} -</span> -</form> -</td> -<td> -<form action="/adm/coursedocs" method="post" name="supnewfolder"> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newfolder" type="button" -onClick="javascript:makenewfolder(this.form,'$folderseq');" -value="$lt{'newf'}" /> $help{'Adding_Folders'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="supnewext"> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="importdetail" value="" /> -<span class="LC_nobreak"> -<input name="newext" type="button" -onClick="javascript:makenewext('supnewext');" -value="$lt{'extr'}" /> $help{'Adding_External_Resource'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="supnewsyl"> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="importdetail" -value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> -<span class="LC_nobreak"> -<input name="newsyl" type="submit" value="$lt{'syll'}" /> -$help{'Syllabus'} -</span> -</form> -<br /><form action="/adm/coursedocs" method="post" name="subnewaboutme"> -<input type="hidden" name="folderpath" value="$path" /> -<input type="hidden" name="importdetail" -value="$plainname=/adm/$udom/$uname/aboutme" /> -<span class="LC_nobreak"> -<input name="newaboutme" type="submit" value="$lt{'mypi'}" /> -$help{'My Personal Info'} -</span> -</form> -</td></tr> -</table></td></tr> -ENDSUPFORM + + my $supupdocform=(<<SUPDOCFORM); + <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> + $fileupload + <br /> + <br /> + <span class="LC_nobreak"> + $checkbox + </span> + <br /><br /> + $lt{'comment'}:<br /> + <textarea cols=50 rows=4 name='comment'> + </textarea> + <br /> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="cmd" value="upload_supplemental" /> + <span class="LC_nobreak"> + <input type="submit" value="$lt{'upld'}" /> + $help{'Uploading_From_Harddrive'} + </span> + </form> +SUPDOCFORM + + my $supnewfolderform=(<<SNFFORM); + <form action="/adm/coursedocs" method="post" name="supnewfolder"> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newfolder" type="button" + onClick="javascript:makenewfolder(this.form,'$folderseq');" + value="$lt{'newf'}" /> $help{'Adding_Folders'} + </span> + </form> +SNFFORM + + + my $supnewextform=(<<SNEFORM); + <form action="/adm/coursedocs" method="post" name="supnewext"> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="importdetail" value="" /> + <span class="LC_nobreak"> + <input name="newext" type="button" + onClick="javascript:makenewext('supnewext');" + value="$lt{'extr'}" /> $help{'Adding_External_Resource'} + </span> + </form> +SNEFORM + + my $supnewsylform=(<<SNSFORM); + <form action="/adm/coursedocs" method="post" name="supnewsyl"> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="importdetail" + value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> + <span class="LC_nobreak"> + <input name="newsyl" type="submit" value="$lt{'syll'}" /> + $help{'Syllabus'} + </span> + </form> +SNSFORM + + my $supnewaboutmeform=(<<SNAMFORM); + <form action="/adm/coursedocs" method="post" name="subnewaboutme"> + <input type="hidden" name="folderpath" value="$path" /> + <input type="hidden" name="importdetail" + value="$plainname=/adm/$udom/$uname/aboutme" /> + <span class="LC_nobreak"> + <input name="newaboutme" type="submit" value="$lt{'mypi'}" /> + $help{'My Personal Info'} + </span> + </form> +SNAMFORM + + + +my %suporderhash = ( + 'ee' => 'New Document', + 'ff' => 'Special Documents', + 'zz' => 'Hide all Options', + ); + +my %supnamehash = ( + 'New Document' => $supupdocform, + 'Special Documents' => $supnewfolderform.'<br />'.$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform, + ); + +my $tid='2'; +my $content='content'; +my $navigation='navigation'; +my $varscd = 'Supplemental Course Documents'; + +$r->print(&generate_edit_table($tid,$content,$navigation,$varscd,\%supnamehash,\%suporderhash)); +my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); + if ($error) { + $r->print('<p><span class="LC_error">'.$error.'</span></p>'); } - } - $r->print('</table>'); +$r->print('</div>'); + } + } +$r->print('<div class="LC_ContentBox" id="Special Admin Options" style="display: none;">'); +$r->print(&generate_admin_options($containertag,$uploadtag,\%help,\%env)); +$r->print('</div>'); +$r->print('</div>'); if ($allowed) { $r->print(' <form method="post" name="extimport" action="/adm/coursedocs"> @@ -3191,6 +3306,73 @@ ENDSUPFORM return OK; } +sub generate_admin_options { + my ($containertag,$uploadtag,$help_ref,$env_ref) = @_; + my %lt=&Apache::lonlocal::texthash( + 'vc' => 'Verify Content', + 'cv' => 'Check/Set Resource Versions', + 'ls' => 'List Symbs', + 'sl' => 'Show Log' + ); + my %help = %{$help_ref}; + my %env = %{$env_ref}; + my $dumpbut=&dumpbutton(); + my $exportbut=&exportbutton(); + return (<<ENDOPTIONFORM); + <form action="/adm/coursedocs" method="post" name="courseverify"> + <ul style="list-style-type:none"> + <li> + <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'} + </li> + <li> + <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'} + </li> + <li> + $dumpbut + </li> + <li> + $exportbut + </li> + <li> + <input type="submit" name="listsymbs" value="$lt{'ls'}" /> + </li> + <li> + <input type="hidden" name="folder" value="$env{'form.folder'}" /> + <input type="submit" name="docslog" value="$lt{'sl'}" /> + </li> + </ul> + </form> +<!-- <div style="clear: both; height: 0px;"> </div>--> +ENDOPTIONFORM + +} + + +sub generate_edit_table { + my ($tid,$content,$navigation,$varcd,$namehash_ref,$orderhash_ref) = @_; + my %namehash = %{$namehash_ref}; #name verlinkt mit id + my %orderhash = %{$orderhash_ref}; #name mit kürzel verlinkt mit name + my $form; + + + + $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>'; + $form .= '<ul id="'.$navigation.$tid.'" class="LC_TabContent">'; + foreach my $name (sort(keys(%orderhash))){ + if($name eq 'zz'){ + $form .= '<li onclick="javascript:hideAll(this, \''.$navigation.$tid.'\' ,\''.$content.$tid.'\');" class="active">'.&mt($orderhash{$name}).'</li>'; + }else{ + $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>'; + } + } + $form .= '<div id="'.$content.$tid.'" style="padding: 0 0; margin: 0 0;">'; + foreach my $field (keys(%namehash)){ + $form .= '<div id="'.$tid.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>'; + } + $form .= '</div></div>'; + + return $form; +} sub editing_js { my ($udom,$uname) = @_; @@ -3204,7 +3386,7 @@ sub editing_js { p_msp => 'Title for the Page', p_msb => 'Title for the Problem', p_mdb => 'Title for the Drop Box', - p_mbb => 'Title for the Bulletin Board', + p_mbb => 'Title for the Discussion Board', p_mab => "Enter user:domain for User's 'About Me' Page", p_mab2 => "About [_99]", p_mab_alrt1 => 'Not a valid user:domain', @@ -3306,94 +3488,246 @@ function makeabout() { if ((comp[0]) && (comp[1])) { this.document.forms.newaboutsomeone.importdetail.value= '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; - this.document.forms.newaboutsomeone.submit(); - } else { - alert("$lt{'p_mab_alrt1'}"); - } - } else { - alert("$lt{'p_mab_alrt2'}"); - } + this.document.forms.newaboutsomeone.submit(); + } else { + alert("$lt{'p_mab_alrt1'}"); } +} else { + alert("$lt{'p_mab_alrt2'}"); +} +} } function makeims() { - var caller = document.forms.ims.folder.value; - var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"; - newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes"); - newWindow.location.href = newlocation; +var caller = document.forms.ims.folder.value; +var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"; +newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes"); +newWindow.location.href = newlocation; } function finishpick() { - var title=this.document.forms.extimport.title.value; - var url=this.document.forms.extimport.url.value; - var form=this.document.forms.extimport.useform.value; - var residx=this.document.forms.extimport.residx.value; - eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();'); +var title=this.document.forms.extimport.title.value; +var url=this.document.forms.extimport.url.value; +var form=this.document.forms.extimport.useform.value; +var residx=this.document.forms.extimport.residx.value; +eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();'); } function changename(folderpath,index,oldtitle,container,pagesymb) { - var title=prompt('$lt{"p_chn"}',oldtitle); - if (title) { - this.document.forms.renameform.markcopy.value=-1; - this.document.forms.renameform.title.value=title; - this.document.forms.renameform.cmd.value='rename_'+index; - if (container == 'sequence') { - this.document.forms.renameform.folderpath.value=folderpath; - } - if (container == 'page') { - this.document.forms.renameform.pagepath.value=folderpath; - this.document.forms.renameform.pagesymb.value=pagesymb; - } - this.document.forms.renameform.submit(); - } +var title=prompt('$lt{"p_chn"}',oldtitle); +if (title) { +this.document.forms.renameform.markcopy.value=-1; +this.document.forms.renameform.title.value=title; +this.document.forms.renameform.cmd.value='rename_'+index; +if (container == 'sequence') { + this.document.forms.renameform.folderpath.value=folderpath; +} +if (container == 'page') { + this.document.forms.renameform.pagepath.value=folderpath; + this.document.forms.renameform.pagesymb.value=pagesymb; +} +this.document.forms.renameform.submit(); +} } function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) { - if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { - this.document.forms.renameform.markcopy.value=-1; - this.document.forms.renameform.cmd.value='del_'+index; - if (container == 'sequence') { - this.document.forms.renameform.folderpath.value=folderpath; - } - if (container == 'page') { - this.document.forms.renameform.pagepath.value=folderpath; - this.document.forms.renameform.pagesymb.value=pagesymb; - } - this.document.forms.renameform.submit(); - } +if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { +this.document.forms.renameform.markcopy.value=-1; +this.document.forms.renameform.cmd.value='del_'+index; +if (container == 'sequence') { + this.document.forms.renameform.folderpath.value=folderpath; +} +if (container == 'page') { + this.document.forms.renameform.pagepath.value=folderpath; + this.document.forms.renameform.pagesymb.value=pagesymb; +} +this.document.forms.renameform.submit(); +} } function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) { - if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { - this.document.forms.renameform.cmd.value='cut_'+index; - this.document.forms.renameform.markcopy.value=index; - this.document.forms.renameform.copyfolder.value=folder+'.'+container; - if (container == 'sequence') { - this.document.forms.renameform.folderpath.value=folderpath; - } - if (container == 'page') { - this.document.forms.renameform.pagepath.value=folderpath; - this.document.forms.renameform.pagesymb.value=pagesymb; - } - this.document.forms.renameform.submit(); - } +if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { +this.document.forms.renameform.cmd.value='cut_'+index; +this.document.forms.renameform.markcopy.value=index; +this.document.forms.renameform.copyfolder.value=folder+'.'+container; +if (container == 'sequence') { + this.document.forms.renameform.folderpath.value=folderpath; +} +if (container == 'page') { + this.document.forms.renameform.pagepath.value=folderpath; + this.document.forms.renameform.pagesymb.value=pagesymb; +} +this.document.forms.renameform.submit(); +} } function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) { - this.document.forms.renameform.markcopy.value=index; - this.document.forms.renameform.copyfolder.value=folder+'.'+container; - if (container == 'sequence') { - this.document.forms.renameform.folderpath.value=folderpath; - } - if (container == 'page') { - this.document.forms.renameform.pagepath.value=folderpath; - this.document.forms.renameform.pagesymb.value=pagesymb; - } - this.document.forms.renameform.submit(); +this.document.forms.renameform.markcopy.value=index; +this.document.forms.renameform.copyfolder.value=folder+'.'+container; +if (container == 'sequence') { +this.document.forms.renameform.folderpath.value=folderpath; +} +if (container == 'page') { +this.document.forms.renameform.pagepath.value=folderpath; +this.document.forms.renameform.pagesymb.value=pagesymb; +} +this.document.forms.renameform.submit(); +} + +function unselectInactive(nav) { +currentNav = document.getElementById(nav); +currentLis = currentNav.getElementsByTagName('LI'); +for (i = 0; i < currentLis.length; i++) { + currentLis[i].className = 'i'; +} +} + +function hideAll(current, nav, data) { +unselectInactive(nav); +current.className = 'active'; +currentData = document.getElementById(data); +currentDivs = currentData.getElementsByTagName('DIV'); +for (i = 0; i < currentDivs.length; i++) { + if(currentDivs[i].className == 'LC_ContentBox'){ + currentDivs[i].style.display = 'none'; + } +} +} + +function showPage(current, pageId, nav, data) { + hideAll(current, nav, data); + unselectInactive(nav); + current.className = 'active'; + currentData = document.getElementById(pageId); + currentData.style.display = 'block'; + return false; } ENDNEWSCRIPT } 1; __END__ + + +=head1 NAME + +Apache::londocs.pm + +=head1 SYNOPSIS + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 SUBROUTINES + +=over + +=item %help=() + +Available help topics + +=item mapread() + +Mapread read maps into LONCAPA::map:: global arrays +@order and @resources, determines status +sets @order - pointer to resources in right order +sets @resources - array with the resources with correct idx + +=item authorhosts() + +Return hash with valid author names + +=item dumpbutton() + +Generate "dump" button + +=item clean() + +=item dumpcourse() + + Actually dump course + + +=item exportbutton() + + Generate "export" button + +=item exportcourse() + +=item create_ims_store() + +=item build_package() + +=item get_dependencies() + +=item process_content() + +=item replicate_content() + +=item extract_media() + +=item store_template() + +=item group_import() + + Imports the given (name, url) resources into the course + coursenum, coursedom, and folder must precede the list + +=item breadcrumbs() + +=item log_docs() + +=item docs_change_log() + +=item update_paste_buffer() + +=item print_paste_buffer() + +=item do_paste_from_buffer() + +=item update_parameter() + +=item handle_edit_cmd() + +=item editor() + +=item process_file_upload() + +=item process_secondary_uploads() + +=item is_supplemental_title() + +=item parse_supplemental_title() + +=item entryline() + +=item tiehash() + +=item untiehash() + +=item checkonthis() + +check on this + +=item verifycontent() + +Verify Content + +=item devalidateversioncache() & checkversions() + +Check Versions + +=item mark_hash_old() + +=item is_hash_old() + +=item changewarning() + +=item init_breadcrumbs() + +Breadcrumbs for special functions + +=back + +=cut