--- loncom/interface/portfolio.pm 2008/12/12 15:38:53 1.196.2.1 +++ loncom/interface/portfolio.pm 2010/02/02 01:51:49 1.219 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.196.2.1 2008/12/12 15:38:53 raeburn Exp $ +# $Id: portfolio.pm,v 1.219 2010/02/02 01:51:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,78 +80,76 @@ sub make_anchor { my $dirptr=16384; sub display_common { - my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_; + my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_; my $namespace = &get_namespace(); my $port_path = &get_port_path(); if ($can_upload) { my $groupitem = &group_form_data(); my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my %text=&Apache::lonlocal::texthash( - 'upload' => 'Upload', - 'upload_label' => - 'Upload file to current directory:', - 'createdir' => 'Create Subdirectory', - 'createdir_label' => - 'Create subdirectory in current directory:', - 'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files' - ); + my %lt=&Apache::lonlocal::texthash( + 'upload' => 'Upload', + 'upload_label' => 'Upload file to current directory', + 'createdir' => 'Create Subdirectory', + 'createdir_label' => 'Create subdirectory in current directory', + 'parse' => 'Upload embedded images/multimedia/css/linked files if HTML file', + ); my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles'); my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory'); - - # FIXME: This line should be deleted once Portfolio uses breadcrumbs - $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'))); - + my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')); + $r->print(&display_usage($group)); my $parse_check; if (!&suppress_embed_prompt()) { $parse_check = <<"END"; <br /> <span class="LC_nobreak"> - <label>$text{'parse'} - <input type="checkbox" name="parserflag" checked="checked" /> + <label> + <input type="checkbox" name="parserflag" checked="checked" /> + $lt{'parse'} </label> </span> END } - $r->print(<<"TABLE"); -<table id="LC_portfolio_actions"> - <tr id="LC_portfolio_upload"> - <td class="LC_label"> - $text{'upload_label'} - </td> - <td class="LC_value"> - <form method="post" enctype="multipart/form-data" action="$escuri"> - $groupitem - <input name="uploaddoc" type="file" /> - <input type="hidden" name="currentpath" value="$current_path" /> - <input type="hidden" name="action" value="$env{"form.action"}" /> - <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" /> - <input type="hidden" name="mode" value="$env{"form.mode"}" /> - <input type="submit" name="storeupl" value="$text{'upload'}" /> -$help_fileupload -$parse_check - </form> - </td> - </tr> - <tr id="LC_portfolio_createdir"> - <td class="LC_label"> - $text{'createdir_label'} - </td> - <td class="LC_value"> - <form method="post" action="$escuri"> - <input name="newdir" type="input" />$groupitem - <input type="hidden" name="currentpath" value="$current_path" /> - <input type="hidden" name="action" value="$env{"form.action"}" /> - <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" /> - <input type="hidden" name="mode" value="$env{"form.mode"}" /> - <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir - </form> - </td> - </tr> -</table> -TABLE - } + + $r->print('<div>'.$help_portfolio); + # Upload File + $r->print('<div class="LC_left_float">' + .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">' + .'<fieldset>' + .'<legend>'.$lt{'upload_label'}.'</legend>' + .$groupitem + .'<input name="uploaddoc" type="file" />' + .'<input type="hidden" name="currentpath" value="'.$current_path.'" />' + .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />' + .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />' + .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />' + .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />' + .$help_fileupload + .$parse_check + .'</fieldset>' + .'</form>' + .'</div>' + ); + # Create Subdirectory + $r->print('<div class="LC_left_float">' + .'<form method="post" action="'.$escuri.'">' + .'<fieldset>' + .'<legend>'.$lt{'createdir_label'}.'</legend>' + .'<input name="newdir" type="text" />'.$groupitem + .'<input type="hidden" name="currentpath" value="'.$current_path.'" />' + .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />' + .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />' + .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />' + .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />' + .$help_createdir + .'</fieldset>' + .'</form>' + .'</div>' + ); + $r->print('</div>'); + } # end "if can_upload" + my @tree = split (/\//,$current_path); my %anchor_fields = ( 'selectfile' => $port_path, @@ -160,6 +158,7 @@ TABLE 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); + $r->print('<br clear="all" />'); $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/'); if (@tree > 1){ my $newCurrentPath = '/'; @@ -185,17 +184,59 @@ TABLE $r->print("</form>"); } +sub display_usage { + my ($group) = @_; + my $disk_quota = &get_quota($group); + my $getpropath = 1; + my $portfolio_root = &get_portfolio_root(); + my ($uname,$udom) = &get_name_dom($group); + my $current_disk_usage = + &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath); + my $usage = $current_disk_usage/1000; + my $quota = $disk_quota/1000; + my $percent; + if ($disk_quota == 0) { + $percent = 100.0; + } else { + $percent = 100*($current_disk_usage/$disk_quota); + } + $usage = sprintf("%.2f",$usage); + $quota = sprintf("%.2f",$quota); + $percent = sprintf("%.0f",$percent); + my ($color,$cssclass); + if ($percent <= 60) { + $color = '#00A000'; + } elsif ($percent > 60 && $percent < 90) { + $color = '#FFD300'; + $cssclass = 'class="LC_warning"'; + } elsif( $percent >= 90) { + $color = '#FF0000'; + $cssclass = 'class="LC_error"'; + } + my $prog_width = $percent; + if ($prog_width > 100) { + $prog_width = 100; + } + my $disk_meter = ' + <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n". +' <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n". +' <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n". +' </div>'."\n". +' </div>'; + return &Apache::loncommon::head_subbox($disk_meter); +} + sub display_directory_line { my ($r,$select_mode, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access, $now, $version_flag, $href_location, $url, $current_path, $access_admin_text, $versions)=@_; my $fullpath = &prepend_group($current_path.$filename); - $r->print('<tr class="'.$css_class.'">'); + $r->print(&Apache::loncommon::start_data_table_row()); $r->print($line); # contains first two cells of table my $lock_info; if ($version_flag) { # versioned can't be versioned, so TRUE when root file - $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>'); + $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" class="LC_fileicon" /></td>'); $r->print('<td>'.$version_flag.'</td>'); } else { # this is a graded or handed back file my ($user,$domain) = &get_name_dom($env{'form.group'}); @@ -227,15 +268,19 @@ sub display_directory_line { $r->print('<td>'.$size.'</td>'); $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>'); if ($select_mode ne 'true') { - $r->print('<td><span class="LC_nobreak">'. - &mt($curr_access).' '); + $r->print('<td class="'.$css_class.'"> </td>'); # Display status + $r->print('<td><span class="LC_nobreak">' + .&mt($curr_access).' ' + ); my %anchor_fields = ( 'access' => $filename, 'currentpath' => $current_path ); $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>'); + } else { + $r->print('<td class="'.$css_class.'"> </td>'); # Display status } - $r->print('</tr>'.$/); + $r->print(&Apache::loncommon::end_data_table_row().$/); } sub display_directory { @@ -267,7 +312,9 @@ sub display_directory { $display_out = '<form method="post" action="'.$url.'">'. &group_form_data(). '<input type="hidden" name="action" value="deletedir" />'. + '<p>'. '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'. + '</p>'. '<input type="hidden" name="selectfile" value="" />'. '<input type="hidden" name="currentpath" value="'.$current_path.'" />'. '</form>'; @@ -277,21 +324,30 @@ sub display_directory { } if ($select_mode eq 'true') { $r->print('<form method="post" name="checkselect" action="'.$url.'">'); - $r->print('<table id="LC_browser">'. - '<tr><th>Select</th><th> </th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>'); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'<th>'.&mt('Select').'</th>' + .'<th> </th><th> </th>' + .'<th>'.&mt('Name').'</th>' + .'<th>'.&mt('Size').'</th>' + .'<th>'.&mt('Last Modified').'</th>' + .'<th> </th>' + .&Apache::loncommon::end_data_table_header_row() + ); } else { $r->print('<form method="post" action="'.$url.'">'); $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', &mt('Using the portfolio file list'))); - $r->print('<table id="LC_browser">'. - '<tr>' + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>' .'<th> </th><th> </th>' .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>' .'<th>'.&mt('Size').'</th>' .'<th>'.&mt('Last Modified').'</th>' + .'<th> </th>' .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>' - .'</tr>'); + .&Apache::loncommon::end_data_table_header_row()); } $r->print("\n".&group_form_data()."\n"); @@ -349,12 +405,17 @@ sub display_directory { $version_flag = ' '; } if ($dirptr&$testdir) { - my $colspan='colspan="2"'; + my $colspan_folder=''; + my $colspan_fill=''; if ($select_mode eq 'true'){ - undef($colspan); + $colspan_fill=' colspan="3"'; + } else { + $colspan_folder=' colspan="2"'; + $colspan_fill=' colspan="4"'; } - $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>'); - $r->print('<td>'.&mt('Go to ...').'</td>'); + $r->print('<tr class="LC_browser_folder">'); + $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'navmap.folder.closed.gif" class="LC_fileicon" /></td>' + .'<td>'.&mt('Go to ...').'</td>'); my %anchor_fields = ( 'selectfile' => $filename.'/', 'currentpath' => $current_path.$filename.'/', @@ -362,7 +423,9 @@ sub display_directory { 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); - $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); + $r->print('<td>'.$version_flag.'</td>' + .'<td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); + $r->print('<td'.$colspan_fill.'> </td>'); $r->print('</tr>'); } else { my $css_class = 'LC_browser_file'; @@ -370,7 +433,7 @@ sub display_directory { if ($select_mode eq 'true') { $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"'; if ($$checked_files{$filename} eq 'selected') { - $line.=" checked "; + $line.=' checked="checked" '; } $line.=' /></td>'; } else { @@ -390,8 +453,7 @@ sub display_directory { $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />'; } if ($can_modify) { - my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information'). - '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />'; + my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'" title="'.&mt('Metadata').'" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').'" />'; my %anchor_fields = ( 'rename' => $filename, currentpath => $current_path @@ -453,20 +515,24 @@ sub display_directory { } } if ($select_mode eq 'true') { - $r->print('</table> + $r->print(&Apache::loncommon::end_data_table().' <input type="hidden" name="continue" value="true" /> <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" /> <input type="hidden" name="mode" value="selectfile" /> - <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br /> - <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" /> + <p> + <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br /> + <input type="button" name="doit" onClick="finishSelect();" value="'.&mt('Select checked files, and close window').'" /> + </p> <input type="hidden" name="currentpath" value="'.$current_path.'" /> </form>'); } else { - $r->print('</table>'); + $r->print(&Apache::loncommon::end_data_table()); if ($can_delete) { $r->print(' + <p> <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'. &Apache::loncommon::help_open_topic('Portfolio DeleteFile').' + </p> <input type="hidden" name="action" value="delete" /> <input type="hidden" name="currentpath" value="'.$current_path.'" /> </form>' @@ -668,7 +734,7 @@ sub rename { } else { &open_form($r,$url); $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file() - , '<input name="filenewname" type="input" size="50" />').'</p>'); + , '<input name="filenewname" type="text" size="50" />').'</p>'); &close_form($r,$url); } } @@ -1291,7 +1357,7 @@ sub standard_settings { &build_access_summary($r,$count,$chg,%conditionals); $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.')); + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course/community affiliation.')); } } @@ -1479,13 +1545,13 @@ sub course_row { $r->print('</table>'); } $r->print('<br />'.&mt('Add a roles-based condition'). - ' <input type="checkbox" name ="add_role_'. + ' <input type="checkbox" name="add_role_'. $num.'" onClick="javascript:setRoleOptions('."'$num', '$max_id','$content->{'domain'}','$content->{'number'}', '$uctype'".')" value="" />'); $newrole_id = $max_id; } else { - $r->print('<input type="hidden" name ="add_role_'.$num.'" value="" />'); + $r->print('<input type="hidden" name="add_role_'.$num.'" value="" />'); } $r->print(&add_course_role($num,$newrole_id)); $r->print('</td>'); @@ -1506,14 +1572,14 @@ sub domains_row { my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, 'domains'); - my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true">'. + my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="multiple">'. ' <option value="">'.&mt('Please select').'</option>'; if ($status eq 'old') { my $content = $$access_controls{$item}; foreach my $dom (@{$all_doms}) { if ((@{$content->{'dom'}} > 0) && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) { - $dom_select .= '<option value="'.$dom.'" selected>'. + $dom_select .= '<option value="'.$dom.'" selected="selected">'. $dom.'</option>'; } else { $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>'; @@ -1650,12 +1716,12 @@ sub role_selectors { 'group' => $groups, ); foreach my $item ('role','access','section','group') { - $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n"; + $output .= '<td><select name="'.$item.$longid.'" multiple="multiple" size="4">'."\n"; foreach my $entry (@{$allitems{$item}}) { if ($caller eq 'display') { if ((@{$$content{'roles'}{$role_id}{$item}} > 0) && (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) { - $output .= ' <option value="'.$entry.'" selected>'. + $output .= ' <option value="'.$entry.'" selected="selected">'. $lookup{$item}{$entry}.'</option>'; next; } @@ -1753,15 +1819,28 @@ ENDSMP </script> ENDSMP $r->print($javascript); - $r->print("<h1>".&mt('Select portfolio files')."</h1>". - &mt('Check as many as you wish in response to the problem.')."<br />"); + $r->print("<h1>".&mt('Select portfolio files')."</h1>"); my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'}); if (@otherfiles) { - $r->print("<strong>".&mt('Files selected from other directories:')."</strong><br />"); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'<th>'.&mt('Files selected from other directories:')."</th>" + .&Apache::loncommon::end_data_table_header_row() + ); foreach my $file (@otherfiles) { - $r->print($file."<br />"); + $r->print(&Apache::loncommon::start_data_table_row() + .'<td>'.$file."</td>" + .&Apache::loncommon::end_data_table_row() + ); } + $r->print(&Apache::loncommon::end_data_table() + .'<br />' + ); } + $r->print('<div>' + .&mt('Check as many files as you wish in response to the problem:') + .'</div>' + ); } @@ -2058,7 +2137,7 @@ sub missing_priv { $r->print(&mt('You do not have sufficient privileges to [_1] ', $longtext->{$priv})); if (defined($env{'form.group'})) { - $r->print(&mt("in the group's file repository.")); + $r->print(&mt("in the group's group portfolio.")); $rtnlink .= &group_args() } else { $r->print(&mt('in this portfolio.')); @@ -2166,7 +2245,7 @@ sub handler { $r->print(&mt('Not a valid group for this course')); $earlyout = 1; } - $title = &mt('Group files for [_1]', $group); + $title = &mt('Group portfolio for [_1]', $group); } else { $r->print(&mt('Invalid group')); $earlyout = 1; @@ -2194,7 +2273,7 @@ sub handler { } else { ($uname,$udom) = &get_name_dom(); $portfolio_root = &get_portfolio_root(); - $title = &mt('Portfolio Manager'); + $title = &mt('My Space'); $can_modify = 1; $can_delete = 1; $can_upload = 1; @@ -2206,25 +2285,30 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header + my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}]; + if ($env{"form.mode"} eq 'selectfile'){ $r->print(&Apache::loncommon::start_page($title,undef, {'only_body' => 1})); } elsif ($env{'form.action'} eq 'rolepicker') { $r->print(&Apache::loncommon::start_page('New role-based condition',undef, {'no_nav_bar' => 1, })); - } else { + } elsif ($caller eq 'coursegrp_portfolio') { $r->print(&Apache::loncommon::start_page($title)); + } else { + $r->print(&Apache::loncommon::start_page($title,undef, + {'bread_crumbs' => $brcrum})); + if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { + $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'. + &mt('This is a result of one of the following:').'<ul>'. + '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'. + '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'. + '</ul>'); + $r->print(&Apache::loncommon::end_page()); + return OK; + } } $r->rflush(); - if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { - $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'. - &mt('This is a result of one of the following:').'<ul>'. - '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'. - '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'. - '</ul>'); - $r->print(&Apache::loncommon::end_page()); - return OK; - } my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('port',$uname,$udom); if ($blocked) { @@ -2360,7 +2444,7 @@ sub handler { # need to know if directory is empty so it can be removed if desired my $is_empty=(@dir_list == 2); &display_common($r,$url,$current_path,$is_empty,\@dir_list, - $can_upload); + $can_upload,$group); &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, $can_upload,$can_modify,$can_delete,$can_setacl); $r->print(&Apache::loncommon::end_page());