[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm
raeburn
lon-capa-cvs-allow@mail.lon-capa.org
Sun, 06 Jul 2008 05:01:57 -0000
raeburn Sun Jul 6 01:01:57 2008 EDT
Modified files:
/loncom/interface loncommon.pm
Log:
- Mising <span>
- Include $context argument in sub commit_customrole() and pass along to &lonnet::assigncustomrole().
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.663 loncom/interface/loncommon.pm:1.664
--- loncom/interface/loncommon.pm:1.663 Sun Jun 29 23:56:27 2008
+++ loncom/interface/loncommon.pm Sun Jul 6 01:01:52 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.663 2008/06/30 03:56:27 raeburn Exp $
+# $Id: loncommon.pm,v 1.664 2008/07/06 05:01:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -8544,8 +8544,9 @@
}
}
}
- $text .= '<tr><td><label><input type="checkbox" name="usecategory" value="'
- .$item.'"'.$checked.' />'.$name.'</label></span></td><td>';
+ $text .= '<tr><td><span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="usecategory" value="'.
+ $item.'"'.$checked.' />'.$name.'</label></span></td><td>';
if (ref($path) eq 'ARRAY') {
push(@{$path},$name);
$text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
@@ -8565,12 +8566,12 @@
sub commit_customrole {
- my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
+ my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
($start?', '.&mt('starting').' '.localtime($start):'').
($end?', ending '.localtime($end):'').': <b>'.
&Apache::lonnet::assigncustomrole(
- $udom,$uname,$url,$three,$four,$five,$end,$start).
+ $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context).
'</b><br />';
return $output;
}