--- loncom/interface/loncommon.pm 2009/06/07 20:17:15 1.839 +++ loncom/interface/loncommon.pm 2009/07/08 18:36:26 1.852 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.839 2009/06/07 20:17:15 droeschl Exp $ +# $Id: loncommon.pm,v 1.852 2009/07/08 18:36:26 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4223,7 +4223,7 @@ Returns: HTML div with $content sub head_subbox { my ($content)=@_; my $output = - '
' #FIXME: solve conflicts with lonhtmlcommon:breadcrumbs LC_head_subbox + '
' .$content .'
' } @@ -4411,8 +4411,11 @@ sub bodytag { if ($no_nav_bar) { $bodytag .= $titletable; } else { - $bodytag .= qq|
$name ($role)
- $realm $dc_info
|; + $role = "($role)" if $role; + &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); + $bodytag .= qq|
$name $role
+ $realm $dc_info
| unless $env{'form.inhibitmenu'}; + if ($env{'request.state'} eq 'construct') { $bodytag .= &Apache::lonmenu::menubuttons($forcereg,$forcereg, $titletable); @@ -4566,9 +4569,9 @@ sub standard_css { my $sans = 'Verdana,Arial,Helvetica,sans-serif'; my $mono = 'monospace'; - my $data_table_head = $tabbg; - my $data_table_light = '#EEEEEE'; - my $data_table_dark = '#DDDDDD'; + my $data_table_head = $sidebg; + my $data_table_light = '#FAFAFA'; + my $data_table_dark = '#F0F0F0'; my $data_table_darker = '#CCCCCC'; my $data_table_highlight = '#FFFF00'; my $mail_new = '#FFBB77'; @@ -4605,6 +4608,14 @@ a:focus { background: yellow } +hr { + clear: both; + color: $tabbg; + background-color: $tabbg; + height: 3px; + border: none; +} + form, .inline { display: inline; } @@ -4747,14 +4758,6 @@ table#LC_title_bar.LC_with_remote { margin: 0; } -table.LC_docs_path { - width: 100%; - border: 0; - background: $pgbg; - border-collapse: collapse; - padding: 0; -} - table#LC_title_bar td { background: $tabbg; } @@ -4798,19 +4801,12 @@ table#LC_top_nav td.LC_top_nav_login { text-align: center; } -table.LC_breadcrumbs td, -table.LC_docs_path td { - background: $tabbg; - color: $fontmenu; - font-size: smaller; +.LC_breadcrumbs_component { + float: right; + margin: 0 1em; } - -table.LC_breadcrumbs td.LC_breadcrumbs_component, -table.LC_docs_path td.LC_docs_path_component { - background: $tabbg; - color: $fontmenu; - font-size: larger; - text-align: right; +.LC_breadcrumbs_component img { + vertical-align: middle; } td.LC_table_cell_checkbox { @@ -4825,21 +4821,20 @@ table#LC_mainmenu td.LC_mainmenu_column font-size: 70%; } -#LC_head_subbox { +#LC_breadcrumbs { clear:both; background: $sidebg; border-bottom: 1px solid $lg_border_color; - height: 32px; line-height: 32px; margin: 0; padding: 0; } /* Preliminary fix to hide breadcrumbs inside remote control window */ -#LC_remote #LC_head_subbox { +#LC_remote #LC_breadcrumbs { display:none; } -#LC_head_subbox2 { /* FIXME: replace by LC_head_subbox once lonhtmlcommon::breadcrumbs has been fixed */ +#LC_head_subbox { clear:both; background: #F8F8F8; /* $sidebg; */ border-bottom: 1px solid $lg_border_color; @@ -4889,10 +4884,6 @@ td.LC_menubuttons_text { font-size: small; } -.LC_mail_functions { - font-weight: bold; -} - table.LC_data_table, table.LC_mail_list { border: 1px solid #000000; @@ -5246,7 +5237,7 @@ table.LC_pick_box { } table.LC_pick_box td.LC_pick_box_title { - background: $tabbg; + background: $sidebg; font-weight: bold; text-align: right; vertical-align: top; @@ -5748,14 +5739,6 @@ div.LC_edit_problem_saves { padding-bottom: 5px; } -hr.LC_edit_problem_divide { - clear: both; - color: $tabbg; - background-color: $tabbg; - height: 3px; - border: none; -} - img.stift{ border-width: 0; vertical-align: middle; @@ -5819,7 +5802,7 @@ h2,h3,h4,h5,h6 { border-bottom:solid 1px $lg_border_color; } -.LC_ContentBoxSpecial > .LC_hcell { +.LC_Box > .LC_hcell { margin: 0 -10px 10px -10px; } @@ -5827,9 +5810,6 @@ h2,h3,h4,h5,h6 { border: 0; } - -/* Main Header with discription of Person, Course, etc. */ - .LC_Right { float: right; margin: 0; @@ -5865,7 +5845,7 @@ fieldset > legend { #LC_nav_bar { float: left; - margin: 0; + margin: 0.2em 0 0 0; } #LC_nav_bar em{ @@ -5875,9 +5855,10 @@ fieldset > legend { ol.LC_smallMenu { float: right; + margin: 0.2em 0 0 0; } -ol.LC_smallMenu, ol#LC_PathBreadcrumbs { +ol#LC_PathBreadcrumbs { margin: 0; } @@ -5904,12 +5885,10 @@ ul#LC_TabMainMenuContent { 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; @@ -5918,14 +5897,22 @@ ul#LC_TabMainMenuContent li { vertical-align: middle; } -ul.LC_TabContent , -ul.LC_TabContentBigger { +ul.LC_TabContent { display:block; + background: $sidebg; + border-bottom: solid 1px $lg_border_color list-style:none; - margin: 0; + margin: -10px -10px 0 -10px; padding: 0; } +ul.LC_TabContentBigger { + display:block; + list-style:none; + padding: 0; +} + + ul.LC_TabContent li, ul.LC_TabContentBigger li { display: inline; @@ -5941,7 +5928,7 @@ ul#LC_TabMainMenuContent li a { } ul.LC_TabContent { - min-height:1.6em; + min-height:1.5em; } ul.LC_TabContent li { @@ -5951,6 +5938,10 @@ ul.LC_TabContent li { border-bottom:solid 1px $lg_border_color; } +ul.LC_TabContent .right { + float:right; +} + ul.LC_TabContent li a, ul.LC_TabContent li { color:rgb(47,47,47); text-decoration:none; @@ -5961,7 +5952,7 @@ ul.LC_TabContent li a, ul.LC_TabContent ul.LC_TabContent li:hover, ul.LC_TabContent li.active { background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center; - border-bottom:solid 1px #FFFFFF; + border-bottom:solid 2px #FFFFFF; padding-right: 16px; } @@ -5971,12 +5962,16 @@ ul.LC_TabContentBigger li { border-left:solid 1px $lg_border_color; padding:5px 10px 5px 10px; margin-left:2px; - background:url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; + background: #d9d9d9; +} + +#maincoursedoc { + clear:both; } ul.LC_TabContentBigger li:hover, ul.LC_TabContentBigger li.active { - background:url(/adm/lonIcons/lightGreyBG.png) repeat-x right bottom; + background: #ffffff; } ul.LC_TabContentBigger li, @@ -5996,9 +5991,8 @@ ul#LC_CourseBreadcrumbs { ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, ul#LC_CourseBreadcrumbs li { - display: inline; - padding: 0 0 0 10px; - overflow:hidden; + display: inline; + white-space: nowrap; } ol#LC_MenuBreadcrumbs li a, @@ -6013,7 +6007,7 @@ ol#LC_PathBreadcrumbs li a { font-weight:bold; } -.LC_ContentBoxSpecial { +.LC_Box { border: solid 1px $lg_border_color; padding: 0 10px 10px 10px; } @@ -6106,9 +6100,7 @@ div.LC_columnSection>* { .clear { clear: both; - line-height: 0; - font-size: 0; - height: 0; + margin: 0; } .LC_loginpage_container { @@ -6259,7 +6251,7 @@ a.LC_toolbarItem { background-color:transparent; } -ul.LC_functionslist li { +ul.LC_funclist li { float: left; white-space: nowrap; height: 35px; /* at least as high as heighest list item */ @@ -6394,7 +6386,8 @@ sub xml_begin { .''; } else { - $output=''; + $output='' + .''; } return $output; } @@ -8543,7 +8536,7 @@ sub csv_print_samples { $r->print(&mt('Samples').'
'.&start_data_table(). &start_data_table_header_row()); foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { - $r->print(''.&mt('Column [_1]',($sample+1)).''); } + $r->print(''.&mt('Column [_1]',($sample+1)).''); } $r->print(&end_data_table_header_row()); foreach my $hash (@$samples) { $r->print(&start_data_table_row());