'.
&Apache::loncommon::end_data_table_header_row());
- foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
- if ($output{$type}) {
- $r->print($output{$type}."\n");
- }
+ foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') {
+ if ($output{$type}) {
+ $r->print($output{$type}."\n");
}
- $r->print(&Apache::loncommon::end_data_table());
}
- } # End of check for keys in rolesdump
+ $r->print(&Apache::loncommon::end_data_table());
+ }
return;
}
@@ -4251,6 +4318,9 @@ END
# Menu Phase One
sub print_main_menu {
my ($permission,$context,$crstype) = @_;
+ if (($context eq 'course') && (&Apache::loncommon::needs_gci_custom())) {
+ return &print_gci_main_menu($permission,$context,$crstype)
+ }
my $linkcontext = $context;
my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
if (($context eq 'course') && ($crstype eq 'Community')) {
@@ -4417,7 +4487,7 @@ sub print_main_menu {
linktitle => $linktitle{$crstype}{'groups'},
},
{
- linktext => 'Change Logs',
+ linktext => 'Change Log',
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
@@ -4472,6 +4542,82 @@ return Apache::lonhtmlcommon::generate_m
# });
}
+sub print_gci_main_menu {
+ my ($permission,$context,$crstype) = @_;
+ my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype));
+ my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+ my %links = (
+ course => {
+ single => 'Add/Modify a Student',
+ drop => 'Drop Students',
+ upload => 'Upload a File of Course Users',
+ singleuser => 'Add/Modify a Course User',
+ listusers => 'Manage Course Users',
+ },
+ );
+ my %linktitles = (
+ course => {
+ singleuser => 'Add a user with a certain role to this course.',
+ listusers => 'Show and manage users in this course.',
+ single => 'Add a user with the role of student to this course',
+ drop => 'Remove a student from this course.',
+ upload => 'Upload a CSV or a text file containing users.',
+ },
+ );
+ my @menu = ( {categorytitle => 'Manage Users',
+ items =>
+ [
+ {
+ linktext => $links{$context}{'single'},
+ #help => 'Course_Add_Student',
+ icon => 'list-add.png',
+ url => '/adm/createuser?action=singlestudent',
+ permission => $permission->{'cusr'},
+ linktitle => $linktitles{$context}{'single'},
+
+ },
+ {
+ linktext => $links{$context}{'drop'},
+ icon => 'edit-undo.png',
+ #help => 'Course_Drop_Student',
+ url => '/adm/createuser?action=drop',
+ permission => $permission->{'cusr'},
+ linktitle => $linktitles{$context}{'drop'},
+ },
+ {
+ linktext => $links{$context}{'upload'},
+ icon => 'sctr.png',
+ #help => 'Course_Create_Class_List',
+ url => '/adm/createuser?action=upload',
+ permission => $permission->{'cusr'},
+ linktitle => $linktitles{$context}{'upload'},
+ },
+ {
+ linktext => $links{$context}{'listusers'},
+ icon => 'edit-find.png',
+ #help => 'Course_View_Class_List',
+ url => '/adm/createuser?action=listusers',
+ permission => ($permission->{'view'} || $permission->{'cusr'}),
+ linktitle => $linktitles{$context}{'listusers'},
+ },
+ ]},
+ {categorytitle => 'Administration',
+ items => [ ]},
+ );
+
+ push(@{ $menu[1]->{items} }, #Category: Administration
+ {
+ linktext => 'Change Log',
+ icon => 'document-properties.png',
+ #help => 'Course_User_Logs',
+ url => '/adm/createuser?action=changelogs',
+ permission => $permission->{'cusr'},
+ linktitle => 'View change log.',
+ },
+ );
+ return Apache::lonhtmlcommon::generate_menu(@menu);
+}
+
sub restore_prev_selections {
my %saveable_parameters = ('srchby' => 'scalar',
'srchin' => 'scalar',
@@ -5436,16 +5582,7 @@ sub role_display_filter {
# Update Display button
$output .= '
'
.''
- .'
';
-
- # Server version info
- $output .= '
'
- .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
- ,'2.6.99.0');
- if ($version) {
- $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
- }
- $output .= '
';
+ .'';
return $output;
}
@@ -5976,10 +6113,11 @@ sub course_level_table {
'end' => "End"
);
- foreach my $protectedcourse (sort( keys(%inccourses))) {
+ foreach my $protectedcourse (sort(keys(%inccourses))) {
my $thiscourse=$protectedcourse;
$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
+ my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'});
my $area=$coursedata{'description'};
my $crstype=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
@@ -5994,9 +6132,10 @@ sub course_level_table {
my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype);
foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role,$crstype);
- if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
+ if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) ||
+ ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) {
$table .= &course_level_row($protectedcourse,$role,$area,$domain,
- $plrole,\%sections_count,\%lt);
+ $plrole,\%sections_count,\%lt);
} elsif ($env{'request.course.sec'} ne '') {
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'.
$env{'request.course.sec'})) {
@@ -6499,6 +6638,21 @@ sub get_selfenroll_titles {
return (\@row,\%lt);
}
+sub is_courseowner {
+ my ($thiscourse,$courseowner) = @_;
+ if ($courseowner eq '') {
+ if ($env{'request.course.id'} eq $thiscourse) {
+ $courseowner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
+ }
+ }
+ if ($courseowner ne '') {
+ if ($courseowner eq $env{'user.name'}.':'.$env{'user.domain'}) {
+ return 1;
+ }
+ }
+ return;
+}
+
#---------------------------------------------- end functions for &phase_two
#--------------------------------- functions for &phase_two and &phase_three