--- loncom/interface/loncommon.pm 2010/08/14 04:32:03 1.948.2.7 +++ loncom/interface/loncommon.pm 2010/09/24 03:33:37 1.948.2.10 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.948.2.7 2010/08/14 04:32:03 raeburn Exp $ +# $Id: loncommon.pm,v 1.948.2.10 2010/09/24 03:33:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3422,7 +3422,7 @@ sub get_previous_attempt { } $prevattempts=&start_data_table().&start_data_table_header_row(); $prevattempts.=''.&mt('History').''; - my %typeparts; + my (%typeparts,%lasthidden); my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'}); foreach my $key (sort(keys(%lasthash))) { my ($ign,@parts) = split(/\./,$key); @@ -3433,6 +3433,9 @@ sub get_previous_attempt { unless ($showsurv) { my $id = join(',',@parts); $typeparts{$ign.'.'.$id} = $lasthash{$key}; + if (($lasthash{$key} eq 'anonsurvey') || ($lasthash{$key} eq 'anonsurveycred')) { + $lasthidden{$ign.'.'.$id} = 1; + } } delete($lasthash{$key}); } else { @@ -3447,7 +3450,6 @@ sub get_previous_attempt { } } $prevattempts.=&end_data_table_header_row(); - my %lasthidden; if ($getattempt eq '') { for ($version=1;$version<=$returnhash{'version'};$version++) { my @hidden; @@ -3455,11 +3457,6 @@ sub get_previous_attempt { foreach my $id (keys(%typeparts)) { if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) { push(@hidden,$id); - $lasthidden{$id} = 1; - } elsif ($lasthidden{$id}) { - if (exists($returnhash{$version.':'.$id.'.award'})) { - delete($lasthidden{$id}); - } } } } @@ -4754,7 +4751,7 @@ ENDBODY sub dc_courseid_toggle { my ($dc_info) = @_; - return ' '. + return ' '. ''. &mt('(More ...)').''. '
'.$dc_info.'
'; @@ -4910,8 +4907,8 @@ body { color:$font; } -+a:focus, -+a:focus img { +a:focus, +a:focus img { color: red; background: yellow; } @@ -5503,6 +5500,14 @@ span.LC_parm_symb { color: #AAAAAA; } +ul.LC_parm_parmlist li { + display: inline-block; + padding: 0.3em 0.8em; + vertical-align: top; + width: 150px; + border-top:1px solid $lg_border_color; +} + td.LC_parm_overview_level_menu, td.LC_parm_overview_map_menu, td.LC_parm_overview_parm_selectors, @@ -10788,16 +10793,20 @@ sub init_user_environment { $initial_env{"browser.interface"} = $form->{'interface'}; $env{'browser.interface'}=$form->{'interface'}; } + my %is_adv = ( is_adv => &Apache::lonnet::is_advanced_user($domain,$username) ); + my %domdef = &Apache::lonnet::get_domain_defaults($domain); foreach my $tool ('aboutme','blog','portfolio') { $userenv{'availabletools.'.$tool} = - &Apache::lonnet::usertools_access($username,$domain,$tool,'reload'); + &Apache::lonnet::usertools_access($username,$domain,$tool,'reload', + undef,\%userenv,\%domdef,\%is_adv); } foreach my $crstype ('official','unofficial','community') { $userenv{'canrequest.'.$crstype} = &Apache::lonnet::usertools_access($username,$domain,$crstype, - 'reload','requestcourses'); + 'reload','requestcourses', + \%userenv,\%domdef,\%is_adv); } $env{'user.environment'} = "$lonids/$cookie.id";