--- loncom/interface/lonuserutils.pm	2012/08/19 00:18:16	1.139
+++ loncom/interface/lonuserutils.pm	2012/12/31 15:28:36	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.139 2012/08/19 00:18:16 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.146 2012/12/31 15:28:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1444,8 +1444,9 @@ sub print_userlist {
     if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
         $env{'form.Status'} = 'Active';
     }
+    my $onchange = "javascript:updateCols('Status');";
     my $status_select = &Apache::lonhtmlcommon::StatusOptions
-        ($env{'form.Status'});
+        ($env{'form.Status'},undef,undef,$onchange);
 
     if ($env{'form.showrole'} eq '') {
         if ($context eq 'course') {
@@ -1478,12 +1479,12 @@ sub print_userlist {
     $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n".
               '<input type="hidden" name="action" value="'.
               $env{'form.action'}.'" />');
-    $r->print("<p>\n");
+    $r->print('<div>'."\n");
     if ($env{'form.action'} ne 'modifystudent') {
         my %lt=&Apache::lonlocal::texthash('csv' => "CSV",
                                            'excel' => "Excel",
                                            'html'  => 'HTML');
-        my $output_selector = '<select size="1" name="output" >';
+        my $output_selector = '<select size="1" name="output" onchange="javascript:updateCols('."'output'".');" >';
         foreach my $outputformat ('html','csv','excel') {
             my $option = '<option value="'.$outputformat.'"';
             if ($outputformat eq $env{'form.output'}) {
@@ -1493,13 +1494,13 @@ sub print_userlist {
             $output_selector .= "\n".$option;
         }
         $output_selector .= '</select>';
-        $r->print('<label><span class="LC_nobreak">'
+        $r->print('<span class="LC_nobreak">'
                  .&mt('Output Format: [_1]',$output_selector)
-                 .'</span></label>'.('&nbsp;'x3));
+                 .'</span>'.('&nbsp;'x3));
     }
-    $r->print('<label><span class="LC_nobreak">'
+    $r->print('<span class="LC_nobreak">'
              .&mt('User Status: [_1]',$status_select)
-             .'</span></label>'.('&nbsp;'x3)."\n");
+             .'</span>'.('&nbsp;'x3)."\n");
     my $roleselected = '';
     if ($env{'form.showrole'} eq 'Any') {
        $roleselected = ' selected="selected"'; 
@@ -1510,20 +1511,25 @@ sub print_userlist {
         ($cnum,$cdom) = &get_course_identity();
         $r->print(&section_group_filter($cnum,$cdom));
     }
+    $r->print('</div><div class="LC_left_float">'.
+              &column_checkboxes($context,$mode,$formname).
+              '</div><br clear="all" />');
     if ($env{'form.phase'} eq '') {
-        $r->print('<br /><br />'.&list_submit_button(&mt('Display List of Users')).
-                  "\n</p>\n".
+        $r->print(&list_submit_button(&mt('Display List of Users'))."\n".
                   '<input type="hidden" name="phase" value="" /></form>');
         return;
     }
     if (!(($context eq 'domain') && 
           (($env{'form.roletype'} eq 'course') || ($env{'form.roletype'} eq 'community')))) {
-        $r->print(
-            "\n</p>\n"
-           .'<p>'
-           .&list_submit_button(&mt('Update Display'))
-           ."</p>\n"
-        );
+        $r->print(&list_submit_button(&mt('Update Display'))."\n");
+    }
+
+    my @cols = &infocolumns($context,$mode);  
+    if (!@cols) {
+         $r->print('<hr /><span class="LC_warning">'.
+                   &mt('No user information selected for display.').'</span>'.
+                   '<input type="hidden" name="phase" value="display" /></form>'."\n");
+         return;
     }
     my ($indexhash,$keylist) = &make_keylist_array();
     my (%userlist,%userinfo,$clearcoursepick);
@@ -1565,7 +1571,7 @@ sub print_userlist {
             $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
         }
     } else {
-        $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
+        $r->print('<hr /><div id="searching">'.&mt('Searching').' ...</div>');
     }
     $r->rflush();
     if ($context eq 'course') {
@@ -1685,21 +1691,23 @@ sub print_userlist {
         }
     }
     if (keys(%userlist) == 0) {
+        my $msg = '';
         if ($context eq 'author') {
-            $r->print(&mt('There are no co-authors to display.')."\n");
+            $msg = &mt('There are no co-authors to display.');
         } elsif ($context eq 'domain') {
             if ($env{'form.roletype'} eq 'domain') {
-                $r->print(&mt('There are no users with domain roles to display.')."\n");
+                $msg = &mt('There are no users with domain roles to display.');
             } elsif ($env{'form.roletype'} eq 'author') {
-                $r->print(&mt('There are no authors or co-authors to display.')."\n");
+                $msg = &mt('There are no authors or co-authors to display.');
             } elsif ($env{'form.roletype'} eq 'course') {
-                $r->print(&mt('There are no course users to display')."\n"); 
+                $msg = &mt('There are no course users to display');
             } elsif ($env{'form.roletype'} eq 'community') {
-                $r->print(&mt('There are no community users to display')."\n");
+                $msg = &mt('There are no community users to display');
             }
         } elsif ($context eq 'course') {
             $r->print(&mt('There are no course users to display.')."\n");
         }
+        $r->print('<p class="LC_info"'.$msg.'</p>'."\n") if $msg;
     } else {
         # Print out the available choices
         my $usercount;
@@ -1711,7 +1719,7 @@ sub print_userlist {
                                $permission,$env{'form.Status'},\%userlist,$keylist);
         }
         if (!$usercount) {
-            $r->print('<br /><span class="LC_warning">'
+            $r->print('<br /><span class="LC_info">'
                      .&mt('There are no users matching the search criteria.')
                      .'</span>'
             ); 
@@ -1719,6 +1727,7 @@ sub print_userlist {
     }
     $r->print('<input type="hidden" name="phase" value="'.
               $env{'form.phase'}.'" /></form>');
+    return;
 }
 
 sub role_filter {
@@ -1731,11 +1740,11 @@ sub role_filter {
     my ($role_select);
     if ($context eq 'domain') {
         $role_select = &domain_roles_select();
-        $output = '<label><span class="LC_nobreak">'
+        $output = '<span class="LC_nobreak">'
                  .&mt('Role Type: [_1]',$role_select)
-                 .'</span></label>';
+                 .'</span>';
     } else {
-        $role_select = '<select name="showrole">'."\n".
+        $role_select = '<select name="showrole" onchange="javascript:updateCols('."'showrole'".');">'."\n".
                        '<option value="Any" '.$roleselected.'>'.
                        &mt('Any role').'</option>';
         my ($roletype,$crstype);
@@ -1762,9 +1771,9 @@ sub role_filter {
             $role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';
         }
         $role_select .= '</select>';
-        $output = '<label><span class="LC_nobreak">'
+        $output = '<span class="LC_nobreak">'
                  .&mt('Role: [_1]',$role_select)
-                 .'</span></label> ';
+                 .'</span>';
     }
     return $output;
 }
@@ -1827,11 +1836,167 @@ sub section_group_filter {
     return $output;
 }
 
+sub infocolumns {
+    my ($context,$mode) = @_;
+    my @cols;
+    if (($mode eq 'pickauthor') || ($mode eq 'autoenroll')) {
+        @cols = &get_cols_array($context,$mode);
+    } else {
+        my @posscols = &get_cols_array($context,$mode);
+        if ($env{'form.phase'} ne '') {
+            my @checkedcols = &Apache::loncommon::get_env_multiple('form.showcol');
+            foreach my $col (@checkedcols) {
+                if (grep(/^$col$/,@posscols)) {
+                    push(@cols,$col);
+                }
+            }
+        } else {
+            @cols = @posscols;
+        }
+    }
+    return @cols;
+}
+
+sub get_cols_array {
+    my ($context,$mode) = @_;
+    my @cols;
+    if ($mode eq 'pickauthor') {
+        @cols = ('username','fullname','status','email');
+    } else {
+        @cols = ('username','domain','id','fullname');
+        if ($context eq 'course') {
+            push(@cols,'section');
+        }
+        push(@cols,('start','end','role'));
+        if ($context eq 'domain') {
+            push (@cols,'extent');
+        }
+        unless (($mode eq 'autoenroll') && ($env{'form.Status'} ne 'Any')) {
+            push(@cols,'status');
+        }
+        if ($context eq 'course') {
+            push(@cols,'groups');
+        }
+        push(@cols,'email');
+        if (($context eq 'course') && ($mode ne 'autoenroll')) {
+            push(@cols,'lastlogin','clicker');
+        }
+        if (($context eq 'course') && ($mode ne 'autoenroll') &&
+            ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'})) {
+            push(@cols,'photos');
+        }
+    }
+    return @cols;
+}
+
+sub column_checkboxes {
+    my ($context,$mode,$formname) = @_;
+    my @cols = &get_cols_array($context,$mode);
+    my @showncols = &Apache::loncommon::get_env_multiple('form.showcol');
+    my (%disabledchk,%unchecked);
+    if ($env{'form.phase'} eq '') {
+        $disabledchk{'status'} = 1;
+        if ($context eq 'course') {
+            $disabledchk{'role'} = 1;
+            $unchecked{'photo'} = 1;
+        }
+        $unchecked{'clicker'} = 1;
+        $unchecked{'start'} = 1;
+        $unchecked{'end'} = 1;
+    } else {
+        if ($env{'form.Status'} ne 'Any') {
+            $disabledchk{'status'} = 1;
+        }
+        if (($env{'form.showrole'} ne 'Any') && ($env{'form.showrole'} ne 'cr')) {
+            $disabledchk{'role'} = 1;
+        }
+    }
+    my $numposs = scalar(@cols);
+    my $numinrow = 8;
+    my %lt = &get_column_names($context);
+    my $output = '<fieldset><legend>'.&mt('Information to show').'</legend>'."\n".'<span class="LC_nobreak">'.
+                 '<input type="button" onclick="javascript:checkAll(document.'.$formname.'.showcol);" value="'.&mt('check all').'" />'.
+                 ('&nbsp;'x3).
+                 '<input type="button" onclick="javascript:uncheckAll(document.'.$formname.'.showcol);" value="'.&mt('uncheck all').'" />'.
+                 '</span><table>';
+    
+    for (my $i=0; $i<$numposs; $i++) {
+        my $rem = $i%($numinrow);
+        if ($rem == 0) {
+            if ($i > 0) {
+                $output .= '</tr>';
+            }
+            $output .= '<tr>';
+        }
+        my $checked;
+        if ($env{'form.phase'} eq '') {
+            $checked = ' checked="checked"';
+            if ($unchecked{$cols[$i]}) { 
+               $checked = '';
+            }
+            if ($disabledchk{$cols[$i]}) {
+                $checked = ' disabled="disabled"';
+            }
+        } elsif (grep(/^\Q$cols[$i]\E$/,@showncols)) {
+            $checked = ' checked="checked"';
+        } elsif ($disabledchk{$cols[$i]}) {
+            $checked = ' disabled="disabled"';
+        }
+        if ($i == $numposs-1) {
+            my $colsleft = $numinrow-$rem;
+            if ($colsleft > 1) {
+                $output .= '<td colspan="'.$colsleft.'">';
+            } else {
+                $output .= '<td>';
+            }
+        } else {
+            $output .= '<td>';
+        }
+        $output .= '<label><input id="showcol'.$cols[$i].'" type="checkbox" name="showcol" value="'.$cols[$i].'"'.$checked.' />'.
+                   $lt{$cols[$i]}.'</label></td>';
+
+    }
+    $output .= '</tr></table></fieldset>';
+    return $output;
+}
+
 sub list_submit_button {
     my ($text) = @_;
     return '<input type="button" name="updatedisplay" value="'.$text.'" onclick="javascript:display_update()" />';
 }
 
+sub get_column_names {
+    my ($context) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+        'username'   => "username",
+        'domain'     => "domain",
+        'id'         => 'ID',
+        'fullname'   => "name",
+        'section'    => "section",
+        'groups'     => "active groups",
+        'start'      => "start date",
+        'end'        => "end date",
+        'status'     => "status",
+        'role'       => "role",
+        'type'       => "enroll type/action",
+        'email'      => "e-mail address",
+        'photo'      => "photo",
+        'lastlogin'  => "last login",
+        'extent'     => "extent",
+        'ca'         => "check all",
+        'ua'         => "uncheck all",
+        'clicker'    => "clicker-ID",
+    );
+    if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+        $lt{'extent'} = &mt('Course(s): description, section(s), status');
+    } elsif ($context eq 'domain' && $env{'form.roletype'} eq 'community') {
+        $lt{'extent'} = &mt('Communities: description, section(s), status');
+    } elsif ($context eq 'author') {
+        $lt{'extent'} = &mt('Author');
+    }
+    return %lt;
+}
+
 sub gather_userinfo {
     my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_;
     my $viewablesec;
@@ -2195,7 +2360,7 @@ sub show_users_list {
         $sortby = 'username';
     }
     my $setting = $env{'form.roletype'};
-    my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers,$crstype);
+    my ($cid,$cdom,$cnum,$classgroups,$crstype);
     if ($context eq 'course') {
         $cid = $env{'request.course.id'};
         $crstype = &Apache::loncommon::course_type();
@@ -2205,14 +2370,6 @@ sub show_users_list {
         if ($mode eq 'autoenroll') {
             $env{'form.showrole'} = 'st';
         } else {
-            if (! exists($env{'form.displayphotos'})) {
-                $env{'form.displayphotos'} = 'off';
-            }
-            $displayphotos = $env{'form.displayphotos'};
-            if (! exists($env{'form.displayclickers'})) {
-                $env{'form.displayclickers'} = 'off';
-            }
-            $displayclickers = $env{'form.displayclickers'};
             if ($env{'course.'.$cid.'.internal.showphoto'}) {
                 $r->print('
 <script type="text/javascript">
@@ -2228,10 +2385,6 @@ function photowindow(photolink) {
 </script>
                ');
             }
-            $r->print(<<END);
-<input type="hidden" name="displayphotos" value="$displayphotos" />
-<input type="hidden" name="displayclickers" value="$displayclickers" />
-END
         }
     } elsif ($context eq 'domain') {
         if ($setting eq 'community') {
@@ -2241,14 +2394,12 @@ END
         }
     }
     if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
-        my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
         my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode);
         my $verify_action_js = &bulkaction_javascript($formname);
         $r->print(<<END);
 
 <script type="text/javascript" language="Javascript">
 // <![CDATA[
-$check_uncheck_js
 
 $verify_action_js
 
@@ -2306,75 +2457,18 @@ END
     $r->print(<<END);
 <input type="hidden" name="sortby" value="$sortby" />
 END
-
-    my %lt=&Apache::lonlocal::texthash(
-                       'username'   => "username",
-                       'domain'     => "domain",
-                       'id'         => 'ID',
-                       'fullname'   => "name",
-                       'section'    => "section",
-                       'groups'     => "active groups",
-                       'start'      => "start date",
-                       'end'        => "end date",
-                       'status'     => "status",
-                       'role'       => "role",
-                       'type'       => "enroll type/action",
-                       'email'      => "e-mail address",
-                       'photo'      => "photo",
-                       'lastlogin'  => "last login", 
-                       'extent'     => "extent",
+    my @cols = &infocolumns($context,$mode);
+    my %coltxt = &get_column_names($context);
+    my %acttxt = &Apache::lonlocal::texthash(
                        'pr'         => "Proceed",
-                       'ca'         => "check all",
-                       'ua'         => "uncheck all",
                        'ac'         => "Action to take for selected users",
                        'link'       => "Behavior of clickable username link for each user",
                        'aboutme'    => "Display a user's personal information page",
                        'owin'       => "Open in a new window",
                        'modify'     => "Modify a user's information",
                        'track'      => "View a user's recent activity",
-                       'clicker'    => "Clicker-ID",
                       );
-    if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
-        $lt{'extent'} = &mt('Course(s): description, section(s), status');
-    } elsif ($context eq 'domain' && $env{'form.roletype'} eq 'community') {
-        $lt{'extent'} = &mt('Communities: description, section(s), status');
-    } elsif ($context eq 'author') {
-        $lt{'extent'} = &mt('Author'); 
-    }
-    my @cols;
-    if ($mode eq 'pickauthor') {
-        @cols = ('username','fullname','status','email');
-    } else {
-        @cols = ('username','domain','id','fullname');
-        if ($context eq 'course') {
-            push(@cols,'section');
-        }
-        if (!($context eq 'domain' && ($env{'form.roletype'} eq 'course')
-                              && ($env{'form.roletype'} eq 'community'))) { 
-            push(@cols,('start','end'));
-        }
-        if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
-            push(@cols,'role');
-        }
-        if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' ||
-                                    $env{'form.roletype'} eq 'course' ||
-                                    $env{'form.roletype'} eq 'community')) {
-            push (@cols,'extent');
-        }
-        if (($statusmode eq 'Any') && 
-            (!($context eq 'domain' && (($env{'form.roletype'} eq 'course')
-             || ($env{'form.roletype'} eq 'community'))))) {
-            push(@cols,'status');
-        }
-        if ($context eq 'course') {
-            push(@cols,'groups');
-        }
-        push(@cols,'email');
-        if ($context eq 'course') {
-            push(@cols,'lastlogin');
-        }
-    }
-
+    my %lt = (%coltxt,%acttxt);
     my $rolefilter = $env{'form.showrole'};
     if ($env{'form.showrole'} eq 'cr') {
         $rolefilter = &mt('custom');  
@@ -2385,7 +2479,7 @@ END
     if ($mode ne 'autoenroll') {
         $results_description = &results_header_row($rolefilter,$statusmode,
                                                    $context,$permission,$mode,$crstype);
-        $r->print('<b>'.$results_description.'</b><br /><br />');
+        $r->print('<b>'.$results_description.'</b><br clear="all" />');
     }
     my ($output,$actionselect,%canchange,%canchangesec);
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
@@ -2447,6 +2541,12 @@ END
                             if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
                                 $canchangesec{$role} = $env{'request.course.sec'};
                             }
+                        } elsif ((($role eq 'co') && ($crstype eq 'Community')) ||
+                                 (($role eq 'cc') && ($crstype eq 'Course'))) {
+                            if (&is_courseowner($env{'request.course.id'},
+                                                $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'})) {
+                                $canchange{$role} = 1;
+                            }
                         }
                     }
                 }
@@ -2479,9 +2579,13 @@ END
             if ($env{'form.userwin'}) {
                 $checkwin = ' checked="checked"';
             }
-            $output .= '</td><td valign="top"  style="border-left: 1px solid;"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
+            $output .=
+                '</td><td valign="top"  style="border-left: 1px solid;">'
+               .'<span class="LC_nobreak"><label>'
+               .'<input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}
+               .'</label></span></td></tr></table></fieldset></div>';
         }
-        $output .= "\n".'<div class="LC_clear_float_footer">&nbsp;</div>'."\n".
+        $output .= "\n".'<br clear="all" />'."\n".
                   &Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row();
         if ($mode eq 'autoenroll') {
@@ -2498,42 +2602,6 @@ END
             $output .= "<th><a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a></th>\n";
         }
         my %role_types = &role_type_names();
-        if ($context eq 'course' && $mode ne 'autoenroll') {
-            if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
-                # Clicker display on or off?
-                my %clicker_options = (
-                                        'on' => 'Show',
-                                        'off' => 'Hide',
-                                      );
-                my $clickerchg = 'on';
-                if ($displayclickers eq 'on') {
-                    $clickerchg = 'off';
-                }
-                $output .= '    <th>'."\n".'     '
-                        .&mt('[_1]'.$clicker_options{$clickerchg}.'[_2] clicker id'
-                            ,'<a href="javascript:document.'.$formname.'.displayclickers.value='
-                             ."'".$clickerchg."'".';document.'.$formname.'.submit();">'
-                            ,'</a>')
-                        ."\n".'    </th>'."\n";
-
-                # Photo display on or off?
-                if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
-                    my %photo_options = &Apache::lonlocal::texthash(
-                                                            'on' => 'Show',
-                                                            'off' => 'Hide',
-                                                                );
-                    my $photochg = 'on';
-                    if ($displayphotos eq 'on') {
-                        $photochg = 'off';
-                    }
-                    $output .= '    <th>'."\n".'     '.
-                '<a href="javascript:document.'.$formname.'.displayphotos.value='.
-                      "'".$photochg."'".';document.'.$formname.'.submit();">'.
-                      $photo_options{$photochg}.'</a>&nbsp;'.$lt{'photo'}."\n".
-                      '    </th>'."\n";
-                }
-            }
-        }
         $output .= &Apache::loncommon::end_data_table_header_row();
 # Done with the HTML header line
     } elsif ($mode eq 'csv') {
@@ -2554,14 +2622,12 @@ END
             $CSVfile = undef;
         }
         #
