--- loncom/interface/londocs.pm 2009/02/19 10:51:40 1.347 +++ loncom/interface/londocs.pm 2009/10/04 13:58:02 1.389 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.347 2009/02/19 10:51:40 weissno Exp $ +# $Id: londocs.pm,v 1.389 2009/10/04 13:58:02 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,7 @@ use Apache::Constants qw(:common :http); use Apache::imsexport; use Apache::lonnet; use Apache::loncommon; +use Apache::lonhtmlcommon; use LONCAPA::map(); use Apache::lonratedt(); use Apache::lonxml; @@ -72,7 +73,7 @@ sub storemap { &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); if ($errtext) { return ($errtext,2); } - + $hadchanges=1; return ($errtext,0); } @@ -119,9 +120,9 @@ sub dumpbutton { my $type = &Apache::loncommon::course_type(); if ($home+$other==0) { return ''; } 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'); + my $link = "<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \"".&mt('Dump '.$type.' DOCS to Construction Space')."\")'>".&mt('Dump '.$type.' DOCS to Construction Space')."</a>"; + return $link.' '. + &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />'; } else { return '<div>'. &mt('Dump '.$type. @@ -142,7 +143,7 @@ sub dumpcourse { my ($r) = @_; my $type = &Apache::loncommon::course_type(); $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space'). - '<form name="dumpdoc" method="post">'); + '<form name="dumpdoc" action="" method="post">'); $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space')); my ($home,$other,%outhash)=&authorhosts(); unless ($home) { return ''; } @@ -262,9 +263,8 @@ sub dumpcourse { 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'); + return "<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>". + &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />'; } @@ -277,8 +277,8 @@ sub exportcourse { 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'). - '<h2>IMS Export Failed</h2>'. + $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package'). + '<h2>'.&mt('IMS Export Failed').'</h2>'. '<div class="LC_error">'. &mt('Unable to retrieve information about course contents'). '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>'); @@ -298,7 +298,17 @@ sub exportcourse { my @exportitems = &Apache::loncommon::get_env_multiple('form.archive'); my @discussions = &Apache::loncommon::get_env_multiple('form.discussion'); if (@exportitems == 0 && @discussions == 0) { - $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created. Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export'; + $outcome = + '<p class="LC_warning">' + .&mt('As you did not select any content items or discussions' + .' for export, an IMS package has not been created.') + .'</p>' + .'<p>' + .&mt('Please [_1]go back[_2] to select either content items' + .' or discussions for export.' + ,'<a href="javascript:history.go(-1)">' + ,'</a>') + .'</p>'; } else { my $now = time; my %symbs; @@ -321,35 +331,51 @@ sub exportcourse { open(OUTPUT, "zip -r $imszip * 2> /dev/null |"); close(OUTPUT); chdir $cwd; - $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,); if ($copyresult) { - $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult); + $outcome .= '<p class="LC_error">' + .&mt('The following errors occurred during export - [_1]' + ,$copyresult) + .'</p>'; } + $outcome .= '<p>' + .&mt('[_1]Your IMS package[_2] is ready for download.' + ,'<a href="'.$imszipfile.'">','</a>') + .'</p>'; } else { - $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />'; + $outcome = '<p class="LC_error">' + .&mt('Unfortunately you will not be able to retrieve' + .' an IMS archive of this posts at this time,' + .' because there was a problem creating a' + .' manifest file.') + .'</p>' + .'<p><a href="javascript:history.go(-1)">' + .&mt('Go Back') + .'</a></p>'; } } - $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package')); - $r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package')); + $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package')); + $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export')); $r->print($outcome); $r->print(&Apache::loncommon::end_page()); } else { my $display; - $display = '<form name="exportdoc" method="post">'."\n"; - $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />'); - $display .= '<table border="0" cellspacing="0" cellpadding="3">'. - '<tr><td><fieldset><legend> <b>Content items</b></legend>'. - '<input type="button" value="check all" '. + $display = '<form name="exportdoc" action="" method="post">'."\n"; + $display .= '<p>' + .&mt('Choose which items you wish to export from your '.$type.'.') + .'</p>'; + $display .= '<div class="LC_columnSection"><fieldset>'. + '<legend>'.&mt('Content items').'</legend>'. + '<input type="button" value="'.&mt('check all').'" '. 'onclick="javascript:checkAll(document.exportdoc.archive)" />'. - ' <input type="button" value="uncheck all"'. - ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'. - '<td> </td><td> </td>'. - '<td align="right"><fieldset><legend> <b>Discussion posts'. - '</b></legend><input type="button" value="check all"'. + ' <input type="button" value="'.&mt('uncheck all').'"'. + ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>'. + '<fieldset>'. + '<legend>'.&mt('Discussion posts').'</legend>'. + '<input type="button" value="'.&mt('check all').'"'. ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'. - ' <input type="button" value="uncheck all"'. - ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'. - '</tr></table>'; + ' <input type="button" value="'.&mt('uncheck all').'"'. + ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'. + '</fieldset></div>'; my $curRes; my $depth = 0; my $count = 0; @@ -358,13 +384,17 @@ sub exportcourse { my %parent = (); my %children = (); my $lastcontainer = $startcount; - my @bgcolors = ('#F6F6F6','#FFFFFF'); - $display .= '<table cellspacing="0"><tr>'. - '<td><b>Export content item?<br /></b></td><td> </td><td align="right">'."\n"; + $display .= &Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'<th>'.&mt('Export content item?').'</th>' + .'<th>'; if ($numdisc > 0) { - $display.='<b>Export discussion posts?</b>'."\n"; + $display .= &mt('Export discussion posts?'); + } else { + $display .= ' '; } - $display.=' </td></tr>'; + $display .= '</th>' + .&Apache::loncommon::end_data_table_header_row(); while ($curRes = $it->next()) { if (ref($curRes)) { $count ++; @@ -385,39 +415,46 @@ sub exportcourse { $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard'; } } - my $color = $count%2; - $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n". - '<input type="checkbox" name="archive" value="'.$count.'" '; + $display .= &Apache::loncommon::start_data_table_row() + .'<td>'."\n" + .'<input type="checkbox" name="archive" value="'.$count.'" '; if (($curRes->is_sequence()) || ($curRes->is_page())) { my $checkitem = $count + $boards + $startcount; - $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"'; + $display .= 'onclick="javascript:propagateCheck('."'$checkitem'".')"'; } $display .= ' />'."\n"; for (my $i=0; $i<$depth; $i++) { - $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n"; + $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />' + .'<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'."\n"; } if ($curRes->is_sequence()) { - $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif"> '."\n"; + $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n"; $lastcontainer = $count + $startcount + $boards; } elsif ($curRes->is_page()) { - $display .= '<img src="/adm/lonIcons/navmap.page.open.gif"> '."\n"; + $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" /> '."\n"; $lastcontainer = $count + $startcount + $boards; } my $currelem = $count+$boards+$startcount; $children{$parent{$depth}} .= $currelem.':'; - $display .= ' '.$curRes->title().'</td>'; + $display .= ' '.$curRes->title().'</td>'."\n"; + + # Existing discussion posts? if ($discussiontime{$ressymb} > 0) { $boards ++; $currelem = $count+$boards+$startcount; - $display .= '<td> </td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" /> </td>'."\n"; + $display .= '<td align="right">' + .'<input type="checkbox" name="discussion" value="'.$count.'" />' + .'</td>'."\n"; } else { - $display .= '<td colspan="2"> </td>'."\n"; + $display .= '<td> </td>'."\n"; } + $display .= &Apache::loncommon::end_data_table_row(); } } + $display .= &Apache::loncommon::end_data_table(); my $scripttag = qq| -<script> - +<script type="text/javascript"> +// <![CDATA[ function checkAll(field) { if (field.length > 0) { for (i = 0; i < field.length; i++) { @@ -427,7 +464,7 @@ function checkAll(field) { field.checked = true } } - + function uncheckAll(field) { if (field.length > 0) { for (i = 0; i < field.length; i++) { @@ -442,7 +479,7 @@ function propagateCheck(item) { if (document.exportdoc.elements[item].checked == true) { containerCheck(item) } -} +} function containerCheck(item) { document.exportdoc.elements[item].checked = true @@ -465,18 +502,18 @@ function containerCheck(item) { for (var j=0; j<parents[item].length; j++) { containerCheck(parents[item][j]) } - } + } } - +// ]]> </script> |; - $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package', + $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package', $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">'. + $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export')); + $r->print($display. + '<p><input type="hidden" name="finishexport" value="1" />'. '<input type="submit" name="exportcourse" value="'. - &mt('Export '.$type.' DOCS').'" /></p></form>'); + &mt('Export').'" /></p></form>'); } } @@ -859,7 +896,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 +961,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". @@ -1004,15 +1041,14 @@ sub breadcrumbs { &Apache::lonhtmlcommon::add_breadcrumb( {'href'=>$url.$cpinfo, 'title'=>$name, - 'text'=>'<font size="+1">'. - $name.'</font>', + 'text'=>$name, 'no_mt'=>1, }); $plain.=$name.' > '; } $plain=~s/\>\;\s*$//; return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp', - 'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); + undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order); } sub log_docs { @@ -1176,7 +1212,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 +1250,7 @@ sub update_paste_buffer { my ($errtext,$fatal) = &mapread($coursenum,$coursedom, $env{'form.copyfolder'}); - + return if ($fatal); # Mark for copying @@ -1236,10 +1272,11 @@ sub print_paste_buffer { my ($r,$container) = @_; return if (!defined($env{'docs.markedcopy_url'})); - $r->print(<<ENDPASTE); -<form name="pasteform" action="/adm/coursedocs" method="post"><p> -ENDPASTE - $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '); + $r->print('<fieldset>' + .'<legend>'.&mt('Clipboard').'</legend>' + .'<form name="pasteform" action="/adm/coursedocs" method="post">' + .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ' + ); my $type; if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { @@ -1253,7 +1290,7 @@ ENDPASTE if ($extension eq 'sequence' && $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) { $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); - $icon .= '/folder_closed.gif'; + $icon .= '/navmap.folder.closed.gif'; } $icon = '<img src="'.$icon.'" alt="" class="LC_icon" />'; $r->print($icon.$type.': '. &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}))); @@ -1268,7 +1305,7 @@ ENDPASTE <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /> '); } - $r->print('</p></form>'); + $r->print('</form></fieldset>'); } sub do_paste_from_buffer { @@ -1402,7 +1439,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 +1507,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 +1532,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 +1578,7 @@ sub editor { return $errtext if ($fatal); } else { $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>'); - + } } &log_differences($plain); @@ -1551,34 +1588,67 @@ sub editor { my $idx=0; my $shown=0; if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) { - $r->print('<p>'.&mt('Parameters').':<ul>'. - ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':''). + $r->print('<div class="LC_Box">'. + '<p>'.&mt('Parameters:'). + '<ul>'. + ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':''). ($ishidden?'<li>'.&mt('contents hidden').'</li>':''). ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':''). + ($is_random_order?'<li>'.&mt('random order').'</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>'); - } - if ($is_random_order) { - $r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>'); + if ($randompick>=0) { + $r->print('<p class="LC_warning">' + .&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>' + ); + } + if ($is_random_order) { + $r->print('<p class="LC_warning">' + .&mt('Caution: this folder is set to randomly order its' + .' contents. Adding or removing resources from this folder' + .' will change the order of resources shown.') + .'</p>' + ); + } + $r->print('</div>'); } - $r->print('<table class="LC_docs_editor">'); + + my $output; foreach my $res (@LONCAPA::map::order) { - my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); - $name=&LONCAPA::map::qtescape($name); - $url=&LONCAPA::map::qtescape($url); - unless ($name) { $name=(split(/\//,$url))[-1]; } - unless ($name) { $idx++; next; } - $r->print(&entryline($idx,$name,$url,$folder,$allowed,$res, - $coursenum)); - $idx++; - $shown++; + my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); + $name=&LONCAPA::map::qtescape($name); + $url=&LONCAPA::map::qtescape($url); + unless ($name) { $name=(split(/\//,$url))[-1]; } + unless ($name) { $idx++; next; } + $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, + $coursenum); + $idx++; + $shown++; } - unless ($shown) { - $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>'); + if ($shown) { + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'<th colspan="2">'.&mt('Move').'</th>' + .'<th>'.&mt('Actions').'</th>' + .'<th colspan="2">'.&mt('Document').'</th>' + .'<th colspan="4">'.&mt('Settings').'</th>' + .&Apache::loncommon::end_data_table_header_row() + .$output + .&Apache::loncommon::end_data_table() + ) + } + unless($shown) { + $r->print('<p class="LC_info">' + .&mt('Currently no documents.') + .'</p>' + ); } - $r->print("\n</table>\n"); if ($allowed) { &print_paste_buffer($r,$container); } @@ -1649,7 +1719,7 @@ sub process_file_upload { return 'failed'; } else { if ($parseaction eq 'parse') { - my $total_embedded = keys(%{$allfiles}); + my $total_embedded = scalar(keys(%{$allfiles})); if ($total_embedded > 0) { my $num = 0; my $state = ' @@ -1715,7 +1785,7 @@ sub parse_supplemental_title { } if (wantarray) { return ($title,$foldertitle,$renametitle); - } + } return $title; } @@ -1736,12 +1806,12 @@ sub entryline { } my $orderidx=$LONCAPA::map::order[$index]; - + $renametitle=~s/\\/\\\\/g; $renametitle=~s/\"\;/\\\"/g; $renametitle=~s/ /%20/g; - my $line='<tr>'; + my $line=&Apache::loncommon::start_data_table_row(); my ($form_start,$form_end); # Edit commands my ($container, $type, $esc_path, $path, $symb); @@ -1772,10 +1842,10 @@ sub entryline { ne '')) { $selectbox= '<input type="hidden" name="currentpos" value="'.$incindex.'" />'. - '<select name="newpos" onChange="this.form.submit()">'; + '<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 +1881,7 @@ sub entryline { } my $copylink=' '; my $cutlink=' '; - + my $skip_confirm = 0; if ( $folder =~ /^supplemental/ || ($url =~ m{( /smppg$ @@ -1844,18 +1914,16 @@ END $form_end = '</form>'; $line.=(<<END); <td> - <table class="LC_docs_entry_move"> - <tr> - <td> - <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a> - </td> - </tr> - <tr> - <td> - <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a> - </td> - </tr> - </table> +<div class="LC_docs_entry_move"> + <a href='/adm/coursedocs?cmd=up_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'> + <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /> + </a> +</div> +<div class="LC_docs_entry_move"> + <a href='/adm/coursedocs?cmd=down_$index&${type}path=$esc_path&${type}symb=$symb$cpinfo'> + <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /> + </a> +</div> </td> <td> $form_start @@ -1882,7 +1950,7 @@ END my $pagefile; if ($uploaded) { if ($extension eq 'sequence') { - $icon=$iconpath.'/folder_closed.gif'; + $icon=$iconpath.'/navmap.folder.closed.gif'; $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/; $url='/adm/coursedocs?'; $folderarg=$1; @@ -1897,7 +1965,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 +2000,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); } @@ -1954,7 +2022,7 @@ END 'parameter_randomorder'))[0]=~/^yes$/i); $url.='folderpath='.&escape($folderpath).$cpinfo; $parameterset='<label>'.&mt('Randomly Pick: '). - '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'. + '<input type="text" size="4" onchange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'. (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]. '" />'. @@ -1962,7 +2030,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); @@ -1989,10 +2057,10 @@ END undef($external); } $line.=' - <td class="LC_docs_entry_icon"> + <td> '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').' </td> - <td class="LC_docs_entry_title"> + <td> '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external." </td>"; if (($allowed) && ($folder!~/^supplemental/)) { @@ -2000,25 +2068,25 @@ 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 - <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label> + <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label> $form_end </td> <td class="LC_docs_entry_parameter"> $form_start - <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label> + <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label> $form_end </td> <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td> <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td> ENDPARMS } - $line.="</tr>"; + $line.=&Apache::loncommon::end_data_table_row(); return $line; } @@ -2045,7 +2113,7 @@ sub tiehash { $hashtied=1; } } - } + } } sub untiehash { @@ -2094,7 +2162,7 @@ sub checkonthis { if (($errorcount) || ($warningcount)) { if ($errorcount) { - $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'. + $r->print('<img src="/adm/lonMisc/bomb.gif" alt="'.&mt('bomb').'" /><span class="LC_error">'. &mt('[quant,_1,error]',$errorcount).'</span>'); } if ($warningcount) { @@ -2119,7 +2187,7 @@ sub checkonthis { unless ($url=~/\$/) { $r->print('<span class="LC_error">'.&mt('not found').'</b></span>'); } else { - $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>'); + $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>'); } } else { $r->print('<span class="LC_error">'.&mt('access denied').'</span>'); @@ -2394,7 +2462,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; @@ -2484,14 +2552,18 @@ sub changewarning { $message='Changes will become active for your current session after [_1], or the next time you log in.'; } $r->print("\n\n". -'<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n". +'<script type="text/javascript">'."\n". +'// <![CDATA['."\n". +'function reinit(tf) { tf.submit();'.$postexec.' }'."\n". +'// ]]>'."\n". +'</script>'."\n". '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'. '<input type="hidden" name="orgurl" value="'.$url. -'" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'. +'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'. &mt($message,' <input type="hidden" name="'. $env{'request.role'}.'" value="1" /><input type="button" value="'. - &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />'). -$help{'Caching'}.'</span></h3></form>'."\n\n"); + &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />'). +$help{'Caching'}.'</p></form>'."\n\n"); } @@ -2540,7 +2612,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 @@ -2561,7 +2633,7 @@ sub handler { &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space'); &dumpcourse($r); } elsif ($allowed && $env{'form.exportcourse'}) { - &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS'); + &init_breadcrumbs('exportcourse','IMS Export'); &exportcourse($r); } else { # is this a standard course? @@ -2619,7 +2691,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) { @@ -2630,6 +2702,26 @@ sub handler { $allowed=0; } +# subroutine to list form elements +sub create_list_elements { + my @formarr = @_; + my $list = ''; + for my $button (@formarr){ + for my $picture(keys %$button) { + #my $link = Apache::lonhtmlcommon::htmltag('a' ,$button->{$picture}, {href => "test"}); + $list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'}); + } + } + return $list; +} + +# subroutine to create ul from list elements +sub create_form_ul { + my $list = shift; + my $ul = Apache::lonhtmlcommon::htmltag('ul',$list, {class => 'LC_ListStyleNormal'}); + return $ul; +} + # get course data my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; @@ -2647,13 +2739,25 @@ sub handler { $script .= &editing_js($udom,$uname); } # -------------------------------------------------------------------- Body tag - $script = '<script type="text/javascript">'."\n".$script."\n".'</script>'; - my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}]; + $script = '<script type="text/javascript">'."\n" + .'// <![CDATA['."\n" + .$script."\n" + .'// ]]>'."\n" + .'</script>'."\n"; + + # Breadcrumbs + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({ + href=>"/adm/createuser",text=>"$type Documents"}); + $r->print(&Apache::loncommon::start_page("$type Documents", $script, - {'force_register' => $showdoc, - 'bread_crumbs' => $brcrum}). - &Apache::loncommon::help_open_menu('','',273,'RAT')); - + {'force_register' => $showdoc,}) + .&Apache::loncommon::help_open_menu('','',273,'RAT') + .&Apache::lonhtmlcommon::breadcrumbs( + 'Editing the Table of Contents for your '.$type, + 'Docs_Adding_Course_Doc') + ); + my %allfiles = (); my %codebase = (); my ($upload_result,$upload_output); @@ -2722,7 +2826,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})) { @@ -2747,7 +2851,6 @@ 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', 'copm' => 'All documents out of a published map into this folder', 'upld' => 'Upload Document', 'srch' => 'Search', @@ -2767,19 +2870,19 @@ sub handler { 'scuf' => 'Score Upload Form', 'bull' => 'Discussion Board', 'mypi' => 'My Personal Information Page', - 'grpo' => 'Group Files', + 'grpo' => 'Group Portfolio', 'rost' => 'Course Roster', - 'abou' => 'About User', - 'imsf' => 'Import IMS package', + 'abou' => 'Personal Information Page for a User', + 'imsf' => 'IMS Import', + 'imsl' => 'Import IMS package', 'file' => 'File', 'title' => 'Title', 'comment' => 'Comment', 'parse' => 'Upload embedded images/multimedia files if HTML file!', - 'nd' => 'New Document', + 'nd' => 'Upload Document', 'pm' => 'Published Map', 'sd' => 'Special Document', 'mo' => 'More Options', - 'hao' => 'Hide all Options' ); # ----------------------------------------------------------------------------- my $fileupload=(<<FIUP); @@ -2796,8 +2899,12 @@ FIUP </label> CHBO + my @fileuploada = ( + { '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic01" />' => "<input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}" }, + ); my $fileuploadform=(<<FUFORM); <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data"> + <input type="hidden" name="active" value="aa" /> $fileupload <br /> $lt{'title'}:<br /> @@ -2808,33 +2915,29 @@ CHBO <span class="LC_nobreak"> $checkbox </span> - <br /> - <br /> - <span class="LC_nobreak"> - <input type="submit" value="$lt{'upld'}" /> - $help{'Uploading_From_Harddrive'} - </span> +FUFORM + $fileuploadform .= create_form_ul(create_list_elements(@fileuploada)); + $fileuploadform .= (<<FUFORM); </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'}" /> + <input type="hidden" name="active" value="bb" /> +SEDFFORM + my @simpleeditdefaultforma = ( + { '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic03" />' => "$uploadtag<a onclick='javascript:groupsearch()'>$lt{'srch'}</a>" }, + { '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic04" />' => "<a onclick='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" }, + { '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic05" />' => "<a onclick='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" }, + ); + $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma)); + $simpleeditdefaultform .=(<<SEDFFORM); <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','')" + onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')" value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" /> $help{'Load_Map'}</span> </p> @@ -2845,10 +2948,7 @@ SEDFFORM <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> + <a onclick="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'} </form> ERFORM @@ -2888,44 +2988,54 @@ ERFORM 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.folderpath'}eq"" || ($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 = ''; + if($env{'request.role'}=~/^cc/){ + $r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.&mt('Main Course Documents').'</b></a></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('</ul><div class="LC_ContentBoxSpecial" style="margin:0 0;padding:0 0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">'); + $r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.&mt('Supplemental Course Documents').'</b></a></li>'); + $r->print('</ul>' + .'<div class="LC_Box" style="clear:both;margin: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(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', - &mt('Editing the Table of Contents for your '.$type))); + if($env{'request.role'}=~/^cc/){ + $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>'); 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'},'<>&"').'" />'; } my $postexec=''; if ($folder eq 'default') { - $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>'); + $r->print('<script type="text/javascript">'."\n" + .'// <![CDATA['."\n" + .'this.window.name="loncapaclient";'."\n" + .'// ]]>'."\n" + .'</script>'."\n" + ); } else { #$postexec='self.close();'; } @@ -2943,204 +3053,206 @@ HIDDENFORM 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'}" /> + <a onclick="javascript:groupopen('$readfile',1,0)">$lt{'reco'}</a> </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();" /> + <a onclick="javascript:makeims();">$lt{'imsf'}</a> </form> IMSPFORM my $newnavform=(<<NNFORM); <form action="/adm/coursedocs" method="post" name="newnav"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="$lt{'navc'}=/adm/navmaps" /> - <span class="LC_nobreak"> - <input name="newnav" type="submit" value="$lt{'navc'}" /> + <a onclick="document.newnav.submit()">$lt{'navc'}</a> $help{'Navigate_Content'} - </span> </form> NNFORM my $newsmppageform=(<<NSPFORM); <form action="/adm/coursedocs" method="post" name="newsmppg"> + <input type="hidden" name="active" value="cc" /> $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> + <a onclick="javascript:makesmppage();"> $lt{'sipa'}</a> + $help{'Simple Page'} </form> NSPFORM my $newsmpproblemform=(<<NSPROBFORM); <form action="/adm/coursedocs" method="post" name="newsmpproblem"> + <input type="hidden" name="active" value="cc" /> $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> + <a onclick="javascript:makesmpproblem();">$lt{'sipr'}</a> + $help{'Simple Problem'} </form> NSPROBFORM my $newdropboxform=(<<NDBFORM); <form action="/adm/coursedocs" method="post" name="newdropbox"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="" /> - <span class="LC_nobreak"> - <input name="newdropbox" type="button" value="$lt{'drbx'}" - onClick="javascript:makedropbox();" /> - </span> + <a onclick="javascript:makedropbox();">$lt{'drbx'}</a> </form> NDBFORM my $newexuploadform=(<<NEXUFORM); <form action="/adm/coursedocs" method="post" name="newexamupload"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="" /> - <span class="LC_nobreak"> - <input name="newexamupload" type="button" value="$lt{'scuf'}" - onClick="javascript:makeexamupload();" /> + <a onclick="javascript:makeexamupload();">$lt{'scuf'}</a> $help{'Score_Upload_Form'} - </span> </form> NEXUFORM my $newbulform=(<<NBFORM); <form action="/adm/coursedocs" method="post" name="newbul"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="" /> - <span class="LC_nobreak"> - <input name="newbulletin" type="button" value="$lt{'bull'}" - onClick="javascript:makebulboard();" /> + <a onclick="javascript:makebulboard();" >$lt{'bull'}</a> $help{'Bulletin Board'} - </span> </form> NBFORM my $newaboutmeform=(<<NAMFORM); <form action="/adm/coursedocs" method="post" name="newaboutme"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme" /> - <span class="LC_nobreak"> - <input name="newaboutme" type="submit" value="$lt{'mypi'}" /> + <a onclick="document.newaboutme.submit()">$lt{'mypi'}</a> $help{'My Personal Information Page'} - </span> </form> NAMFORM my $newaboutsomeoneform=(<<NASOFORM); <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="" /> - <span class="LC_nobreak"> - <input name="newaboutsomeone" type="button" value="$lt{'abou'}" - onClick="javascript:makeabout();" /> - </span> + <a onclick="javascript:makeabout();">$lt{'abou'}</a> </form> NASOFORM my $newrosterform=(<<NROSTFORM); <form action="/adm/coursedocs" method="post" name="newroster"> + <input type="hidden" name="active" value="cc" /> $uploadtag <input type="hidden" name="importdetail" value="$lt{'rost'}=/adm/viewclasslist" /> - <span class="LC_nobreak"> - <input name="newroster" type="submit" value="$lt{'rost'}" /> + <a onclick="document.newroster.submit()">$lt{'rost'}</a> $help{'Course Roster'} - </span> </form> NROSTFORM my $specialdocumentsform; +my @specialdocumentsforma; +my $newfolderform; unless ($env{'form.pagepath'}) { my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); - + 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> + <input type="hidden" name="active" value="cc" /> + <a onclick="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a> + $help{'Adding_Pages'} </form> NPFORM - - my $newfolderform=(<<NFFORM); + + $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> + <input type="hidden" name="active" value="aa" /> + <a onclick="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'} </form> NFFORM + my @newfolderforma= ( + { '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic02" />' => "$newfolderform" } + ); + + + $newfolderform = create_form_ul(create_list_elements(@newfolderforma)); my $newsylform=(<<NSYLFORM); <form action="/adm/coursedocs" method="post" name="newsyl"> + <input type="hidden" name="active" value="cc" /> $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'}" /> + <a onclick="document.newsyl.submit()">$lt{'syll'}</a> $help{'Syllabus'} - </span> + </form> NSYLFORM - + my $newgroupfileform=(<<NGFFORM); <form action="/adm/coursedocs" method="post" name="newgroupfiles"> + <input type="hidden" name="active" value="cc" /> $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> + <a onclick="document.newgroupfiles.submit()">$lt{'grpo'}</a> + $help{'Group Portfolio'} </form> NGFFORM - - $specialdocumentsform="<br />$newfolderform<br />$newpageform<br />$newsylform<br />$newgroupfileform"; + @specialdocumentsforma=( + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic06" />'=>$newpageform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic07" />'=>$newsylform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic08" />'=>$newgroupfileform}, + ); + } - $specialdocumentsform.="<br />$newnavform<br />$newsmppageform - <br />$newsmpproblemform<br />$newdropboxform - <br />$newexuploadform<br />$newbulform - <br />$newaboutmeform<br />$newaboutsomeoneform - <br />$newrosterform"; + push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic09" />'=>$newnavform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic10" />'=>$newsmppageform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic11" />'=>$newsmpproblemform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic12" />'=>$newdropboxform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic13" />'=>$newexuploadform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic14" />'=>$newbulform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic15" />'=>$newaboutmeform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic16" />'=>$newaboutsomeoneform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic17" />'=>$newrosterform},); + + $specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma)); + if($env{'form.pagepath'}) { - $specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform"; + + @specialdocumentsforma=( + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic32" />'=>$newsmpproblemform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic33" />'=>$newexuploadform} + ); + $specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma)); } +my @tools = ( + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic18" />'=>$extresourcesform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic19" />'=>$imspform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic20" />'=>$recoverform}, + ); + 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, + 'aa' => ['Upload Document',$fileuploadform.''.$newfolderform], + 'bb' => ['Published Resources',$simpleeditdefaultform], + 'cc' => ['Special Documents',$specialdocumentsform], + 'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)], + 'zz' => ['Hide'], ); 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)); $hadchanges=0; my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type); if ($error) { @@ -3151,17 +3263,18 @@ $r->print(&generate_edit_table($tid,$con } &changewarning($r,''); +$r->print(&generate_edit_table($tid,$varcd,\%orderhash)); + $r->print('</div>'); + } if ($env{'form.pagepath'}) { } - } # ----------------------------------------------------- Supplemental documents - if (!$forcestandard) { my $active = 'style="display: none;"'; if($activeClass == 1){ $active = 'style="display: block;"'; } - $r->print('<div class="LC_ContentBox" id="Supplemental Course Documents" '.$active.'>'); + $r->print('<div class="LC_ContentBox" id="supplCourseDocuments" '.$active.'>'); my $folder=$env{'form.folder'}; unless ($folder=~/^supplemental/) { $folder='supplemental'; @@ -3170,7 +3283,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. @@ -3178,8 +3294,12 @@ $r->print('</div>'); my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); + my @supupdocform = ( + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic27" />'=>"<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}"}, + ); my $supupdocform=(<<SUPDOCFORM); - <form action="/adm/coursedocs" method="post" enctype="multipart/form-data"> + <form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> + <input type="hidden" name="active" value="ee" /> $fileupload <br /> <br /> @@ -3188,97 +3308,84 @@ $r->print('</div>'); </span> <br /><br /> $lt{'comment'}:<br /> - <textarea cols=50 rows=4 name='comment'> - </textarea> + <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 + $supupdocform .= create_form_ul(create_list_elements(@supupdocform))."</form>"; my $supnewfolderform=(<<SNFFORM); <form action="/adm/coursedocs" method="post" name="supnewfolder"> + <input type="hidden" name="active" value="ee" /> <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> + <a onclick="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> + $help{'Adding_Folders'} </form> SNFFORM + + my @supnewfolderforma = ({'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic28" />'=>$supnewfolderform}); + $supnewfolderform = create_form_ul(create_list_elements(@supnewfolderforma)); my $supnewextform=(<<SNEFORM); <form action="/adm/coursedocs" method="post" name="supnewext"> + <input type="hidden" name="active" value="ff" /> <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> + <a onclick="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'} </form> SNEFORM my $supnewsylform=(<<SNSFORM); <form action="/adm/coursedocs" method="post" name="supnewsyl"> + <input type="hidden" name="active" value="ff" /> <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'}" /> + <a onclick="document.supnewsyl.submit()">$lt{'syll'}</a> $help{'Syllabus'} - </span> </form> SNSFORM my $supnewaboutmeform=(<<SNAMFORM); - <form action="/adm/coursedocs" method="post" name="subnewaboutme"> + <form action="/adm/coursedocs" method="post" name="supnewaboutme"> + <input type="hidden" name="active" value="ff" /> <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'}" /> + <a onclick="document.supnewaboutme.submit()">$lt{'mypi'}</a> $help{'My Personal Information Page'} - </span> </form> SNAMFORM - +my @specialdocs = ( + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic29" />'=>$supnewextform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic30" />'=>$supnewsylform}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic31" />'=>$supnewaboutmeform}, + ); 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' => ['Upload Document',$supupdocform.' '.$supnewfolderform], + 'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))], + 'zz' => ['Hide'], ); 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('</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(&generate_edit_table($tid,$varscd,\%suporderhash)); +} + + $r->print('</div>'); +$r->print('</div></div>'); + + if ($allowed) { $r->print(' <form method="post" name="extimport" action="/adm/coursedocs"> @@ -3300,7 +3407,7 @@ $r->print('</div>'); } $r->print(&Apache::loncommon::end_page()); return OK; -} +} sub generate_admin_options { my ($containertag,$uploadtag,$help_ref,$env_ref) = @_; @@ -3314,58 +3421,59 @@ sub generate_admin_options { 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 + my @list = ( + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic21" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic22" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"}, + ); + if($dumpbut ne ''){ + push @list, {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic23" />'=>$dumpbut}; + } + push @list, ({'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic24" />'=>$exportbut}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic25" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"}, + {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic26" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"}, + ); + return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.create_form_ul(create_list_elements(@list)).'</form>'; } 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">'; + my $activetab; + my $active; + if($env{'form.active'} ne ''){ + $activetab = $env{'form.active'}; + } + $form = '<div class="LC_Box">'; + $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>'; + if($name ne 'zz'){ + if($activetab eq '' || $activetab ne $name){ + $active = ''; + }elsif($activetab eq $name){ + $active = 'class="active"'; + } + $form .= '<li '.$active.' onclick="javascript:showPage(this, \''.$name.$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'){ + if($activetab eq '' || $activetab ne $field){ + $active = 'style="display: none;"'; + }elsif($activetab eq $field){ + $active = 'style="display:block;"'; + } + $form .= '<div id="'.$field.$tid.'"' + .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1] + .'</div>'; + } + } $form .= '</div></div>'; - + return $form; } @@ -3378,12 +3486,12 @@ sub editing_js { p_mnp => 'Name of New Page', t_mnp => 'New Page', p_mxu => 'Title for the Uploaded Score', - p_msp => 'Title for the Page', + p_msp => 'Name of Simple Course Page', p_msb => 'Title for the Problem', p_mdb => 'Title for the Drop Box', p_mbb => 'Title for the Discussion Board', - p_mab => "Enter user:domain for User's 'About Me' Page", - p_mab2 => "About [_99]", + p_mab => "Enter user:domain for User's Personal Information Page", + 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', @@ -3574,13 +3682,21 @@ function unselectInactive(nav) { currentNav = document.getElementById(nav); currentLis = currentNav.getElementsByTagName('LI'); for (i = 0; i < currentLis.length; i++) { - currentLis[i].className = 'i'; + if(currentLis[i].className == 'right active' || currentLis[i].className == 'right'){ + currentLis[i].className = 'right'; + }else{ + currentLis[i].className = 'i'; + } } } function hideAll(current, nav, data) { unselectInactive(nav); -current.className = 'active'; +if(current.className == 'right'){ + current.className = 'right active' + }else{ + current.className = 'active'; +} currentData = document.getElementById(data); currentDivs = currentData.getElementsByTagName('DIV'); for (i = 0; i < currentDivs.length; i++) { @@ -3590,8 +3706,25 @@ for (i = 0; i < currentDivs.length; i++) } } +function openTabs(pageId) { + tabnav = document.getElementById(pageId).getElementsByTagName('UL'); + if(tabnav.length > 2 ){ + currentNav = document.getElementById(tabnav[1].id); + currentLis = currentNav.getElementsByTagName('LI'); + for(i = 0; i< currentLis.length; i++){ + if(currentLis[i].className == 'active') { + funcString = currentLis[i].onclick.toString(); + tab = funcString.split('"'); + currentData = document.getElementById(tab[1]); + currentData.style.display = 'block'; + } + } + } +} + function showPage(current, pageId, nav, data) { hideAll(current, nav, data); + openTabs(pageId); unselectInactive(nav); current.className = 'active'; currentData = document.getElementById(pageId); @@ -3599,6 +3732,13 @@ function showPage(current, pageId, nav, return false; } +function injectData(current, hiddenField, name, value) { + currentElement = document.getElementById(hiddenField); + currentElement.name = name; + currentElement.value = value; + current.submit(); +} + ENDNEWSCRIPT } 1;