--- loncom/interface/loncommon.pm 2009/05/15 18:06:13 1.817 +++ loncom/interface/loncommon.pm 2009/05/18 16:29:55 1.821 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.817 2009/05/15 18:06:13 bisitz Exp $ +# $Id: loncommon.pm,v 1.821 2009/05/18 16:29:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4674,6 +4674,7 @@ table#LC_title_bar a { } table#LC_title_bar { + clear: both; /*display: none;*/ } @@ -4689,6 +4690,7 @@ table#LC_title_bar.LC_with_remote { font-family: $sans; border-collapse: collapse; padding: 0; + margin: 0; } table.LC_docs_path { @@ -4712,15 +4714,15 @@ table#LC_title_bar .LC_title_bar_who { margin: 0; } -table#LC_title_bar .LC_title_bar_name { +table#LC_title_bar div.LC_title_bar_name { margin: 0; } -table#LC_title_bar .LC_title_bar_role { +table#LC_title_bar div.LC_title_bar_role { margin: 0; } -table#LC_title_bar .LC_title_bar_realm { +table#LC_title_bar div.LC_title_bar_realm { margin: 0; } @@ -4797,6 +4799,16 @@ table#LC_mainmenu td.LC_mainmenu_column font-size: 70%; } +#LC_head_subbox { + clear:both; + background: $sidebg; + border-bottom: 1px solid #999999; + height: 32px; + line-height: 32px; + margin: 0 0 10px; + padding: 0; +} + .LC_fontsize_medium { font-size: 85%; } @@ -5941,25 +5953,16 @@ ul.LC_TabContentBigger li a { ol#LC_MenuBreadcrumbs, ol#LC_PathBreadcrumbs, ul.LC_CourseBreadcrumbs { - border-top: solid 1px RGB(255, 255, 255); - height: 20px; - line-height: 20px; - vertical-align: bottom; - margin: 0 0 30px 0; padding-left: 10px; + margin: 0; list-style-position: inside; - background: url(/adm/lonIcons/lightGreyBG.png) repeat-x left top; } ol#LC_MenuBreadcrumbs li, ol#LC_PathBreadcrumbs li, ul.LC_CourseBreadcrumbs li { -/* - background: url(/adm/lonIcons/arrow_white.png) no-repeat left center; -*/ display: inline; padding: 0 0 0 10px; -/* vertical-align: bottom; */ overflow:hidden; } @@ -6771,6 +6774,9 @@ Returns either 'student','coordinator',' ############################################### sub get_users_function { my $function = 'norole'; + if ($env{'request.role'}=~/^(st)/) { + $function='student'; + } if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; } @@ -6788,6 +6794,38 @@ sub get_users_function { =pod +=item * &show_course() + +Used by lonmenu.pm and lonroles.pm to determine whether to use the word +'Courses' or 'Roles' in inline navigation and on screen displaying user's roles. + +Inputs: +None + +Outputs: +Scalar: 1 if 'Course' to be used, 0 otherwise. + +=cut + +############################################### +sub show_course { + my $course = !$env{'user.adv'}; + if (!$env{'user.adv'}) { + foreach my $env (keys(%env)) { + next if ($env !~ m/^user\.priv\./); + if ($env !~ m/^user\.priv\.(?:st|cm)/) { + $course = 0; + last; + } + } + } + return $course; +} + +############################################### + +=pod + =item * &check_user_status() Determines current status of supplied role for a @@ -10206,6 +10244,22 @@ sub escape_url { return join('/',@urlslices).'/'.$lastitem; } +sub compare_arrays { + my ($arrayref1,$arrayref2) = @_; + my (@difference,%count); + @difference = (); + %count = (); + if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { + foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; } + foreach my $element (keys(%count)) { + if ($count{$element} == 1) { + push(@difference,$element); + } + } + } + return @difference; +} + # -------------------------------------------------------- Initialize user login sub init_user_environment { my ($r, $username, $domain, $authhost, $form, $args) = @_;