--- loncom/interface/loncommon.pm 2009/05/08 13:38:41 1.807 +++ loncom/interface/loncommon.pm 2009/05/14 16:59:21 1.813 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.807 2009/05/08 13:38:41 droeschl Exp $ +# $Id: loncommon.pm,v 1.813 2009/05/14 16:59:21 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4370,8 +4370,8 @@ ENDROLE if ($notopbar) { $bodytag .= $titletable; } else { - $bodytag .= qq|
$name ($role)
- $realm
|; + $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; @@ -4723,7 +4700,7 @@ table#LC_nav_location { table#LC_title_bar a { color: $fontmenu; } - + table#LC_title_bar { /*display: none;*/ } @@ -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; } @@ -5914,11 +5878,27 @@ ol.LC_smallMenu a { text-decoration: none; } -ol#LC_TabMainMenuContent { +ul#LC_TabMainMenuContent { clear: both; + color: $fontmenu; + background: $tabbg; + list-style: none; + padding: 0; + margin: 0; + float:left; + width: 100%; +} + +ul#LC_TabMainMenuContent li { + float: left; + font-weight: bold; + line-height: 1.8em; + padding: 0 0.8em; + border-right: 1px solid black; + display: inline; + vertical-align: middle; } -ol#LC_TabMainMenuContent, ul.LC_TabContent , ul.LC_TabContentBigger { display:block; @@ -5927,7 +5907,6 @@ ul.LC_TabContentBigger { padding: 0; } -ol#LC_TabMainMenuContent li, ul.LC_TabContent li, ul.LC_TabContentBigger li { display: inline; @@ -5937,18 +5916,8 @@ ul.LC_TabContentBigger li { white-space:nowrap; } -ol#LC_TabMainMenuContent li { - vertical-align: bottom; - border-bottom: solid 1px RGB(175, 175, 175); - padding: 5px 10px 5px 10px; - margin-right:5px; - margin-bottom:3px; - font-weight: bold; - background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; -} - -ol#LC_TabMainMenuContent li a { - color: RGB(47, 47, 47); +ul#LC_TabMainMenuContent li a { + color: $fontmenu; text-decoration: none; } @@ -6578,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