-        push @cols,'clicker';
         # Write headers and data to file
         print $CSVfile '"'.$results_description.'"'."\n"; 
         print $CSVfile '"'.join('","',map {
             &Apache::loncommon::csv_translate($lt{$_})
             } (@cols))."\"\n";
     } elsif ($mode eq 'excel') {
-        push @cols,'clicker';
         # Create the excel spreadsheet
         ($excel_workbook,$excel_filename,$format) =
             &Apache::loncommon::create_workbook($r);
@@ -2685,7 +2751,7 @@ END
                     }
                 }
                 if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
-                    if (($displayphotos eq 'on') && ($role eq 'st')) {
+                    if ((grep/^photo$/,@cols) && ($role eq 'st')) {
                         $userlist->{$user}->[$index{'photo'}] =
                             &Apache::lonnet::retrievestudentphoto($udom,$uname,'jpg');
                         $userlist->{$user}->[$index{'thumbnail'}] =
@@ -2800,17 +2866,26 @@ END
                     if ($showcheckbox) {
                         $checkval = $user; 
                         if ($context eq 'course') {
-                            if ($role eq 'st') {
-                                $checkval .= ':st';
-                            }
-                            $checkval .= ':'.$in{'section'};
-                            if ($role eq 'st') {
-                                $checkval .= ':'.$in{'type'}.':'.
-                                             $in{'lockedtype'};
-                            }
+                            if (($role eq 'co' || $role eq 'cc') &&
+                                ($user =~ /^\Q$env{'user.name'}:$env{'user.domain'}:$role\E/)) {
+                                $showcheckbox = 0;
+                            } else {
+                                if ($role eq 'st') {
+                                    $checkval .= ':st';
+                                }
+                                $checkval .= ':'.$in{'section'};
+                                if ($role eq 'st') {
+                                    $checkval .= ':'.$in{'type'}.':'.
+                                                 $in{'lockedtype'};
+                                }
+                             }
+                        }
+                        if ($showcheckbox) {
+                            $r->print('<td><input type="checkbox" name="'.
+                                      'actionlist" value="'.$checkval.'" /></td>');
+                        } else {
+                            $r->print('<td>&nbsp;</td>');
                         }
-                        $r->print('<td><input type="checkbox" name="'.
-                                  'actionlist" value="'.$checkval.'" /></td>');
                     } else {
                         $r->print('<td>&nbsp;</td>');
                     }
@@ -2829,27 +2904,28 @@ END
                         $showitem = $ltstatus{$in{$item}};
                     }
                     $r->print('<td>'.$showitem.'</td>'."\n");
-                } else {
-                    $r->print('<td>'.$in{$item}.'</td>'."\n");
-                }
-            }
-            if (($context eq 'course') && ($mode ne 'autoenroll')) {
-                if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
-                    if ($displayclickers eq 'on') {
-                        my $clickers =
+                } elsif ($item eq 'photo') {
+                     if (($context eq 'course') && ($mode ne 'autoenroll') && 
+                         ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'})) { 
+                         if ($role eq 'st') {
+                             $r->print('<td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1" alt="" /></a></td>');
+                         } else {
+                             $r->print('<td>&nbsp;</td>');
+                         }
+                     }
+                } elsif ($item eq 'clicker') {
+                    if (($context eq 'course') && ($mode ne 'autoenroll')) {
+                        if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
+                            my $clickers =
                    (&Apache::lonnet::userenvironment($in{'domain'},$in{'username'},'clickers'))[1];
-                        if ($clickers!~/\w/) { $clickers='-'; }
-                        $r->print('<td>'.$clickers.'</td>');
-                    } else {
-                        $r->print('    <td>&nbsp;</td>  ');
-                    }
-                    if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
-                        if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') {
-                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1" alt="" /></a></td>');
+                            if ($clickers!~/\w/) { $clickers='-'; }
+                            $r->print('<td>'.$clickers.'</td>');
                         } else {
-                            $r->print('    <td>&nbsp;</td>  ');
-                        }
-                    }
+                             $r->print('<td>&nbsp;</td>'."\n");
+                        } 
+                    } 
+                } else {
+                    $r->print('<td>'.$in{$item}.'</td>'."\n");
                 }
             }
             $r->print(&Apache::loncommon::end_data_table_row());
