--- loncom/interface/loncommon.pm 2006/06/26 22:31:56 1.401 +++ loncom/interface/loncommon.pm 2006/06/28 23:38:10 1.406 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.401 2006/06/26 22:31:56 albertel Exp $ +# $Id: loncommon.pm,v 1.406 2006/06/28 23:38:10 raeburn 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. @@ -3147,7 +3146,8 @@ table#LC_top_nav, table#LC_menubuttons { width: 100%; background: $pgbg; border: 2px; - border-collapse: seperate; + border-collapse: separate; + padding: 0px; } table#LC_title_bar, table#LC_breadcrumbs, table#LC_nav_location, @@ -3160,6 +3160,7 @@ table#LC_title_bar.LC_with_remote { background: $pgbg; font-family: $sans; border-collapse: collapse; + padding: 0px; } table#LC_title_bar td { @@ -3249,7 +3250,7 @@ td.LC_menubuttons_img { table.LC_data_table, table.LC_mail_list { border: 1px solid #000000; - border-collapse: seperate; + border-collapse: separate; } table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th { font-weight: bold; @@ -3604,6 +3605,7 @@ Returns a uniform complete .. + =back =cut @@ -3717,7 +3719,6 @@ Inputs: $args - additional optio a html attribute frameset -> if true will start with a rather than -=back =cut @@ -3842,9 +3843,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'. @@ -3871,7 +3870,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. @@ -3925,7 +3924,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. @@ -3986,9 +3985,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. @@ -4011,9 +4010,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 = (); @@ -5173,13 +5172,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];