--- loncom/interface/loncommon.pm 2010/05/18 00:44:12 1.948.2.2 +++ loncom/interface/loncommon.pm 2010/05/18 03:48:44 1.948.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.948.2.2 2010/05/18 00:44:12 raeburn Exp $ +# $Id: loncommon.pm,v 1.948.2.6 2010/05/18 03:48:44 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3701,10 +3701,13 @@ sub submlink { } if (!$symb) { $symb=&Apache::lonnet::symbread(); } $symb=&escape($symb); - if ($target) { $target="target=\"$target\""; } - return ''.$text.''; + if ($target) { $target=" target=\"$target\""; } + return + ''.$text.''; } ############################################## @@ -4857,10 +4860,6 @@ sub standard_css { my $vlink = &designparm($function.'.vlink', $domain); 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'; my $data_table_head = $sidebg; @@ -4901,7 +4900,8 @@ body { color:$font; } -a:focus { ++a:focus, ++a:focus img { color: red; background: yellow; } @@ -5126,6 +5126,7 @@ td.LC_table_cell_checkbox { background: #F8F8F8; /* $sidebg; */ border: 1px solid $sidebg; margin: 0 0 10px 0; + padding: 3px; } .LC_fontsize_medium { @@ -6095,7 +6096,7 @@ fieldset > legend { #LC_nav_bar { float: left; - margin: 0; + margin: 0 0 2px 0; } #LC_realm { @@ -6110,6 +6111,11 @@ fieldset > legend { font-style: normal; } +/* Preliminary fix to hide nav_bar inside bookmarks window */ +#LC_bookmarks #LC_nav_bar { + display:none; +} + ol.LC_primary_menu { float: right; margin: 0; @@ -6184,7 +6190,7 @@ ul.LC_TabContent { ul.LC_TabContent li { vertical-align:middle; - padding: 0 10px 0 10px; + padding: 0 16px 0 10px; background-color:$tabbg; border-bottom:solid 1px $lg_border_color; border-right: solid 1px $font; @@ -6200,12 +6206,14 @@ ul.LC_TabContent li { text-decoration:none; font-size:95%; font-weight:bold; - padding-right: 16px; min-height:20px; } -ul.LC_TabContent li a:hover { +ul.LC_TabContent li a:hover, +ul.LC_TabContent li a:focus { color: $button_hover; + background:none; + outline:none; } ul.LC_TabContent li:hover { @@ -6220,6 +6228,11 @@ ul.LC_TabContent li.active { cursor: default; } +ul.LC_TabContent li.active a { + color:$font; + background:#FFFFFF; + outline: none; +} #maincoursedoc { clear:both; } @@ -6238,6 +6251,10 @@ ul.LC_TabContentBigger li { color: #737373; } +ul.LC_TabContentBigger li.active { + position: relative; + top: 1px; +} ul.LC_TabContentBigger li a { background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat; @@ -6246,31 +6263,33 @@ ul.LC_TabContentBigger li a { text-align: center; display: block; text-decoration: none; + outline: none; } -ul.LC_TabContentBigger li:hover a, ul.LC_TabContentBigger li.active a { background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat; color:$font; - text-decoration: underline; } - ul.LC_TabContentBigger li b { background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom; display: block; float: left; padding: 0 30px; + border-bottom: 1px solid $lg_border_color; +} + +ul.LC_TabContentBigger li:hover b { + color:$button_hover; } -ul.LC_TabContentBigger li:hover b, ul.LC_TabContentBigger li.active b { background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat; color:$font; - border-bottom: 1px solid #FFFFFF; + border: 0; + cursor:default; } - ul.LC_CourseBreadcrumbs { background: $sidebg; line-height: 32px; @@ -6396,52 +6415,6 @@ div.LC_columnSection>* { overflow:hidden; } -.LC_loginpage_container { - text-align:left; - margin : 0 auto; - width:90%; - padding: 10px; - height: auto; - background-color:#FFFFFF; - border:1px solid #CCCCCC; -} - - -.LC_loginpage_loginContainer { - float:left; - width: 182px; - padding: 2px; - border:1px solid #CCCCCC; - background-color:$loginbg; -} - -.LC_loginpage_loginContainer h2 { - margin-top: 0; - display:block; - background:$bgcol; - color:$textcol; - padding-left:5px; -} - -.LC_loginpage_loginInfo { - float:left; - width:182px; - border:1px solid #CCCCCC; - padding:2px; -} - -.LC_loginpage_space { - clear: both; - margin-bottom: 20px; - border-bottom: 1px solid #CCCCCC; -} - -.LC_loginpage_floatLeft { - float: left; - width: 200px; - margin: 0; -} - table em { font-weight: bold; font-style: normal; @@ -6986,15 +6959,26 @@ sub simple_error_page { { my @row_count; + + sub start_data_table_count { + unshift(@row_count, 0); + return; + } + + sub end_data_table_count { + shift(@row_count); + return; + } + sub start_data_table { my ($add_class) = @_; my $css_class = (join(' ','LC_data_table',$add_class)); - unshift(@row_count,0); + &start_data_table_count(); return '