--- loncom/interface/loncommon.pm 2008/12/08 22:43:52 1.711 +++ loncom/interface/loncommon.pm 2008/12/14 00:33:35 1.715 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.711 2008/12/08 22:43:52 raeburn Exp $ +# $Id: loncommon.pm,v 1.715 2008/12/14 00:33:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1686,17 +1686,17 @@ sub select_form { sub display_filter { if (!$env{'form.show'}) { $env{'form.show'}=10; } if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; } - return ' '. + ' '. &mt('Filter [_1]', &select_form($env{'form.displayfilter'}, 'displayfilter', ('currentfolder' => 'Current folder/page', 'containing' => 'Containing phrase', 'none' => 'None'))). - ''; + ''; } sub gradeleveldescription { @@ -4392,6 +4392,8 @@ sub standard_css { my $link = &designparm($function.'.link', $domain); my $loginbg = &designparm('login.sidebg',$domain); + my $bgcol = &designparm('login.bgcol',$domain); + my $textcol = &designparm('login.textcol',$domain); my $sans = 'Verdana,Arial,Helvetica,sans-serif'; my $mono = 'monospace'; @@ -4665,6 +4667,10 @@ td.LC_menubuttons_text { font-size: small; } +.LC_mail_functions { + font-weight: bold; +} + table.LC_aboutme_port { border: 0px; border-collapse: collapse; @@ -5699,19 +5705,26 @@ div.columnSection > .ContentBoxSpecial width:65%; padding: 10px; height: auto; -# background-color:#FFFFFF; - background-color:$loginbg; + background-color:#FFFFFF; border:1px solid #CCCCCC; } .LC_loginpage_loginContainer { float:left; - width:60%; + width: 182px; + border:1px solid #CCCCCC; + background-color:$loginbg; } +.LC_loginpage_loginContainer h1{ + margin-top:0; + display:block; + background:$bgcol; + color:$textcol; + padding-left:5px; +} .LC_loginpage_loginInfo { - margin-top:20px; margin-left:20px; float:left; width:30%; @@ -5719,6 +5732,13 @@ div.columnSection > .ContentBoxSpecial padding:10px; } +.LC_loginpage_loginDomain { + margin-right:20px; + width:20%; + float:left; + padding:10px; +} + .LC_loginpage_space { clear:both; margin-bottom:20px; @@ -5738,7 +5758,6 @@ div.columnSection > .ContentBoxSpecial } - END } @@ -6002,11 +6021,21 @@ sub start_page { } if ($args->{'js_ready'}) { - $result = &js_ready($result); + $result = &js_ready($result); } if ($args->{'html_encode'}) { - $result = &html_encode($result); + $result = &html_encode($result); } + + if (exists $args->{'bread_crumbs'}) { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + my $temp = $args->{'bread_crumbs'}; + foreach my $crumb (@$temp){ + &Apache::lonhtmlcommon::add_breadcrumb($crumb); + } + $result .= &Apache::lonhtmlcommon::breadcrumbs(); + } + return $result; }