--- loncom/interface/loncommon.pm 2009/05/08 16:08:56 1.808 +++ loncom/interface/loncommon.pm 2009/05/15 09:33:22 1.815 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.808 2009/05/08 16:08:56 droeschl Exp $ +# $Id: loncommon.pm,v 1.815 2009/05/15 09:33:22 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4215,8 +4215,8 @@ Inputs: in the title box that appears, this text is not auto translated like the $title is -=item * $notopbar, if true, keep the 'what is this' info but remove the - navigational links +=item * $no_nav_bar, if true, keep the 'what is this' info but remove the + navigational links =item * $bgcolor, used to override the bgcolor on a webpage to a specific value @@ -4242,7 +4242,7 @@ other decorations will be returned. sub bodytag { my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle, - $notopbar,$bgcolor,$notitle,$no_inline_link,$args)=@_; + $no_nav_bar,$bgcolor,$notitle,$no_inline_link,$args)=@_; if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); } @@ -4367,11 +4367,11 @@ ENDROLE " $titleinfo $dc_info".$roleinfo. ''; } - if ($notopbar) { + if ($no_nav_bar) { $bodytag .= $titletable; } else { - $bodytag .= qq|
$name ($role)
- $realm$dc_info
|; + $bodytag .= qq|
$name ($role)
+ $realm $dc_info
|; if ($env{'request.state'} eq 'construct') { $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg, $titletable); @@ -4577,20 +4577,6 @@ a:focus { background: yellow } -table.thinborder, -table.thinborder tr th { - border-style: solid; - border-width: 1px; - border-color: $lg_border_color; - background: $tabbg; -} - -table.thinborder tr td { - border-style: solid; - border-width: 1px; - border-color: $lg_border_color; -} - form, .inline { display: inline; } @@ -4648,20 +4634,11 @@ div.LC_confirm_box .LC_success img { vertical-align: middle; } -.LC_unknown { - color: yellow; -} - .LC_icon { border: none; vertical-align: middle; } -.LC_indexer_icon { - border: none; - height: 22px; -} - .LC_docs_spacer { width: 25px; height: 1px; @@ -4890,11 +4867,6 @@ td.LC_menubuttons_text { font-weight: bold; } -.LC_dropadd_labeltext { - font-family: $sans; - text-align: right; -} - .LC_preferences_labeltext { font-family: $sans; text-align: right; @@ -4908,12 +4880,6 @@ td.LC_menubuttons_text { font-weight: bold; } -table.LC_aboutme_port { - border: none; - border-collapse: collapse; - border-spacing: 0; -} - table.LC_data_table, table.LC_mail_list { border: 1px solid #000000; @@ -4957,15 +4923,13 @@ table.LC_data_table tr.LC_info_row > td } table.LC_data_table tr.LC_odd_row > td, -table.LC_pick_box tr > td.LC_odd_row, -table.LC_aboutme_port tr td { +table.LC_pick_box tr > td.LC_odd_row { background-color: $data_table_light; padding: 2px; } table.LC_data_table tr.LC_even_row > td, -table.LC_pick_box tr > td.LC_even_row, -table.LC_aboutme_port tr.LC_even_row td { +table.LC_pick_box tr > td.LC_even_row { background-color: $data_table_dark; padding: 2px; } @@ -5827,7 +5791,7 @@ ul.LC_TabContent li:hover a { } h1 { - padding:5px 10px 5px 20px; + padding: 0; line-height:130%; } @@ -5880,12 +5844,12 @@ dl,ul,div,fieldset { /* overflow: hidden; */ } -#head_userinfo { +#LC_nav_bar { float: left; margin: 0; } -#head_userinfo em{ +#LC_nav_bar em{ font-weight: bold; font-style: normal; } @@ -6503,7 +6467,7 @@ $args - additional optional args support only_body -> is true will set &bodytag() onlybodytag arg on - no_nav_bar -> is true will set &bodytag() notopbar arg on + no_nav_bar -> is true will set &bodytag() no_nav_bar arg on add_entries -> additional attributes to add to the domain -> force to color decorate a page for a specific domain @@ -6583,7 +6547,15 @@ sub start_page { $result = &html_encode($result); } - #Breadcrumbs + # Preparation for new and consistent functionlist at top of screen + # if ($args->{'functionlist'}) { + # $result .= &build_functionlist(); + #} + + # Don't add anything more if only_body wanted + return $result if $args->{'only_body'}; + + #Breadcrumbs if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) { &Apache::lonhtmlcommon::clear_breadcrumbs(); #if any br links exists, add them to the breadcrumbs @@ -6827,7 +6799,7 @@ Returns either 'student','coordinator',' ############################################### sub get_users_function { - my $function = 'student'; + my $function = 'norole'; if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; }