--- loncom/interface/loncommon.pm 2008/12/02 23:39:26 1.701 +++ loncom/interface/loncommon.pm 2008/12/05 09:41:48 1.708 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.701 2008/12/02 23:39:26 harmsja Exp $ +# $Id: loncommon.pm,v 1.708 2008/12/05 09:41:48 bisitz 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 .= "". - "'."\n";; } @@ -7596,9 +7587,9 @@ sub upload_embedded { ' '. $orig_uploaded_filename.'
'; } else { - $output .= ''. + $output .= ''. &mt('View embedded file: [_1]',''. - $orig_uploaded_filename.'').'
'; + $orig_uploaded_filename.'').'
'; } } close($fh); @@ -7945,7 +7936,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().''); + $r->print(&start_data_table_row().''); $r->print('
$text"; + "$text"; } # Add the graphic @@ -2768,10 +2768,7 @@ sub aboutmewrapper { sub syllabuswrapper { - my ($linktext,$coursedir,$domain,$fontcolor)=@_; - if ($fontcolor) { - $linktext=''.$linktext.''; - } + my ($linktext,$coursedir,$domain)=@_; return qq{$linktext}; } @@ -4220,7 +4217,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 +4391,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; @@ -4543,21 +4542,15 @@ table#LC_title_bar td.LC_title_bar_role_ padding: 0px; } -table#LC_menubuttons_mainmenu { - width: 100%; - border: 0px; - border-spacing: 1px; - padding: 0px 1px; - margin: 0px; - border-collapse: separate; -} -table#LC_menubuttons img, table#LC_menubuttons_mainmenu img { +table#LC_menubuttons img{ border: 0px; } table#LC_top_nav td { background: $tabbg; border: 0px; font-size: small; + vertical-align:top; + padding:2px 5px 2px 5px; } table#LC_top_nav td a, div#LC_top_nav a { color: $font; @@ -4602,6 +4595,26 @@ 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; @@ -4624,8 +4637,8 @@ table#LC_mainmenu td.LC_mainmenu_column td.LC_menubuttons_text { color: $font; } -td.LC_menubuttons_img { -} + + .LC_current_location { font-family: $sans; @@ -4637,34 +4650,6 @@ td.LC_menubuttons_img { font-weight: bold; } -.LC_rolesmenu_is { - font-family: $sans; -} - -.LC_rolesmenu_selected { - font-family: $sans; -} - -.LC_rolesmenu_future { - font-family: $sans; -} - - -.LC_rolesmenu_will { - font-family: $sans; -} - -.LC_rolesmenu_will_not { - font-family: $sans; -} - -.LC_rolesmenu_expired { - font-family: $sans; -} - -.LC_rolesinfo { - font-family: $sans; -} .LC_dropadd_labeltext { font-family: $sans; @@ -4837,24 +4822,6 @@ table.LC_mail_list tr.LC_mail_even { table.LC_mail_list tr.LC_mail_odd { } -table#LC_cstr_controls { - width: 100%; - border-collapse: collapse; -} -table#LC_cstr_controls tr td { - border: 4px solid $pgbg; - padding: 4px; - text-align: center; - background: $tabbg; -} -table#LC_cstr_controls tr th { - border: 4px solid $pgbg; - background: $table_header; - text-align: center; - font-family: $sans; - font-size: smaller; -} - table.LC_data_table tr > td.LC_browser_file, table.LC_data_table tr > td.LC_browser_file_published { background: #CCFF88; @@ -4874,6 +4841,25 @@ table.LC_data_table tr.LC_browser_folder background: #CCCCFF; } +table.LC_data_table tr > td.LC_roles_is { +/* background: #77FF77; */ +} +table.LC_data_table tr > td.LC_roles_future { + background: #FFFF77; +} +table.LC_data_table tr > td.LC_roles_will { + background: #FFAA77; +} +table.LC_data_table tr > td.LC_roles_expired { + background: #FF7777; +} +table.LC_data_table tr > td.LC_roles_will_not { + background: #AAFF77; +} +table.LC_data_table tr > td.LC_roles_selected { + background: #11CC55; +} + span.LC_current_location { font-size:larger; background: $pgbg; @@ -5330,7 +5316,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; @@ -5343,7 +5330,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; @@ -5362,7 +5350,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, @@ -5373,7 +5362,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; @@ -5388,7 +5378,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, @@ -5405,12 +5396,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; @@ -5458,10 +5451,7 @@ table#LC_mainmenu td.LC_mainmenu_col_fie font-size: small; font-weight: bold; } -fieldset#LC_mainmenu_fieldset { - margin:0px 10px 10px 0px; -} /* ---- Remove when done ---- # The following styles is part of the redesign of LON-CAPA and are # subject to change during this project. @@ -5491,8 +5481,8 @@ line-height:130%; .hcell{ padding:3px 15px 3px 15px; margin:0px; - background: $tabbg; - border-bottom:solid 1px $lg_border_color; + background-color:$tabbg; + border-bottom:solid 1px $lg_border_color; } .noBorder { border:0px; @@ -5719,7 +5709,8 @@ div.columnSection > .ContentBoxSpecial width:65%; padding: 10px; height: auto; - background-color:#FFFFFF; +# background-color:#FFFFFF; + background-color:$loginbg; border:1px solid #CCCCCC; } @@ -6172,7 +6163,7 @@ sub simple_error_page { } sub start_data_table_empty_row { - $row_count[0]++; +# $row_count[0]++; return '
'.$display.'
'.$display.'