--- loncom/interface/loncommon.pm 2009/05/19 22:52:10 1.822 +++ loncom/interface/loncommon.pm 2009/05/27 17:14:56 1.828 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.822 2009/05/19 22:52:10 bisitz Exp $ +# $Id: loncommon.pm,v 1.828 2009/05/27 17:14:56 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -407,6 +407,7 @@ sub studentbrowser_javascript { ) { return ''; } return (<<'ENDSTDBRW'); ENDSTDBRW } @@ -461,6 +463,7 @@ sub selectstudent_link { sub authorbrowser_javascript { return <<"ENDAUTHORBRW"; ENDAUTHORBRW } @@ -482,6 +486,7 @@ sub coursebrowser_javascript { my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role'); my $output = ' '; return $output; } @@ -829,6 +835,7 @@ sub linked_select_forms { # output the javascript to do the changing my $result = ''; $result.=' END # output the initial values for the selection lists @@ -1027,7 +1035,9 @@ sub update_help_link { my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage"; my $output .= <<"ENDOUTPUT"; ENDOUTPUT return $output; @@ -1394,6 +1404,7 @@ sub resize_textarea_js { my $geometry = &viewport_geometry_js(); return <<"RESIZE"; RESIZE @@ -2299,7 +2311,7 @@ sub authform_internal{ $result = &mt ('[_1] Internally authenticated (with initial password [_2])', ''.$autharg); - $result.="'; + $result.="'; return $result; } @@ -4668,7 +4680,6 @@ div.LC_confirm_box .LC_success img { .LC_disc_action_links_bar { background: $tabbg; - font-family: $sans; border: none; margin: 4px; } @@ -4726,7 +4737,6 @@ table#LC_title_bar.LC_with_remote { border-width: $border; background: $pgbg; color: $fontmenu; - font-family: $sans; border-collapse: collapse; padding: 0; margin: 0; @@ -4736,7 +4746,6 @@ table.LC_docs_path { width: 100%; border: 0; background: $pgbg; - font-family: $sans; border-collapse: collapse; padding: 0; } @@ -4748,7 +4757,7 @@ table#LC_title_bar td { table#LC_title_bar .LC_title_bar_who { background: $tabbg; color: $fontmenu; - font: small $sans; + font: small; text-align: right; margin: 0; } @@ -4765,10 +4774,6 @@ table#LC_title_bar div.LC_title_bar_real margin: 0; } -span.LC_metadata { - font-family: $sans; -} - table#LC_menubuttons img{ border: none; } @@ -4784,7 +4789,6 @@ table#LC_top_nav td { table#LC_top_nav td a, div#LC_top_nav a { color: $font; - font-family: $sans; } table#LC_top_nav td.LC_top_nav_logo { @@ -4813,7 +4817,6 @@ table.LC_breadcrumbs td, table.LC_docs_path td { background: $tabbg; color: $fontmenu; - font-family: $sans; font-size: smaller; } @@ -4821,7 +4824,6 @@ table.LC_breadcrumbs td.LC_breadcrumbs_c table.LC_docs_path td.LC_docs_path_component { background: $tabbg; color: $fontmenu; - font-family: $sans; font-size: larger; text-align: right; } @@ -4866,7 +4868,6 @@ table#LC_mainmenu td.LC_mainmenu_column .LC_menubuttons_inline_text { color: $font; - font-family: $sans; font-size: 90%; padding-left:3px; } @@ -4878,7 +4879,6 @@ table#LC_mainmenu td.LC_mainmenu_column .LC_menubuttons_category { color: $font; background: $pgbg; - font-family: $sans; font-size: larger; font-weight: bold; } @@ -4888,21 +4888,14 @@ td.LC_menubuttons_text { } .LC_current_location { - font-family: $sans; background: $tabbg; } .LC_new_mail { - font-family: $sans; background: $tabbg; font-weight: bold; } -.LC_preferences_labeltext { - font-family: $sans; - text-align: right; -} - .LC_roleslog_note { font-size: small; } @@ -5158,7 +5151,6 @@ span.LC_current_location { span.LC_parm_menu_item { font-size: larger; - font-family: $sans; } span.LC_parm_scope_all { @@ -5401,7 +5393,6 @@ table.LC_notify_front_page td { } .LC_topic_bar { - font-family: $sans; font-weight: bold; width: 100%; background: $tabbg; @@ -5458,14 +5449,12 @@ table.LC_prior_tries td { .LC_answer_correct { background: lightgreen; - font-family: $sans; color: darkgreen; padding: 6px; } .LC_answer_charged_try { background: #FFAAAA; - font-family: $sans; color: darkred; padding: 6px; } @@ -5474,28 +5463,24 @@ table.LC_prior_tries td { .LC_answer_no_grade, .LC_answer_late { background: lightyellow; - font-family: $sans; color: black; padding: 6px; } .LC_answer_previous { background: lightblue; - font-family: $sans; color: darkblue; padding: 6px; } .LC_answer_no_message { background: #FFFFFF; - font-family: $sans; color: black; padding: 6px; } .LC_answer_unknown { background: orange; - font-family: $sans; color: black; padding: 6px; } @@ -5794,7 +5779,6 @@ table#LC_mainmenu td.LC_mainmenu_col_fie .LC_mainmenu_fieldset_category { color: $font; background: $pgbg; - font-family: $sans; font-size: small; font-weight: bold; } @@ -5999,7 +5983,7 @@ ul.LC_TabContentBigger li a { ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs, -ul.LC_CourseBreadcrumbs { +ul#LC_CourseBreadcrumbs { padding-left: 10px; margin: 0; list-style-position: inside; @@ -6007,13 +5991,14 @@ ul.LC_CourseBreadcrumbs { ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, -ul.LC_CourseBreadcrumbs li { +ul#LC_CourseBreadcrumbs li { display: inline; padding: 0 0 0 10px; overflow:hidden; } -ol#LC_MenuBreadcrumbs li a, ul.LC_CourseBreadcrumbs li a { +ol#LC_MenuBreadcrumbs li a, +ul#LC_CourseBreadcrumbs li a { text-decoration: none; font-size:90%; } @@ -6830,7 +6815,7 @@ sub get_users_function { if ($env{'request.role'}=~/^(su|dc|ad|li)/) { $function='admin'; } - if (($env{'request.role'}=~/^(au|ca)/) || + if (($env{'request.role'}=~/^(au|ca|aa)/) || ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) { $function='author'; } @@ -7616,6 +7601,7 @@ ENDSCRIPT my $output = <<"END_BLOCK"; $new_user_create