--- loncom/interface/loncommon.pm 2006/06/27 00:07:33 1.403 +++ loncom/interface/loncommon.pm 2006/06/29 18:43:33 1.408 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.403 2006/06/27 00:07:33 albertel Exp $ +# $Id: loncommon.pm,v 1.408 2006/06/29 18:43:33 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2796,7 +2796,6 @@ Inputs: =item * $no_inline_link, if true and in remote mode, don't show the 'Switch To Inline Menu' link - =back Returns: A uniform header for LON-CAPA web pages. @@ -3201,6 +3200,7 @@ table#LC_menubuttons img, table#LC_menub table#LC_top_nav td { background: $tabbg; border: 0px; + font-size: small; } table#LC_top_nav td a, div#LC_top_nav a { color: $font; @@ -3209,6 +3209,12 @@ table#LC_top_nav td a, div#LC_top_nav a table#LC_top_nav td.LC_top_nav_logo { background: $tabbg; text-align: right; + white-space: nowrap; + font-weight: bold; +} +table#LC_top_nav td.LC_top_nav_logo img { + margin-left: 0.2em; + vertical-align: bottom; } table#LC_breadcrumbs td { background: $tabbg; @@ -3606,6 +3612,7 @@ Returns a uniform complete .. + =back =cut @@ -3719,7 +3726,6 @@ Inputs: $args - additional optio a html attribute frameset -> if true will start with a rather than -=back =cut @@ -3844,9 +3850,7 @@ sub simple_error_page { =pod -=over 4 - -=item get_users_function +=item * &get_users_function() Used by &bodytag to determine the current users primary role. Returns either 'student','coordinator','admin', or 'author'. @@ -3873,7 +3877,7 @@ sub get_users_function { =pod -=item check_user_status +=item * &check_user_status Determines current status of supplied role for a specific user. Roles can be active, previous or future. @@ -3927,7 +3931,7 @@ sub check_user_status { =pod -=item get_sections +=item * &get_sections() Determines all the sections for a course including sections with students and sections containing other roles. @@ -3988,9 +3992,9 @@ sub get_sections { ############################################### =pod - -=item get_course_users - + +=item * &get_course_users() + Retrieves usernames:domains for users in the specified course with specific role(s), and access status. @@ -4013,9 +4017,9 @@ Entries for end, start, section and stat of the possibility of multiple values for non-student roles. =cut - + ############################################### - + sub get_course_users { my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_; my %idx = (); @@ -5175,13 +5179,22 @@ sub course_type { if (!defined($cid)) { $cid = $env{'request.course.id'}; } - if (defined($env{'course.'.$cid.'type'})) { - return $env{'course.'.$cid.'type'}; + if (defined($env{'course.'.$cid.'.type'})) { + return $env{'course.'.$cid.'.type'}; } else { return 'Course'; } } +sub group_term { + my $crstype = &course_type(); + my %names = ( + 'Course' => 'group', + 'Group' => 'team', + ); + return $names{$crstype}; +} + sub icon { my ($file)=@_; my $curfext = (split(/\./,$file))[-1];