@@ -3055,15 +3131,20 @@ sub select_actions {
     }
     if ($context eq 'course') {
         if ($env{'form.showrole'} ne 'Any') {
-             if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},
-                                           $env{'request.course.id'})) {
-                 if ($env{'request.course.sec'} eq '') {
-                     return;
-                 } else {
-                     if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
-                         return;
-                     }
-                 }
+            my $showactions;
+            if (&Apache::lonnet::allowed('c'.$env{'form.showrole'},
+                                          $env{'request.course.id'})) {
+                $showactions = 1;  
+            } elsif ($env{'request.course.sec'} ne '') {
+                if (&Apache::lonnet::allowed('c'.$env{'form.showrole'},$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                    $showactions = 1;
+                }
+            }
+            unless ($showactions) {
+                unless (&is_courseowner($env{'request.course.id'},
+                                       $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'})) {
+                    return; 
+                }
             }
         }
     }
@@ -3589,11 +3670,13 @@ END
         }
     }
     if (!$studentcount) {
+       my $msg = '';
         if ($crstype eq 'Community') {
-            $r->print(&mt('There are no members to drop.'));
+            $msg = &mt('There are no members to drop.');
         } else {
-            $r->print(&mt('There are no students to drop.'));
+            $msg = &mt('There are no students to drop.');
         }
+        $r->print('<p class="LC_info">'.$msg.'</p>');
         return;
     }
     my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
