--- loncom/interface/portfolio.pm 2008/01/21 11:36:07 1.187 +++ loncom/interface/portfolio.pm 2010/03/26 22:27:06 1.221 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.187 2008/01/21 11:36:07 bisitz Exp $ +# $Id: portfolio.pm,v 1.221 2010/03/26 22:27:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,7 @@ use Apache::lonnet; use Apache::longroup; use Apache::lonhtmlcommon; use HTML::Entities; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub group_args { my $output; @@ -80,63 +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:'); + 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"; +
+ + + +END + } + + $r->print('
'.$help_portfolio); + # Upload File + $r->print('
' + .'
' + .'
' + .''.$lt{'upload_label'}.'' + .$groupitem + .'' + .'' + .'' + .'' + .'' + .'' + .$help_fileupload + .$parse_check + .'
' + .'
' + .'
' + ); + # Create Subdirectory + $r->print('
' + .'
' + .'
' + .''.$lt{'createdir_label'}.'' + .''.$groupitem + .'' + .'' + .'' + .'' + .'' + .$help_createdir + .'
' + .'
' + .'
' + ); + $r->print('
'); + } # end "if can_upload" - $r->print(<<"TABLE"); - - - - - - - - - -
- $text{'upload_label'} - -
- $groupitem - - - - - - $help_fileupload -
-
- $text{'createdir_label'} - -
- $groupitem - - - - - $help_createdir -
-
-TABLE - } my @tree = split (/\//,$current_path); my %anchor_fields = ( 'selectfile' => $port_path, @@ -145,6 +158,7 @@ TABLE 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); + $r->print('
'); $r->print(''.&make_anchor($url,\%anchor_fields,$port_path).'/'); if (@tree > 1){ my $newCurrentPath = '/'; @@ -170,20 +184,62 @@ TABLE $r->print(""); } +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 = ' +
'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB ('.$percent.'%)',$quota.' MB')."\n". +'
'."\n". +'
'."\n". +'
'."\n". +'
'; + 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(''); + $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(''); + $r->print(''); $r->print(''.$version_flag.''); } else { # this is a graded or handed back file - my ($user,$domain) = &get_name_dom(); + my ($user,$domain) = &get_name_dom($env{'form.group'}); my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user); if (defined($$permissions_hash{$fullpath})) { foreach my $array_item (@{$$permissions_hash{$fullpath}}) { @@ -212,15 +268,19 @@ sub display_directory_line { $r->print(''.$size.''); $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); if ($select_mode ne 'true') { - $r->print(''. - &mt($curr_access).'   '); + $r->print('  '); # Display status + $r->print('' + .&mt($curr_access).'   ' + ); my %anchor_fields = ( 'access' => $filename, 'currentpath' => $current_path ); $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).''); + } else { + $r->print('  '); # Display status } - $r->print(''.$/); + $r->print(&Apache::loncommon::end_data_table_row().$/); } sub display_directory { @@ -231,7 +291,7 @@ sub display_directory { my $select_mode; my $checked_files; my $port_path = &get_port_path(); - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $access_admin_text = &mt('View Status'); if ($can_setacl) { $access_admin_text = &mt('View/Change Status'); @@ -252,7 +312,9 @@ sub display_directory { $display_out = '
'. &group_form_data(). ''. + '

'. ''. + '

