--- loncom/interface/loncommon.pm 2008/12/18 17:30:36 1.692.2.6 +++ loncom/interface/loncommon.pm 2009/05/19 00:16:11 1.692.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.692.2.6 2008/12/18 17:30:36 raeburn Exp $ +# $Id: loncommon.pm,v 1.692.4.1 2009/05/19 00:16:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3880,14 +3880,7 @@ sub get_domainconf { if (ref($domconfig{'login'}) eq 'HASH') { if (keys(%{$domconfig{'login'}})) { foreach my $key (keys(%{$domconfig{'login'}})) { - 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}; - } + $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key}; } } else { $legacy{'login'} = 1; @@ -4669,10 +4662,6 @@ td.LC_menubuttons_img { font-size: smaller; } -.LC_mail_functions { - font-weight: bold; -} - table.LC_aboutme_port { border: 0px; border-collapse: collapse; @@ -4705,11 +4694,6 @@ table.LC_prior_tries tr th { background-color: $data_table_head; font-size: smaller; } -table.LC_data_table tr.LC_info_row > td { - background-color: #CCC; - font-weight: bold; - text-align: left; -} table.LC_data_table tr.LC_odd_row > td, table.LC_aboutme_port tr td { background-color: $data_table_light; @@ -5486,11 +5470,6 @@ fieldset#LC_mainmenu_fieldset { margin:0px 10px 10px 0px; } - -div.LC_createcourse { - margin: 10px 10px 10px 10px; -} - END } @@ -6521,35 +6500,19 @@ sub default_quota { if ($inststatus ne '') { my @statuses = split(/:/,$inststatus); foreach my $item (@statuses) { - if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') { - if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') { - if ($defquota eq '') { - $defquota = $quotahash{'quotas'}{'defaultquota'}{$item}; - $settingstatus = $item; - } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) { - $defquota = $quotahash{'quotas'}{'defaultquota'}{$item}; - $settingstatus = $item; - } - } - } else { - if ($quotahash{'quotas'}{$item} ne '') { - if ($defquota eq '') { - $defquota = $quotahash{'quotas'}{$item}; - $settingstatus = $item; - } elsif ($quotahash{'quotas'}{$item} > $defquota) { - $defquota = $quotahash{'quotas'}{$item}; - $settingstatus = $item; - } + if ($quotahash{'quotas'}{$item} ne '') { + if ($defquota eq '') { + $defquota = $quotahash{'quotas'}{$item}; + $settingstatus = $item; + } elsif ($quotahash{'quotas'}{$item} > $defquota) { + $defquota = $quotahash{'quotas'}{$item}; + $settingstatus = $item; } } } } if ($defquota eq '') { - if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') { - $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'}; - } else { - $defquota = $quotahash{'quotas'}{'default'}; - } + $defquota = $quotahash{'quotas'}{'default'}; $settingstatus = 'default'; } } else { @@ -9488,11 +9451,6 @@ sub init_user_environment { } } - foreach my $tool ('aboutme','blog','portfolio') { - $userenv{'availabletools.'.$tool} = - &Apache::lonnet::usertools_access($username,$domain,$tool,'reload'); - } - $env{'user.environment'} = "$lonids/$cookie.id"; if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",