--- loncom/interface/loncommon.pm 2008/12/01 14:38:49 1.698 +++ loncom/interface/loncommon.pm 2008/12/03 13:09:03 1.704 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.698 2008/12/01 14:38:49 harmsja Exp $ +# $Id: loncommon.pm,v 1.704 2008/12/03 13:09:03 muellerd Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3880,7 +3880,14 @@ sub get_domainconf { if (ref($domconfig{'login'}) eq 'HASH') { if (keys(%{$domconfig{'login'}})) { foreach my $key (keys(%{$domconfig{'login'}})) { - $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key}; + if (ref($domconfig{'login'}{$key}) eq 'HASH') { + foreach my $img (keys(%{$domconfig{'login'}{$key}})) { + $designhash{$udom.'.login.'.$key.'_'.$img} = + $domconfig{'login'}{$key}{$img}; + } + } else { + $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key}; + } } } else { $legacy{'login'} = 1; @@ -4387,6 +4394,8 @@ sub standard_css { my $vlink = &designparm($function.'.vlink', $domain); my $link = &designparm($function.'.link', $domain); + my $loginbg = &designparm('login.sidebg',$domain); + my $sans = 'Verdana,Arial,Helvetica,sans-serif'; my $mono = 'monospace'; my $data_table_head = $tabbg; @@ -4404,7 +4413,7 @@ sub standard_css { my $mail_other_hover = '#669999'; my $table_header = '#DDDDDD'; my $feedback_link_bg = '#BBBBBB'; - my $lg_border_color = '#D5FF6F'; + my $lg_border_color = '#C8C8C8'; my $border = ($env{'browser.type'} eq 'explorer' || $env{'browser.type'} eq 'safari' ) ? '0px 2px 0px 2px' @@ -4415,9 +4424,10 @@ sub standard_css { body{ font-family: $sans; line-height:130%; - font-size:0.8em; + font-size:0.83em; color:$font; } +a:link, a:visited { font-size:100%; } a:focus { color: red; background: yellow } table.thinborder, @@ -4435,6 +4445,11 @@ table.thinborder tr td { form, .inline { display: inline; } .center { text-align: center; } +.left { text-align:left; } +.right {text-align:right;} +.middle {vertical-align:middle;} +.top {vertical-align:top;} +.bottom {vertical-align:bottom;} .LC_filename {font-family: $mono; white-space:pre;} .LC_error { color: red; @@ -4496,7 +4511,6 @@ table#LC_title_bar.LC_with_remote { border-collapse: collapse; padding: 0px; } - table.LC_docs_path { width: 100%; border: 0; @@ -4594,6 +4608,7 @@ table#LC_mainmenu td.LC_mainmenu_column color: $font; font-family: $sans; font-size: 90%; + padding-left:3px; } .LC_menubuttons_link { @@ -4609,8 +4624,7 @@ table#LC_mainmenu td.LC_mainmenu_column } td.LC_menubuttons_text { - color: $font; - width: 90%; + color: $font; } td.LC_menubuttons_img { } @@ -4665,7 +4679,7 @@ td.LC_menubuttons_img { } .LC_roleslog_note { - font-size: smaller; + font-size: small; } table.LC_aboutme_port { @@ -4698,7 +4712,7 @@ table.LC_data_table tr th, table.LC_cale table.LC_prior_tries tr th { font-weight: bold; background-color: $data_table_head; - font-size: smaller; + font-size:90%; } table.LC_data_table tr.LC_odd_row > td, table.LC_aboutme_port tr td { @@ -4730,7 +4744,7 @@ table.LC_nested tr.LC_empty_row td { table.LC_nested_outer tr th { font-weight: bold; background-color: $data_table_head; - font-size: smaller; + font-size: small; border-bottom: 1px solid #000000; } table.LC_nested_outer tr td.LC_subheader { @@ -4769,7 +4783,7 @@ table.LC_createuser { } table.LC_createuser tr.LC_section_row td { - font-size: smaller; + font-size: small; } table.LC_createuser tr.LC_info_row td { @@ -4863,7 +4877,7 @@ table.LC_data_table tr.LC_browser_folder } span.LC_current_location { - font-size: x-large; + font-size:larger; background: $pgbg; } @@ -5467,7 +5481,7 @@ ul#TabMainMenuContent a:hover, } h1 { - padding:5px 10px 5px 20px; + padding:5px 10px 5px 0px; line-height:130%; } @@ -5479,14 +5493,8 @@ line-height:130%; .hcell{ padding:3px 15px 3px 15px; margin:0px; - background: $pgbg; - border-bottom:solid 1px $lg_border_color; -} -.right { - text-align: right; -} -.left { - text-align: left; + background-color:$tabbg; + border-bottom:solid 1px $lg_border_color; } .noBorder { border:0px; @@ -5655,7 +5663,6 @@ dl.ListStyleClean dd { margin: 0px; padding: 5px 5px 5px 10px; clear: both; - /*display:block;*/ } .ListStyleClean li, @@ -5714,7 +5721,8 @@ div.columnSection > .ContentBoxSpecial width:65%; padding: 10px; height: auto; - background-color:#FFFFFF; +# background-color:#FFFFFF; + background-color:$loginbg; border:1px solid #CCCCCC; }