--- loncom/interface/portfolio.pm 2013/07/03 16:00:03 1.247
+++ loncom/interface/portfolio.pm 2013/12/18 01:29:20 1.251
@@ -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.251 2013/12/18 01:29:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -536,7 +536,7 @@ sub display_directory {
<input type="hidden" name="mode" value="selectfile" />
<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').'" />
+ <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>');
@@ -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('<br />'.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]','<b>'.$showtypes{$newitem},'</b>','<b>'.$env{'form.currentpath'}.$env{'form.selectfile'}.'</b>').'<br /><br />');
- $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(
+ '<p>'
+ .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]',
+ '<b>','</b>',
+ '<span class="LC_filename"><b>'
+ .$env{'form.currentpath'}.$env{'form.selectfile'}.'</b></span>')
+ .'</p>');
+ $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('<h3>'.&mt('[_1]-based conditional access: ',$typetext{$type}));
+ $r->print('<h3>'.&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).'<br />'.
- &additional_item($type));
+ $r->print(
+ '<p class="LC_info">'
+ .&mt('No '.$infotype.'-based conditions defined')
+ .'</p>'
+ .&additional_item($type)
+ );
}
return;
}
@@ -1541,6 +1548,7 @@ sub display_access_row {
sub course_js {
return qq|
<script type="text/javascript">
+// <![CDATA[
function setRoleOptions(num,roleid,cdom,cnum,type) {
updateIndexNum = getIndexByValue('update',num);
var addItem = 'add_role_'+num;
@@ -1580,6 +1588,7 @@ function getIndexByValue(name,value) {
return -1;
}
+// ]]>
</script>
|;
}
@@ -1632,7 +1641,7 @@ sub course_row {
}
$r->print('<br />'.&mt('Add a roles-based condition').
' <input type="checkbox" name="add_role_'.
- $num.'" onClick="javascript:setRoleOptions('."'$num',
+ $num.'" onclick="javascript:setRoleOptions('."'$num',
'$max_id','$content->{'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: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
- return $output;
+ return
+ &mt('Add new '.$showtype.'-based condition(s)?')
+ .' '.&mt('Number to add: ')
+ .'<input type="text" name="new'.$type.'" size="3" value="0" />';
}
sub actionbox {
@@ -2389,7 +2400,7 @@ sub get_group_quota {
if (%curr_groups) {
my %group_info = &Apache::longroup::get_group_settings(
$curr_groups{$group});
- $group_quota = $group_info{'quota'}; #expressed in Mb
+ $group_quota = $group_info{'quota'}; #expressed in MB
if ($group_quota) {
$group_quota = 1000 * $group_quota; #expressed in k
}
@@ -2511,8 +2522,8 @@ sub get_quota {
}
} else {
$disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
- $env{'user.domain'}); #expressed in Mb
- $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+ $env{'user.domain'}); #expressed in MB
+ $disk_quota = 1000 * $disk_quota; # convert from MB to kB
}
return $disk_quota;
}
@@ -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;