--- loncom/interface/loncommon.pm 2009/11/18 20:47:59 1.916 +++ loncom/interface/loncommon.pm 2009/11/20 04:12:43 1.917 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.916 2009/11/18 20:47:59 droeschl Exp $ +# $Id: loncommon.pm,v 1.917 2009/11/20 04:12:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4503,9 +4503,8 @@ sub bodytag { $env{'course.'.$env{'request.course.id'}. '.domain'}.'/'})) { my $cid = $env{'request.course.id'}; - $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'}; + $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'}; $dc_info =~ s/\s+$//; - $dc_info = '('.$dc_info.')'; } $role = '('.$role.')' if $role; @@ -4526,6 +4525,9 @@ sub bodytag { if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { + if ($dc_info) { + $dc_info = qq|$dc_info|; + } $bodytag .= qq|
$name $role
$realm $dc_info
|; return $bodytag; @@ -4538,7 +4540,10 @@ sub bodytag { $bodytag .= Apache::lonmenu::primary_menu(); - $bodytag .= qq|
$realm
$dc_info
|; + if ($dc_info) { + $dc_info = &dc_courseid_toggle($dc_info); + } + $bodytag .= qq|
$realm $dc_info
|; #don't show menus for public users if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){ @@ -4571,11 +4576,15 @@ sub bodytag { # Explicit link to get inline menu my $menu= ($no_inline_link?'' :''.&mt('Switch to Inline Menu Mode').''); + + if ($dc_info) { + $dc_info = qq|($dc_info)|; + } + $bodytag .= qq|
$name $role
  1. $menu
  2. -
$realm
$dc_info
| unless $env{'form.inhibitmenu'}; - # +
$realm $dc_info
| unless $env{'form.inhibitmenu'}; return(< @@ -4588,6 +4597,14 @@ $bodytag ENDBODY } +sub dc_courseid_toggle { + my ($dc_info) = @_; + return ' '. + ''. + &mt('(More ...)').''. + '
'.$dc_info.'
'; +} + sub make_attr_string { my ($register,$attr_ref) = @_; @@ -5210,6 +5227,7 @@ table.LC_createuser tr.LC_info_row td { table.LC_calendar { border: 1px solid #000000; border-collapse: collapse; + width: 98%; } table.LC_calendar_pickdate { @@ -5219,6 +5237,7 @@ table.LC_calendar_pickdate { table.LC_calendar tr td { border: 1px solid #000000; vertical-align: top; + width: 14%; } table.LC_calendar tr td.LC_calendar_day_empty { @@ -5916,6 +5935,13 @@ div.LC_createcourse { margin: 10px 10px 10px 10px; } +.LC_dccid { + margin: 0.2em 0 0 0; + padding: 0; + font-size: 90%; + display:none; +} + /* ---- Remove when done ---- # The following styles is part of the redesign of LON-CAPA and are # subject to change during this project.