--- loncom/interface/londocs.pm 2009/03/03 17:45:15 1.351 +++ loncom/interface/londocs.pm 2009/04/15 12:44:24 1.364 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.351 2009/03/03 17:45:15 ehlerst Exp $ +# $Id: londocs.pm,v 1.364 2009/04/15 12:44:24 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,7 +72,7 @@ sub storemap { &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); if ($errtext) { return ($errtext,2); } - + $hadchanges=1; return ($errtext,0); } @@ -121,7 +121,7 @@ sub dumpbutton { if ($home) { return '<input type="submit" name="dumpcourse" value="'. &mt('Dump '.$type.' DOCS to Construction Space').'" />'. - &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'); + &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />'; } else { return '<div>'. &mt('Dump '.$type. @@ -264,7 +264,7 @@ sub exportbutton { my $type = &Apache::loncommon::course_type(); return '<input type="submit" name="exportcourse" value="'. &mt('Export '.$type.' to IMS').'" />'. - &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs'); + &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />'; } @@ -427,7 +427,7 @@ function checkAll(field) { field.checked = true } } - + function uncheckAll(field) { if (field.length > 0) { for (i = 0; i < field.length; i++) { @@ -442,7 +442,7 @@ function propagateCheck(item) { if (document.exportdoc.elements[item].checked == true) { containerCheck(item) } -} +} function containerCheck(item) { document.exportdoc.elements[item].checked = true @@ -465,7 +465,7 @@ function containerCheck(item) { for (var j=0; j<parents[item].length; j++) { containerCheck(parents[item][j]) } - } + } } </script> @@ -474,7 +474,7 @@ function containerCheck(item) { $scripttag)); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package')); $r->print($display.'</table>'. - '<p><input type="hidden" name="finishexport" value="1">'. + '<p><input type="hidden" name="finishexport" value="1" />'. '<input type="submit" name="exportcourse" value="'. &mt('Export '.$type.' DOCS').'" /></p></form>'); } @@ -859,7 +859,7 @@ sub extract_media { $repstatus = 'ok'; } } elsif ($caller eq 'uploaded') { - + $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode); } if ($repstatus eq 'ok') { @@ -924,7 +924,7 @@ sub group_import { if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) && ($caller eq 'londocs') && (!&Apache::lonnet::stat_file($url))) { - + my $errtext = ''; my $fatal = 0; my $newmapstr = '<map>'."\n". @@ -1012,7 +1012,7 @@ sub breadcrumbs { } $plain=~s/\>\;\s*$//; return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', - 'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); + 'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); } sub log_docs { @@ -1176,7 +1176,7 @@ sub docs_change_log { if ($oldname ne '' && $oldname ne $newname) { $r->print(&LONCAPA::map::qtescape($newname)); } - } + } $r->print('<ul>'); for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) { if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) { @@ -1214,7 +1214,7 @@ sub update_paste_buffer { my ($errtext,$fatal) = &mapread($coursenum,$coursedom, $env{'form.copyfolder'}); - + return if ($fatal); # Mark for copying @@ -1402,7 +1402,7 @@ sub update_parameter { &remember_parms($idx,$which,'set',$value); } else { &LONCAPA::map::delparameter($idx,'parameter_'.$which); - + &remember_parms($idx,$which,'del'); } return 1; @@ -1470,11 +1470,11 @@ sub editor { $LONCAPA::map::order[0]=$idx; $LONCAPA::map::resources[$idx]=''; } - + my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)= &breadcrumbs($folder,$allowed,$type); $r->print($breadcrumbtrail); - + # ------------------------------------------------------------ Process commands # ---------------- if they are for this folder and user allowed to make changes @@ -1495,7 +1495,7 @@ sub editor { ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); return $errtext if ($fatal); } - + if ($env{'form.pastemarked'}) { my $paste_res = &do_paste_from_buffer($coursenum,$coursedom,$folder); @@ -1541,7 +1541,7 @@ sub editor { return $errtext if ($fatal); } else { $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); - + } } &log_differences($plain); @@ -1556,7 +1556,7 @@ sub editor { ($ishidden?'<li>'.&mt('contents hidden').'</li>':''). ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':''). '</ul></p>'); - } + } if ($randompick>=0) { $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>'); } @@ -1715,7 +1715,7 @@ sub parse_supplemental_title { } if (wantarray) { return ($title,$foldertitle,$renametitle); - } + } return $title; } @@ -1736,7 +1736,7 @@ sub entryline { } my $orderidx=$LONCAPA::map::order[$index]; - + $renametitle=~s/\\/\\\\/g; $renametitle=~s/\"\;/\\\"/g; @@ -1775,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="1">('.$i.')</option>'; + $selectbox.='<option value="" selected="selected">('.$i.')</option>'; } else { $selectbox.='<option value="'.$i.'">'.$i.'</option>'; } @@ -1811,7 +1811,7 @@ sub entryline { } my $copylink=' '; my $cutlink=' '; - + my $skip_confirm = 0; if ( $folder =~ /^supplemental/ || ($url =~ m{( /smppg$ @@ -1897,7 +1897,7 @@ END &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); } } - + my $orig_url = $url; $orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; my $external = ($url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}); @@ -1932,7 +1932,7 @@ END } if ($container eq 'page') { my $symb=$env{'form.pagesymb'}; - + $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]); $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); } @@ -2000,9 +2000,9 @@ END 'hd' => 'Hidden', 'ec' => 'URL hidden'); my $enctext= - ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':''); + ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':''); my $hidtext= - ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':''); + ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':''); $line.=(<<ENDPARMS); <td class="LC_docs_entry_parameter"> $form_start @@ -2045,7 +2045,7 @@ sub tiehash { $hashtied=1; } } - } + } } sub untiehash { @@ -2394,7 +2394,7 @@ ENDHEADERS $lastold=$prevvers; } } - # + # # Code to figure out how many version entries should go in # each of the four columns my $entries_per_col = 0; @@ -2540,7 +2540,7 @@ sub handler { 'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic( 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); - $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files'); + $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files'); $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); # does this user have privileges to modify docs @@ -2619,7 +2619,7 @@ sub handler { if (($env{'form.folder'}=~/^(?:group|default)_/) || ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) { $forcestandard = 1; - } + } $forcesupplement=($env{'form.folder'}=~/^supplemental_/); if ($allowed) { @@ -2653,7 +2653,7 @@ sub handler { {'force_register' => $showdoc, 'bread_crumbs' => $brcrum}). &Apache::loncommon::help_open_menu('','',273,'RAT')); - + my %allfiles = (); my %codebase = (); my ($upload_result,$upload_output); @@ -2722,7 +2722,7 @@ sub handler { $attrib_regexp = $attribs{$item}[0]; } if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) { - } + } $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi; } if (exists($codebase{$item})) { @@ -2767,7 +2767,7 @@ sub handler { 'scuf' => 'Score Upload Form', 'bull' => 'Discussion Board', 'mypi' => 'My Personal Information Page', - 'grpo' => 'Group Files', + 'grpo' => 'Group Portfolio', 'rost' => 'Course Roster', 'abou' => 'Personal Information Page for a User', 'imsf' => 'Import IMS package', @@ -2889,36 +2889,36 @@ HIDDENFORM } # --------------------------------------------------------- Main tab structure my $activeClass = 1; + my $active = ''; $r->print('<ul class="LC_TabContentBigger" id="mainnav">'); - if (($standard) && ($allowed) && (!$forcesupplement)) { - my $active = ''; + if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || ($env{'form.pagepath'}))) { 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 = ''; + $r->print('<li '.$active.'onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>'); + $active = ''; + if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) { 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('<li '.$active.'onclick="javascript:showPage(this,\'Supplemental Course Documents\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>'); $r->print('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">'); # --------------------------------------------------------- Standard documents - if (($standard) && ($allowed) && (!$forcesupplement)) { + my $savefolderpath; 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('<div class="LC_ContentBox" id="mainCourseDocuments" '.$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') { + if ($folder eq '' || $folder=~/^supplemental/) { $folder='default'; + $savefolderpath = $env{'form.folderpath'}; $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents')); $uploadtag = '<input type="hidden" name="folderpath" value="'. &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; @@ -3100,7 +3100,7 @@ NFFORM </span> </form> NSYLFORM - + my $newgroupfileform=(<<NGFFORM); <form action="/adm/coursedocs" method="post" name="newgroupfiles"> $uploadtag @@ -3108,7 +3108,7 @@ NSYLFORM value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> <span class="LC_nobreak"> <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" /> - $help{'Group Files'} + $help{'Group Portfolio'} </span> </form> NGFFORM @@ -3125,23 +3125,15 @@ if($env{'form.pagepath'}) { } my %orderhash = ( - 'aa' => 'New Document', - 'bb' => 'Published Documents', - 'cc' => 'Special Documents', - 'dd' => 'More Options', - 'zz' => 'Hide all Options', - ); -my %namehash = ( - 'New Document' => $fileuploadform.'<br />'.$newfolderform, - 'Published Documents' => $simpleeditdefaultform, - 'Special Documents' => $specialdocumentsform, - 'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform, + 'aa' => ['New Document',$fileuploadform.'<br />'.$newfolderform], + 'bb' => ['Published Documents',$simpleeditdefaultform], + 'cc' => ['Special Documents',$specialdocumentsform], + 'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)], + 'zz' => ['Hide all Options'], ); 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)); +$r->print(&generate_edit_table($tid,$varcd,\%orderhash)); $hadchanges=0; my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { @@ -3155,9 +3147,7 @@ $r->print(&generate_edit_table($tid,$con $r->print('</div>'); if ($env{'form.pagepath'}) { } - } # ----------------------------------------------------- Supplemental documents - if (!$forcestandard) { my $active = 'style="display: none;"'; if($activeClass == 1){ $active = 'style="display: block;"'; @@ -3171,7 +3161,10 @@ $r->print('</div>'); (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { $env{'form.folderpath'} = 'supplemental&'. &escape(&mt('Supplemental '.$type.' Documents')); + }else{ + $env{'form.folderpath'} = $savefolderpath; } + $env{'form.pagepath'} = ''; if ($allowed) { my $folderseq= '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time. @@ -3189,7 +3182,7 @@ $r->print('</div>'); </span> <br /><br /> $lt{'comment'}:<br /> - <textarea cols=50 rows=4 name='comment'> + <textarea cols="50" rows="4" name="comment"> </textarea> <br /> <input type="hidden" name="folderpath" value="$path" /> @@ -3253,32 +3246,21 @@ 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, + 'ee' => ['New Document',$supupdocform.'<br />'.$supnewfolderform], + 'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform], + 'zz' => ['Hide all Options'], ); 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)); +$r->print(&generate_edit_table($tid,$varscd,\%suporderhash)); my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { $r->print('<p><span class="LC_error">'.$error.'</span></p>'); } $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(' @@ -3301,7 +3283,7 @@ $r->print('</div>'); } $r->print(&Apache::loncommon::end_page()); return OK; -} +} sub generate_admin_options { my ($containertag,$uploadtag,$help_ref,$env_ref) = @_; @@ -3317,56 +3299,42 @@ sub generate_admin_options { 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> + <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br /> + <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}<br /> $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="hidden" name="folder" value="$env{'form.folder'}" /><br /> <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}; + my ($tid,$varcd,$orderhash_ref) = @_; my %orderhash = %{$orderhash_ref}; my $form; $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt($varcd).'</h4>'; - $form .= '<ul id="'.$navigation.$tid.'" class="LC_TabContent">'; + $form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">'; foreach my $name (sort(keys(%orderhash))){ if($name eq 'zz'){ - $form .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \''.$navigation.$tid.'\' ,\''.$content.$tid.'\');" class="active">'.&mt($orderhash{$name}).'</li></span>'; + $form .= '<span class="LC_Right"><li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" class="active">'.&mt(${$orderhash{$name}}[0]).'</li></span>'; }else{ - $form .= '<li onclick="javascript:showPage(this, \''.$tid.$orderhash{$name}.'\', \''.$navigation.$tid.'\',\''.$content.$tid.'\');">'.&mt($orderhash{$name}).'</li>'; + $form .= '<li onclick="javascript:showPage(this, \''.substr(${$orderhash{$name}}[0],0,3).$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');">'.&mt(${$orderhash{$name}}[0]).'</li>'; } } $form .= '</ul>'; - $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 id="content'.$tid.'" style="padding: 0 0; margin: 0 0;">'; + foreach my $field (keys(%orderhash)){ + if($field ne 'zz'){ + $form .= '<div id="'.substr(${$orderhash{$field}}[0],0,3).$tid.'" class="LC_ContentBox" style="display: none;">'.${$orderhash{$field}}[1].'</div>'; + } + } $form .= '</div></div>'; - + return $form; } @@ -3384,7 +3352,7 @@ sub editing_js { p_mdb => 'Title for the Drop Box', p_mbb => 'Title for the Discussion Board', p_mab => "Enter user:domain for User's Personal Information Page", - p_mab2 => "Personal Information Page [_99]", + p_mab2 => 'Personal Information Page of ', p_mab_alrt1 => 'Not a valid user:domain', p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', p_chn => 'New Title',