--- loncom/interface/loncommon.pm 2008/12/01 15:03:40 1.699 +++ loncom/interface/loncommon.pm 2008/12/04 08:56:28 1.705 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.699 2008/12/01 15:03:40 raeburn Exp $ +# $Id: loncommon.pm,v 1.705 2008/12/04 08:56:28 tempelho Exp $ # # Copyright Michigan State University Board of Trustees # @@ -271,7 +271,7 @@ BEGIN { } } &Apache::lonnet::logthis( - "INFO: Read file types"); + "INFO: Read file types"); $readit=1; } # end of unless($readit) @@ -926,7 +926,7 @@ sub help_open_topic { if ($text ne "") { $template .= "". - "
$text"; + "$text"; } # Add the graphic @@ -935,7 +935,7 @@ sub help_open_topic { $template .= <<"ENDTEMPLATE"; (Help: $topic) ENDTEMPLATE - if ($text ne '') { $template.='
' }; + if ($text ne '') { $template.='' }; return $template; } @@ -1128,7 +1128,7 @@ sub help_open_bug { { $template .= "". - "
$text"; + "$text"; } # Add the graphic @@ -1173,7 +1173,7 @@ sub help_open_faq { { $template .= "". - "'); + $r->print(&start_data_table_row().''); $r->print('
$text"; + "$text"; } # Add the graphic @@ -2770,7 +2770,7 @@ sub aboutmewrapper { sub syllabuswrapper { my ($linktext,$coursedir,$domain,$fontcolor)=@_; if ($fontcolor) { - $linktext=''.$linktext.''; + $linktext=''.$linktext.''; } return qq{$linktext}; } @@ -4220,7 +4220,7 @@ ENDROLE .''.&mt('Construction Space').': ' .'
' - .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem
" + .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem
" .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()') .'
' .&Apache::lonmenu::constspaceform(); @@ -4394,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; @@ -4411,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' @@ -4422,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, @@ -4442,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; @@ -4503,7 +4511,6 @@ table#LC_title_bar.LC_with_remote { border-collapse: collapse; padding: 0px; } - table.LC_docs_path { width: 100%; border: 0; @@ -4597,10 +4604,31 @@ table#LC_mainmenu td.LC_mainmenu_column vertical-align: top; } +.LC_fontsize_small +{ + font-size: 70%; +} + +.LC_fontsize_medium +{ + font-size: 85%; +} + +.LC_fontsize_large +{ + font-size: 120%; +} + +.LC_fontcolor_red +{ + color: #FF0000; +} + .LC_menubuttons_inline_text { color: $font; font-family: $sans; font-size: 90%; + padding-left:3px; } .LC_menubuttons_link { @@ -4616,8 +4644,7 @@ table#LC_mainmenu td.LC_mainmenu_column } td.LC_menubuttons_text { - color: $font; - width: 90%; + color: $font; } td.LC_menubuttons_img { } @@ -4672,7 +4699,7 @@ td.LC_menubuttons_img { } .LC_roleslog_note { - font-size: smaller; + font-size: small; } table.LC_aboutme_port { @@ -4705,7 +4732,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 { @@ -4737,7 +4764,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 { @@ -4776,7 +4803,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 { @@ -4870,7 +4897,7 @@ table.LC_data_table tr.LC_browser_folder } span.LC_current_location { - font-size: x-large; + font-size:larger; background: $pgbg; } @@ -5325,7 +5352,8 @@ div.LC_grade_select_mode_selector { float: left; } div.LC_grade_select_mode_selector_header { - font: bold medium $sans; + font-weight: bold; + font-size: medium; } div.LC_grade_select_mode_type { clear: left; @@ -5338,7 +5366,8 @@ div.LC_grade_show_user { div.LC_grade_user_name { background: #DDDDEE; border-bottom: 1px solid black; - font: bold large $sans; + font-weight: bold; + font-size: large; } div.LC_grade_show_user_odd_row div.LC_grade_user_name { background: #DDEEDD; @@ -5357,7 +5386,8 @@ div.LC_grade_show_problem_header, div.LC_grade_submissions_header, div.LC_grade_message_center_header, div.LC_grade_assign_header { - font: bold large $sans; + font-weight: bold; + font-size: large; } div.LC_grade_show_problem_problem, div.LC_grade_submissions_body, @@ -5368,7 +5398,8 @@ div.LC_grade_assign_body { background: #FFFFFF; } span.LC_grade_check_note { - font: normal medium $sans; + font-weight: normal; + font-size: medium; display: inline; position: absolute; right: 1em; @@ -5383,7 +5414,8 @@ table.LC_scantron_action tr th { } .LC_edit_problem_header, div.LC_edit_problem_footer { - font: normal medium $sans; + font-weight: normal; + font-size: medium; margin: 2px; } div.LC_edit_problem_header, @@ -5400,12 +5432,14 @@ div.LC_edit_problem_header_edit_row { margin-bottom: 5px; } div.LC_edit_problem_header_title { - font: larger bold $sans; + font-weight: bold; + font-size: larger; background: $tabbg; padding: 3px; } table.LC_edit_problem_header_title { - font: larger bold $sans; + font-size: larger; + font-weight: bold; width: 100%; border-color: $pgbg; border-style: solid; @@ -5474,7 +5508,7 @@ ul#TabMainMenuContent a:hover, } h1 { - padding:5px 10px 5px 20px; + padding:5px 10px 5px 0px; line-height:130%; } @@ -5486,14 +5520,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; @@ -5662,7 +5690,6 @@ dl.ListStyleClean dd { margin: 0px; padding: 5px 5px 5px 10px; clear: both; - /*display:block;*/ } .ListStyleClean li, @@ -5721,7 +5748,8 @@ div.columnSection > .ContentBoxSpecial width:65%; padding: 10px; height: auto; - background-color:#FFFFFF; +# background-color:#FFFFFF; + background-color:$loginbg; border:1px solid #CCCCCC; } @@ -7598,9 +7626,9 @@ sub upload_embedded { ' '. $orig_uploaded_filename.'
'; } else { - $output .= ''. + $output .= ''. &mt('View embedded file: [_1]',''. - $orig_uploaded_filename.'').'
'; + $orig_uploaded_filename.'').'
'; } } close($fh); @@ -7947,7 +7975,7 @@ sub csv_print_select_table { &end_data_table_header_row()."\n"); foreach my $array_ref (@$d) { my ($value,$display,$defaultcol)=@{ $array_ref }; - $r->print(&start_data_table_row().'		'.$display.'
'.$display.'