'. ''. ''. '
'; @@ -262,21 +324,30 @@ sub display_directory { } if ($select_mode eq 'true') { $r->print('
'); - $r->print(''. - ''); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .'' + .'' + .'' + .'' + .'' + .'' + .&Apache::loncommon::end_data_table_header_row() + ); } else { $r->print(''); $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', &mt('Using the portfolio file list'))); - $r->print('
Select  NameSizeLast Modified
'.&mt('Select').'  '.&mt('Name').''.&mt('Size').''.&mt('Last Modified').' 
'. - '' + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() .'' .'' .'' .'' .'' + .'' .'' - .''); + .&Apache::loncommon::end_data_table_header_row()); } $r->print("\n".&group_form_data()."\n"); @@ -334,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(''); - $r->print(''); + $r->print(''); + $r->print(''.&mt('closed folder').'' + .''); my %anchor_fields = ( 'selectfile' => $filename.'/', 'currentpath' => $current_path.$filename.'/', @@ -347,7 +423,9 @@ sub display_directory { 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); - $r->print(''); + $r->print('' + .''); + $r->print(' '); $r->print(''); } else { my $css_class = 'LC_browser_file'; @@ -355,7 +433,7 @@ sub display_directory { if ($select_mode eq 'true') { $line=''; + $line.=''; $css_class= 'LC_browser_file_locked'; } else { if (!$can_modify) { @@ -375,13 +453,12 @@ sub display_directory { $line .= ''; } if ($can_modify) { - my $cat=''.&mt('Catalog Information'). - ''; + my $cat=''.&mt('Metadata').''; my %anchor_fields = ( 'rename' => $filename, currentpath => $current_path ); - $line .= &make_anchor($url,\%anchor_fields,'Rename'); + $line .= &make_anchor($url,\%anchor_fields,&mt('Rename')); $line .= '
'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'  '.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').''.&mt('Size').''.&mt('Last Modified').' '.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'
'.&mt('closed folder').'Go to ...
'.&mt('Go to ...').''.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').''.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').'
$fullpath ); - $line.=''.&make_anchor($url,\%anchor_fields,'Locked').''.&make_anchor($url,\%anchor_fields,&mt('Locked')).''.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat); # ''.$cat.''; } @@ -438,20 +515,24 @@ sub display_directory { } } if ($select_mode eq 'true') { - $r->print('
+ $r->print(&Apache::loncommon::end_data_table().' -
- +

+
+ +

'); } else { - $r->print(''); + $r->print(&Apache::loncommon::end_data_table()); if ($can_delete) { $r->print(' - '. +

+ '. &Apache::loncommon::help_open_topic('Portfolio DeleteFile').' +

' @@ -531,19 +612,19 @@ sub done { } sub delete { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my @check; my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; $file_name = &prepend_group($file_name); my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print("The file is locked and cannot be deleted.
"); + $r->print(&mt('The file is locked and cannot be deleted.').'
'); $r->print(&done('Back',$url)); } else { if (scalar(@files)) { &open_form($r,$url); - $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); + $r->print('

'.&mt('Delete [_1]?',&display_file(undef,\@files)).'

'); &close_form($r,$url); } else { $r->print("No file was checked to delete.
"); @@ -556,7 +637,7 @@ sub delete_confirmed { my ($r,$url,$group)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $port_path = &get_port_path(); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); @@ -610,23 +691,25 @@ sub delete_confirmed { sub delete_dir { my ($r,$url)=@_; &open_form($r,$url); - $r->print('

'.&mt('Delete').' '.&display_file().'?

'); + $r->print('

'.&mt('Delete [_1]?',&display_file()).'

'); &close_form($r,$url); } sub delete_dir_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $directory_name = $env{'form.currentpath'}; $directory_name =~ s|/$||; # remove any trailing slash - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $namespace = &get_namespace(); my $port_path = &get_port_path(); my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $directory_name); if ($result ne 'ok') { - $r->print(' An error occurred (dir) ('.$result. - ') while trying to delete '.$directory_name.'
'); + $r->print('' + .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].' + ,$result,$directory_name) + .'
'); } else { # now remove from recent &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']); @@ -641,17 +724,17 @@ sub delete_dir_confirmed { } sub rename { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $file_name = $env{'form.currentpath'}.$env{'form.rename'}; - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); $file_name = &prepend_group($file_name); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { $r->print("The file is locked and cannot be renamed.
"); $r->print(&done(undef,$url)); } else { &open_form($r,$url); - $r->print('

'.&mt('Rename').' '.&display_file().' to - ?

'); + $r->print('

'.&mt('Rename [_1] to [_2]?', &display_file() + , '').'

'); &close_form($r,$url); } } @@ -659,7 +742,7 @@ sub rename { sub rename_confirmed { my ($r,$url,$group)=@_; my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $port_path = &get_port_path(); if ($filenewname eq '') { $r->print(''. @@ -677,9 +760,9 @@ sub rename_confirmed { $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname); } else { $r->print(''. - &mt('An error occurred ([_1]) while trying to rename [_2]' - .' to [_3]',$result,&display_file(), - &display_file('',$filenewname)).'
'); + &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].' + ,$result,&display_file(),&display_file('',$filenewname)) + .'
'); return; } if ($filenewname ne $env{'form.filenewname'}) { @@ -743,7 +826,7 @@ sub access_for_renamed { sub display_access { my ($r,$url,$group,$can_setacl,$port_path,$action) = @_; - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; $file_name = &prepend_group($file_name); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, @@ -758,13 +841,13 @@ sub display_access { $info .= '
  • '.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.'); $info .= '
  • '.&explain_conditionals(); $info .= '
    • '. - &mt('A listing of files viewable without log-in is available at: ')."http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio.
    "; + &mt('A listing of files viewable without log-in is available at: ')."".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio.
    "; if ($group eq '') { $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:"); } else { $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:"); } - $info .= "
    http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme
    "; + $info .= "
    ".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme
    "; if ($group ne '') { $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'
    '; } @@ -782,7 +865,7 @@ sub display_access { $action); my $button_text = { 'continue' => &mt('Proceed'), - 'cancel' => &mt('Back to Directory'), + 'cancel' => &mt('Return to directory'), }; &close_form($r,$url,$button_text); } else { @@ -797,7 +880,7 @@ sub display_access { sub explain_conditionals { return &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
    '."\n". - &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'
    '."\n". + &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').'
    '."\n". &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); } @@ -810,7 +893,7 @@ sub view_access_settings { $todisplay{$scope}{$key} = $$access_controls{$key}; } if ($aclcount) { - $r->print(&mt('

    Current access controls defined for this file:

    ')); + $r->print('

    '.&mt('Current access controls defined for this file:').'

    '); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Access control').''.&mt('Dates available'). @@ -821,12 +904,12 @@ sub view_access_settings { &build_access_summary($r,$count,$chg,%todisplay); $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No access control settings currently exist for this file.
    ' )); + $r->print(&mt('No access control settings currently exist for this file.').'
    '); } my %anchor_fields = ( 'currentpath' => $env{'form.currentpath'} ); - $r->print('
    '.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing'))); + $r->print('
    '.&make_anchor($url, \%anchor_fields, &mt('Return to directory'))); return; } @@ -838,7 +921,7 @@ sub build_access_summary { guest => 'Passphrase-protected', domains => 'Conditional: domain-based', users => 'Conditional: user-based', - course => 'Conditional: course-based', + course => 'Conditional: course/community-based', ); my @allscopes = ('public','guest','domains','users','course'); foreach my $scope (@allscopes) { @@ -863,11 +946,16 @@ sub build_access_summary { } } $r->print(''.&mt($scope_desc{$scope})); + my $crstype; if ($scope eq 'course') { if ($chg ne 'delete') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); $r->print('
    ('.$course_description{'description'}.')'); + $crstype = 'Course'; + if ($course_description{'type'} ne '') { + $crstype = $course_description{'type'}; + } } } $r->print(''.&mt('Start: ').$showstart. @@ -887,8 +975,6 @@ sub build_access_summary { foreach my $item ('role','access','section','group') { $r->print(''); if ($item eq 'role') { - my $ucscope = $scope; - $ucscope =~ s/^(\w)/uc($1)/e; my $role_output; foreach my $role (@{$content->{'roles'}{$id}{$item}}) { if ($role eq 'all') { @@ -896,7 +982,7 @@ sub build_access_summary { } elsif ($role =~ /^cr/) { $role_output .= (split('/',$role))[3].','; } else { - $role_output .= &Apache::lonnet::plaintext($role,$ucscope).','; + $role_output .= &Apache::lonnet::plaintext($role,$crstype).','; } } $role_output =~ s/,$//; @@ -957,7 +1043,7 @@ sub update_access { $r->print('

    '.&mt('Allowing others to retrieve file: [_1]', $port_path.$file_name).'

    '."\n"); $file_name = &prepend_group($file_name); - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my ($errors,$outcome,$deloutcome,$new_values,$translation); if ($totalprocessed) { ($outcome,$deloutcome,$new_values,$translation) = @@ -1022,16 +1108,22 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - foreach my $newitem ('course','domains','users') { + my @types = ('course','domains','users'); + foreach my $newitem (@types) { $allnew += $env{'form.new'.$newitem}; } if ($allnew > 0) { my $now = time; my $then = $now + (60*60*24*180); # six months approx. &open_form($r,$url); - foreach my $newitem ('course','domains','users') { + my %showtypes = &Apache::lonlocal::texthash ( + course => 'course/community', + domains => 'domain', + users => 'user', + ); + foreach my $newitem (@types) { if ($env{'form.new'.$newitem} > 0) { - $r->print('
    '.&mt('Add new [_1]-based access control for portfolio file: [_2]',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'

    '); + $r->print('
    '.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]',''.$showtypes{$newitem},'',''.$env{'form.currentpath'}.$env{'form.selectfile'}.'').'

    '); $firstitem = $totalnew; $lastitem = $totalnew + $env{'form.new'.$newitem}; $totalnew = $lastitem; @@ -1051,7 +1143,7 @@ sub update_access { ); $r->print('
    '.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file'))); delete $anchor_fields{'access'}; - $r->print('     '.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing'))); + $r->print('     '.&make_anchor($url,\%anchor_fields,&mt('Return to directory'))); } return; } @@ -1274,7 +1366,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.')); } } @@ -1308,10 +1400,12 @@ sub acl_status { sub access_element { my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_; - my $title = $type; - $title =~ s/s$//; - $title =~ s/^(\w)/uc($1)/e; - $r->print('

    '.&mt('[_1]-based conditional access: ',$title)); + my %typetext = &Apache::lonlocal::texthash( + domains => 'Domain', + users => 'User', + course => 'Course/Community' + ); + $r->print('

    '.&mt('[_1]-based conditional access: ',$typetext{$type}).': '); if ($$acl_count{$type}) { $r->print($$acl_count{$type}.' '); if ($$acl_count{$type} > 1) { @@ -1329,17 +1423,24 @@ sub access_element { sub display_access_row { my ($r,$status,$type,$items,$access_controls,$now,$then) = @_; + my $showtype; + if ($type eq 'course') { + $showtype = &mt('Courses/Communities'); + } elsif ($type eq 'domains') { + $showtype = &mt('Domains'); + } elsif ($type eq 'users') { + $showtype = &mt('Users'); + } if (@{$items} > 0) { my @all_doms; my $colspan = 3; - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); - $r->print(''.&mt('Action?').''.&mt($uctype).''. + $r->print(''.&mt('Action?').''.$showtype.''. &mt('Dates available').''); if ($type eq 'course' && $status eq 'old') { - $r->print(''.&mt('Allowed [_1] member affiliations',$type). + + $r->print(''.&mt('Allowed course/community affiliations'). ''); $colspan ++; } elsif ($type eq 'domains') { @@ -1366,8 +1467,8 @@ sub display_access_row { } $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No [_1]-based conditions defined.',$type).'
    ' - .&additional_item($type)); + $r->print(&mt('No [_1]-based conditions defined.',$showtype).'
    '. + &additional_item($type)); } return; } @@ -1428,17 +1529,20 @@ sub course_row { } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $uctype = $type; - $uctype =~ s/^(\w)/uc($1)/e; + my $showtype = &mt('Course/Community'); + my $crstype = 'Course'; my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, $type); $r->print(''.$js.&actionbox($status,$num,$scope).''); if ($status eq 'old') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); + if ($course_description{'type'} ne '') { + $crstype = $course_description{'type'}; + } $r->print(''.$course_description{'description'}.''); } elsif ($status eq 'new') { - $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'  '); + $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$showtype).'  '); } $r->print(''.&dateboxes($num,$start,$end)); my $newrole_id = 1; @@ -1456,19 +1560,19 @@ sub course_row { $max_id = $role_id; } $max_id ++; - my $role_selects = &role_selectors($num,$role_id,$type,$content,'display'); - $r->print('
    '.$role_selects.''); + my $role_selects = &role_selectors($num,$role_id,$crstype,$content,'display'); + $r->print('
    '.$role_selects.''); } $r->print(''); } $r->print('
    '.&mt('Add a roles-based condition'). - ' {'domain'}','$content->{'number'}', - '$uctype'".')" value="" />'); + '$showtype'".')" value="" />'); $newrole_id = $max_id; } else { - $r->print(''); + $r->print(''); } $r->print(&add_course_role($num,$newrole_id)); $r->print(''); @@ -1489,14 +1593,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 = ''. ' '; 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 .= ''; } else { $dom_select .= ''; @@ -1526,13 +1630,21 @@ sub users_row { sub additional_item { my ($type) = @_; - my $output = &mt('Add new [_1] condition(s)?',$type).' '.&mt('Number to add: ').''; + my $showtype; + if ($type eq 'course') { + $showtype = &mt('course/community'); + } elsif ($type eq 'domains') { + $showtype = &mt('domains'); + } elsif ($type eq 'users') { + $showtype = &mt('users'); + } + my $output = &mt('Add new [_1] condition(s)?',$showtype).' '.&mt('Number to add: ').''; return $output; } sub actionbox { my ($status,$num,$scope) = @_; - my $output = '
    '. '