--- loncom/interface/portfolio.pm 2013/07/03 16:00:03 1.247 +++ loncom/interface/portfolio.pm 2013/08/21 15:42:22 1.250 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.247 2013/07/03 16:00:03 raeburn Exp $ +# $Id: portfolio.pm,v 1.250 2013/08/21 15:42:22 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -536,7 +536,7 @@ sub display_directory {


- +

'); @@ -1179,24 +1179,29 @@ sub update_access { my $now = time; my $then = $now + (60*60*24*180); # six months approx. &open_form($r,$url); - my %showtypes = &Apache::lonlocal::texthash ( + my %showtypes = ( course => 'course/community', domains => 'domain', users => 'user', ); foreach my $newitem (@types) { - if ($env{'form.new'.$newitem} > 0) { - $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; - my @numbers; - for (my $i=$firstitem; $i<$lastitem; $i++) { - push(@numbers,$i); - } - &display_access_row($r,$status,$newitem,\@numbers, - $access_controls{$file_name},$now,$then); + next if ($env{'form.new'.$newitem} <= 0); + $r->print( + '

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

'); + $firstitem = $totalnew; + $lastitem = $totalnew + $env{'form.new'.$newitem}; + $totalnew = $lastitem; + my @numbers; + for (my $i=$firstitem; $i<$lastitem; $i++) { + push(@numbers,$i); } + &display_access_row($r,$status,$newitem,\@numbers, + $access_controls{$file_name},$now,$then); } &close_form($r,$url); } else { @@ -1465,19 +1470,14 @@ sub acl_status { sub access_element { my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_; - my %typetext = &Apache::lonlocal::texthash( + my %typetext = ( domains => 'Domain', users => 'User', course => 'Course/Community' ); - $r->print('

'.&mt('[_1]-based conditional access: ',$typetext{$type})); + $r->print('

'.&mt($typetext{$type}.'-based conditional access:').' '); if ($$acl_count{$type}) { - $r->print($$acl_count{$type}.' '); - if ($$acl_count{$type} > 1) { - $r->print(&mt('conditions')); - } else { - $r->print(&mt('condition')); - } + $r->print(&mt('[quant,_1,condition]',$$acl_count{$type})); } else { $r->print(&mt('Off')); } @@ -1488,13 +1488,16 @@ sub access_element { sub display_access_row { my ($r,$status,$type,$items,$access_controls,$now,$then) = @_; - my $showtype; + my ($showtype, $infotype); if ($type eq 'course') { $showtype = &mt('Courses/Communities'); + $infotype = 'Course/Community'; } elsif ($type eq 'domains') { $showtype = &mt('Domains'); + $infotype = 'Domain'; } elsif ($type eq 'users') { $showtype = &mt('Users'); + $infotype = 'User'; } if (@{$items} > 0) { my @all_doms; @@ -1532,8 +1535,12 @@ sub display_access_row { } $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&mt('No [_1]-based conditions defined.',$showtype).'
'. - &additional_item($type)); + $r->print( + '

' + .&mt('No '.$infotype.'-based conditions defined') + .'

' + .&additional_item($type) + ); } return; } @@ -1541,6 +1548,7 @@ sub display_access_row { sub course_js { return qq| |; } @@ -1632,7 +1641,7 @@ sub course_row { } $r->print('
'.&mt('Add a roles-based condition'). ' {'domain'}','$content->{'number'}', '$showtype'".')" value="" />'); $newrole_id = $max_id; @@ -1697,14 +1706,16 @@ sub additional_item { my ($type) = @_; my $showtype; if ($type eq 'course') { - $showtype = &mt('course/community'); + $showtype = 'course/community'; } elsif ($type eq 'domains') { - $showtype = &mt('domains'); + $showtype = 'domain'; } elsif ($type eq 'users') { - $showtype = &mt('users'); + $showtype = 'user'; } - my $output = &mt('Add new [_1] condition(s)?',$showtype).' '.&mt('Number to add: ').''; - return $output; + return + &mt('Add new '.$showtype.'-based condition(s)?') + .' '.&mt('Number to add: ') + .''; } sub actionbox { @@ -2615,7 +2626,7 @@ sub handler { } else { ($uname,$udom) = &get_name_dom(); $portfolio_root = &get_portfolio_root(); - $title = &mt('My Space'); + $title = 'My Space'; $can_modify = 1; $can_delete = 1; $can_upload = 1;