--- loncom/interface/loncommon.pm 2008/12/03 00:09:56 1.702 +++ loncom/interface/loncommon.pm 2008/12/18 16:58:26 1.724 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.702 2008/12/03 00:09:56 harmsja Exp $ +# $Id: loncommon.pm,v 1.724 2008/12/18 16:58:26 raeburn 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";; } @@ -6788,19 +6858,35 @@ sub default_quota { if ($inststatus ne '') { my @statuses = split(/:/,$inststatus); foreach my $item (@statuses) { - 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 (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 ($defquota eq '') { - $defquota = $quotahash{'quotas'}{'default'}; + if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') { + $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'}; + } else { + $defquota = $quotahash{'quotas'}{'default'}; + } $settingstatus = 'default'; } } else { @@ -7596,9 +7682,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 +8031,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 @@ -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 { @@ -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,10 @@ 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 = $tabbg; @@ -4442,12 +4443,21 @@ 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_center { text-align: center; } +.LC_left { text-align:left; } +.LC_right {text-align:right;} +.LC_middle {vertical-align:middle;} +.LC_top {vertical-align:top;} +.LC_bottom {vertical-align:bottom;} + +/* just for tests */ +.LC_300Box { width:300px; } +.LC_200Box {width:200px; } +.LC_500Box {width:500px; } +.LC_600Box {width:600px; } +/* end */ + .LC_filename {font-family: $mono; white-space:pre;} .LC_error { color: red; @@ -4455,7 +4465,7 @@ form, .inline { display: inline; } } .LC_warning, .LC_diff_removed { - color: red; + } .LC_info, @@ -4543,21 +4553,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 +4606,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 +4648,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 +4661,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; @@ -4680,6 +4676,10 @@ td.LC_menubuttons_img { font-size: small; } +.LC_mail_functions { + font-weight: bold; +} + table.LC_aboutme_port { border: 0px; border-collapse: collapse; @@ -4712,14 +4712,22 @@ table.LC_prior_tries tr th { background-color: $data_table_head; font-size:90%; } +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_pick_box tr > td.LC_odd_row, table.LC_aboutme_port tr td { background-color: $data_table_light; padding: 2px; } table.LC_data_table tr.LC_even_row > td, +table.LC_pick_box tr > td.LC_even_row, table.LC_aboutme_port tr.LC_even_row td { background-color: $data_table_dark; + padding: 2px; } table.LC_data_table tr.LC_data_table_highlight td { background-color: $data_table_darker; @@ -4837,24 +4845,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 +4864,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; @@ -5319,23 +5328,6 @@ div.LC_clear_float_footer { } -div.LC_grade_select_mode { - font-family: $sans; -} -div.LC_grade_select_mode div div { - margin: 5px; -} -div.LC_grade_select_mode_selector { - margin: 5px; - float: left; -} -div.LC_grade_select_mode_selector_header { - font: bold medium $sans; -} -div.LC_grade_select_mode_type { - clear: left; -} - div.LC_grade_show_user { margin-top: 20px; border: 1px solid black; @@ -5343,7 +5335,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 +5355,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 +5367,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 +5383,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 +5401,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 +5456,11 @@ table#LC_mainmenu td.LC_mainmenu_col_fie font-size: small; font-weight: bold; } -fieldset#LC_mainmenu_fieldset { - margin:0px 10px 10px 0px; +div.LC_createcourse { + margin: 10px 10px 10px 10px; } + /* ---- Remove when done ---- # The following styles is part of the redesign of LON-CAPA and are # subject to change during this project. @@ -5470,41 +5469,46 @@ fieldset#LC_mainmenu_fieldset { # --------------------------*/ a:hover, -ol.smallMenu a:hover, -ol#MenuBreadcrumbs a:hover, -ul#TabMainMenuContent a:hover, -.FormSectionClearButton input:hover{ +ol.LC_smallMenu a:hover, +ol#LC_MenuBreadcrumbs a:hover, +ol#LC_PathBreadcrumbs a:hover, +ul#LC_TabMainMenuContent a:hover, +.LC_FormSectionClearButton input:hover +ul.LC_TabContent li:hover a{ color:#BF2317; text-decoration:none; } h1 { - padding:5px 10px 5px 0px; + padding:5px 10px 5px 20px; line-height:130%; } h2,h3,h4,h5,h6 { -margin:5px 0px 5px 0px; -line-height:130%; + margin:5px 0px 5px 0px; + padding:0px; + line-height:130%; } -.hcell{ +.LC_hcell{ padding:3px 15px 3px 15px; margin:0px; - background-color:$pgbg; - background-color:$ border-bottom:solid 1px $lg_border_color; + background-color:$tabbg; + border-bottom:solid 1px $lg_border_color; } -.noBorder { +.LC_noBorder { border:0px; } -/* -.bgLightGrey { background:URL(images/TabMenuBG.png) repeat-x left top; } -.bgLightGreyYellow {background-color:#EFECE0;} -*/ +.LC_bgLightGrey{ + background:URL(/adm/lonIcons/lightGreyBG.png) repeat-x left top; +} +.LC_bgLightGreyYellow { + background-color:#EFECE0; +} /* Main Header with discription of Person, Course, etc. */ -.HeadRight { +.LC_HeadRight { text-align: right; float: right; margin: 0px; @@ -5514,12 +5518,12 @@ line-height:130%; overflow:hidden; } -p { +p, .LC_ContentBox { padding: 10px; } -.FormSectionClearButton input { - background-color:transparent; +.LC_FormSectionClearButton input { + border:0px; cursor:pointer; text-decoration:underline; @@ -5530,55 +5534,80 @@ dl,ul,div,fieldset { margin: 10px 10px 10px 0px; overflow:hidden; } -ol.smallMenu { +ol.LC_smallMenu, ol#LC_PathBreadcrumbs { margin: 0px; } -ol.smallMenu li { +ol.LC_smallMenu li { display: inline; padding: 5px 5px 0px 10px; vertical-align: top; } -ol.smallMenu li img { +ol.LC_smallMenu li img { vertical-align: bottom; } -ol.smallMenu a { +ol.LC_smallMenu a { font-size: 90%; color: RGB(80, 80, 80); text-decoration: none; } -ol#TabMainMenuContent { - +ol#LC_TabMainMenuContent { + display:block; + list-style:none; margin: 0px 0px 10px 0px; padding: 0px; } -ol#TabMainMenuContent li { +ol#LC_TabMainMenuContent li { display: inline; vertical-align: bottom; border-bottom: solid 1px RGB(175, 175, 175); border-right: solid 1px RGB(175, 175, 175); - padding: 5px 15px 5px 15px; - margin-right:4px; + padding: 5px 10px 5px 10px; + margin-right:3px; line-height: 140%; font-weight: bold; - overflow:hidden; -/* background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;*/ + white-space:nowrap; + background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } -ol#TabMainMenuContent li a{ +ol#LC_TabMainMenuContent li a{ color: RGB(47, 47, 47); text-decoration: none; } - -ol#TabMainMenuContent div.columnSection { - margin-bottom: 0px; +ul.LC_TabContent { + margin:0px; + padding:0px; + display:block; + list-style:none; + min-height:1.5em; +} +ul.LC_TabContent li{ + display:inline; + vertical-align:top; + border-bottom:solid 1px $lg_border_color; + border-right:solid 1px $lg_border_color; + padding:5px 10px 5px 10px; + margin-right:2px; + background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; +} +ul.LC_TabContent li a, ul.LC_TabContent li{ + color:rgb(47,47,47); + text-decoration:none; + font-size:95%; + font-weight:bold; + white-space:nowrap; +} +.LC_hideThis +{ + display:none; + visibility:hidden; } -ol#MenuBreadcrumbs, ol#PathBreadcrumbs { +ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs { border-top: solid 1px RGB(255, 255, 255); height: 20px; line-height: 20px; @@ -5586,36 +5615,31 @@ ol#MenuBreadcrumbs, ol#PathBreadcrumbs { margin: 0px 0px 30px 0px; padding-left: 10px; list-style-position: inside; -/* background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left - top;*/ + background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } -ol#MenuBreadcrumbs li, ol#PathBreadcrumbs li { -/* background: url(images/pfeil_white.png) no-repeat left center;*/ +ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li { + background: url(/adm/lonIcons/arrow_white.png) no-repeat left center; display: inline; padding: 0px 0px 0px 10px; vertical-align: bottom; overflow:hidden; } -ol#MenuBreadcrumbs li a { +ol#LC_MenuBreadcrumbs li a { text-decoration: none; font-size:90%; } -ol#PathBreadcrumbs li a{ +ol#LC_PathBreadcrumbs li a{ text-decoration:none; font-size:100%; font-weight:bold; } - -.ContentBoxSpecial +.LC_ContentBoxSpecial { border: solid 1px $lg_border_color; } -.ContentBox { - padding:10px; -} -.PopUp +.LC_PopUp { padding:10px; border-left:solid 1px $lg_border_color; @@ -5629,20 +5653,20 @@ ol#PathBreadcrumbs li a{ z-index:5; } -dl.ListStyleClean dt { +dl.LC_ListStyleClean dt { padding-right: 5px; display: table-header-group; } -dl.ListStyleClean dd { +dl.LC_ListStyleClean dd { display: table-row; } -.ListStyleClean, -.ListStyleSimple, -.ListStyleNormal, -.ListStyleNormal_Border, -.ListStyleSpecial +.LC_ListStyleClean, +.LC_ListStyleSimple, +.LC_ListStyleNormal, +.LC_ListStyleNormal_Border, +.LC_ListStyleSpecial { /*display:block; */ list-style-position: inside; @@ -5651,66 +5675,87 @@ dl.ListStyleClean dd { padding: 0px; } -.ListStyleSimple li, -.ListStyleSimple dd, -.ListStyleNormal li, -.ListStyleNormal dd, -.ListStyleSpecial li, -.ListStyleSpecial dd +.LC_ListStyleSimple li, +.LC_ListStyleSimple dd, +.LC_ListStyleNormal li, +.LC_ListStyleNormal dd, +.LC_ListStyleSpecial li, +.LC_ListStyleSpecial dd { margin: 0px; padding: 5px 5px 5px 10px; clear: both; } -.ListStyleClean li, -.ListStyleClean dd { +.LC_ListStyleClean li, +.LC_ListStyleClean dd { padding-top: 0px; padding-bottom: 0px; } -.ListStyleSimple dd, -.ListStyleSimple li{ +.LC_ListStyleSimple dd, +.LC_ListStyleSimple li{ border-bottom: solid 1px $lg_border_color; } -.ListStyleSpecial li, -.ListStyleSpecial dd { +.LC_ListStyleSpecial li, +.LC_ListStyleSpecial dd { list-style-type: none; background-color: RGB(220, 220, 220); margin-bottom: 4px; } -table.SimpleTable { +table.LC_SimpleTable { margin:5px; border:solid 1px $lg_border_color; } -table.SimpleTable tr { +table.LC_SimpleTable tr { padding:0px; border:solid 1px $lg_border_color; } -table.SimpleTable thead{ +table.LC_SimpleTable thead{ background:rgb(220,220,220); } -div.columnSection { +div.LC_columnSection { display: block; clear: both; overflow: hidden; margin:0px; } -div.columnSection>* { +div.LC_columnSection>* { float: left; margin: 10px 20px 10px 0px; overflow:hidden; } -div.columnSection > .ContentBox, -div.columnSection > .ContentBoxSpecial +div.LC_columnSection > .LC_ContentBox, +div.LC_columnSection > .LC_ContentBoxSpecial { - width: 400px; - + width: 400px; +} + +.ContentBoxSpecialTemplate +{ + border: solid 1px $lg_border_color; +} +.ContentBoxTemplate { + padding:10px; +} + +div.LC_columnSection > .ContentBoxTemplate, +div.LC_columnSection > .ContentBoxSpecialTemplate + { + width: 600px; + +} + +.clear{ + clear: both; + line-height: 0px; + font-size: 0px; + height: 0px; } .LC_loginpage_container { @@ -5726,11 +5771,19 @@ div.columnSection > .ContentBoxSpecial .LC_loginpage_loginContainer { float:left; - width:60%; + width: 182px; + 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 { - margin-top:20px; margin-left:20px; float:left; width:30%; @@ -5738,6 +5791,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; @@ -5757,7 +5817,6 @@ div.columnSection > .ContentBoxSpecial } - END } @@ -6021,11 +6080,22 @@ 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(); + if (ref($args->{'bread_crumbs'}) eq 'ARRAY') { + foreach my $crumb (@{$args->{'bread_crumbs'}}){ + &Apache::lonhtmlcommon::add_breadcrumb($crumb); + } + } + $result .= &Apache::lonhtmlcommon::breadcrumbs(); + } + return $result; } @@ -6172,7 +6242,7 @@ sub simple_error_page { } sub start_data_table_empty_row { - $row_count[0]++; +# $row_count[0]++; return '
'.$display.'
'.$display.'