@@ -4384,7 +4467,7 @@ sub upfile_drop_add {
             if (! defined($classlist)) {
                 $r->print('<form name="studentform" method="post" action="/adm/createuser" />'.
                           '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
-                          &mt('There are no students with current/future access to the course.').
+                          '<p class="LC_info">'.&mt('There are no students with current/future access to the course.').'</p>'.
                           '</form>'."\n");
             } elsif (ref($classlist) eq 'HASH') {
                 # Remove the students we just added from the list of students.
@@ -4508,11 +4591,13 @@ sub print_drop_menu {
               '<form name="studentform" method="post">'."\n");
     my $classlist = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
+        my $msg = '';
         if ($crstype eq 'Community') {
-            $r->print(&mt('There are no members currently enrolled.')."\n");
+            $msg = &mt('There are no members currently enrolled.');
         } else {
-            $r->print(&mt('There are no students currently enrolled.')."\n");
+            $msg = &mt('There are no students currently enrolled.');
         }
+        $r->print('<p class="LC_info">'.$msg."</p>\n");
     } else {
         &show_drop_list($r,$classlist,'nosort',$permission,$crstype);
     }
@@ -4845,7 +4930,7 @@ sub update_user_list {
             }
         }
     }
-    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} for [quant,_1,user role,user roles,no user roles].",$count).'</b></p>');
+    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} [quant,_1,user role,user roles,no user roles].",$count).'</b></p>');
     if ($count > 0) {
         if ($choice eq 'revoke' || $choice eq 'drop') {
             $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.').'</p>');
@@ -4862,7 +4947,10 @@ sub update_user_list {
     if ($choice eq 'drop') {
         $linktext = &mt('Display current class roster');
     }
-    $r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n");
+    $r->print(
+        &Apache::lonhtmlcommon::actionbox(
+            ['<a href="javascript:document.studentform.submit()">'.$linktext.'</a>'])
+       .'</form>'."\n");
 }
 
 sub dates_feedback {
@@ -5067,7 +5155,7 @@ sub setsections_javascript {
                     acor => 'A coordinator role will be added with access to all sections',
                     inea => 'In each course, each user may only have one student role at a time.',
                     inco => 'In each community, each user may only have one member role at a time.',
-                    youh => 'You had selected ',
+                    youh => 'You had selected',
                     secs => 'sections.',
                     plmo => 'Please modify your selections so they include no more than one section.',
                     mayn => 'may not be used as the name for a section, as it is a reserved word.',
@@ -5696,5 +5784,20 @@ sub authcheck_alerts {
     return %alerts;
 }
 
+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;
+}
+
 1;