--- loncom/interface/lonuserutils.pm 2009/11/12 15:58:22 1.104
+++ loncom/interface/lonuserutils.pm 2010/01/14 18:06:14 1.111
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.104 2009/11/12 15:58:22 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.111 2010/01/14 18:06:14 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -386,7 +386,7 @@ sub javascript_validations {
if (($context eq 'course') || ($context eq 'domain')) {
if ($context eq 'course') {
if ($env{'request.course.sec'} eq '') {
- $setsection_call = 'setSections(document.'.$param{'formname'}."'$crstype'".');';
+ $setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');';
$setsections_js =
&setsections_javascript($param{'formname'},$groupslist,
$mode,'',$crstype);
@@ -1446,12 +1446,17 @@ sub print_userlist {
'<input type="hidden" name="phase" value="" /></form>');
return;
}
- if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
- $r->print(' '.&list_submit_button(&mt('Update Display')).
- "\n</p>\n");
+ 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"
+ );
}
my ($indexhash,$keylist) = &make_keylist_array();
- my (%userlist,%userinfo);
+ my (%userlist,%userinfo,$clearcoursepick);
if (($context eq 'domain') &&
($env{'form.roletype'} eq 'course') ||
($env{'form.roletype'} eq 'community')) {
@@ -1476,9 +1481,15 @@ sub print_userlist {
$courseform."\n".
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'</p>'.
- '<p>'.&list_submit_button(&mt('Update Display')).
+ '<p><input type="hidden" name="origroletype" value="'.$env{'form.roletype'}.'" />'.
+ &list_submit_button(&mt('Update Display')).
"\n".'</p><span class="LC_warning">'.$warning.'</span>'."\n");
- if ($env{'form.coursepick'}) {
+ $clearcoursepick = 0;
+ if (($env{'form.origroletype'} ne '') &&
+ ($env{'form.origroletype'} ne $env{'form.roletype'})) {
+ $clearcoursepick = 1;
+ }
+ if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
$r->print('<hr />'.&mt('Searching').' ...<br /> <br />');
}
} else {
@@ -1553,7 +1564,7 @@ sub print_userlist {
}
} elsif (($env{'form.roletype'} eq 'course') ||
($env{'form.roletype'} eq 'community')) {
- if ($env{'form.coursepick'}) {
+ if (($env{'form.coursepick'}) && (!$clearcoursepick)) {
my %courses = &process_coursepick();
my %allusers;
my $hidepriv = 1;
@@ -1681,7 +1692,7 @@ sub role_filter {
$role_select .= '</select>';
$output = '<label><span class="LC_nobreak">'
.&mt('Role: [_1]',$role_select)
- .'</span></label>';
+ .'</span></label> ';
}
return $output;
}
@@ -1736,7 +1747,9 @@ sub section_group_filter {
$markup .= '</option>'."\n";
}
$markup .= '</select>'."\n";
- $output .= (' 'x3).'<label>'.$title{$item}.': '.$markup.'</label>';
+ $output .= (' 'x3).'<span class="LC_nobreak">'
+ .'<label>'.$title{$item}.': '.$markup.'</label>'
+ .'</span> ';
}
}
return $output;
@@ -1956,13 +1969,17 @@ sub process_coursepick {
my $coursefilter = $env{'form.coursepick'};
my $cdom = $env{'request.role.domain'};
my %courses;
+ my $crssrch = 'Course';
+ if ($env{'form.roletype'} eq 'community') {
+ $crssrch = 'Community';
+ }
if ($coursefilter eq 'all') {
%courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
- undef,undef,'Course');
+ undef,undef,$crssrch);
} elsif ($coursefilter eq 'category') {
my $instcode = &instcode_from_coursefilter();
%courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
- undef,undef,'Course');
+ undef,undef,$crssrch);
} elsif ($coursefilter eq 'specific') {
if ($env{'form.coursetotal'} > 1) {
my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -2147,7 +2164,7 @@ END
} elsif ($context eq 'domain') {
if ($setting eq 'community') {
$crstype = 'Community';
- } elsif ($crstype eq 'course') {
+ } elsif ($setting eq 'course') {
$crstype = 'Course';
}
}
@@ -2298,7 +2315,11 @@ END
if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
if ($permission->{'cusr'}) {
- $actionselect = &select_actions($context,$setting,$statusmode,$formname);
+ unless (($context eq 'domain') &&
+ (($setting eq 'course') || ($setting eq 'community'))) {
+ $actionselect =
+ &select_actions($context,$setting,$statusmode,$formname);
+ }
}
$r->print(<<END);
<input type="hidden" name="srchby" value="uname" />
@@ -2382,7 +2403,7 @@ END
if ($env{'form.userwin'}) {
$checkwin = ' checked="checked"';
}
- $output .= '</td><td valign="top"><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"><input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
}
$output .= "\n".'<div class="LC_clear_float_footer"> </div>'."\n".
&Apache::loncommon::start_data_table().
@@ -2392,11 +2413,7 @@ END
<th><a href=\"javascript:document.$formname.sortby.value='type';document.$formname.submit();\">$lt{'type'}</a></th>
";
} else {
- if ($mode eq 'pickauthor') {
- $output .= "\n".'<th> </th>'."\n";
- } else {
- $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
- }
+ $output .= "\n".'<th> </th>'."\n";
if ($actionselect) {
$output .= '<th>'.&mt('Select').'</th>'."\n";
}
@@ -2451,9 +2468,13 @@ END
time.'_'.rand(1000000000).'.csv';
unless ($CSVfile = Apache::File->new('>/home/httpd'.$CSVfilename)) {
$r->log_error("Couldn't open $CSVfilename for output $!");
- $r->print(&mt('Problems occurred in writing the CSV file. '
- .'This error has been logged. '
- .'Please alert your LON-CAPA administrator.'));
+ $r->print(
+ '<p class="LC_error">'
+ .&mt('Problems occurred in writing the CSV file.')
+ .' '.&mt('This error has been logged.')
+ .' '.&mt('Please alert your LON-CAPA administrator.')
+ .'</p>'
+ );
$CSVfile = undef;
}
#
@@ -3643,14 +3664,13 @@ sub print_first_users_upload_form {
$str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n";
# Excel and CSV Help
- $str .= '<p>'
+ $str .= '<div class="LC_left_float">'
.&Apache::loncommon::help_open_topic("Course_Create_Class_List",
&mt("How do I create a users list from a spreadsheet"))
- ."<br />\n"
+ .'</div><div class="LC_left_float">'."\n"
.&Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
&mt("How do I create a CSV file from a spreadsheet"))
- ."</p>\n";
-
+ .'</div><br clear="all" />'."\n";
$str .= &Apache::lonhtmlcommon::start_pick_box()
.&Apache::lonhtmlcommon::row_title(&mt('File'));
if (&Apache::lonlocal::current_language() ne 'en') {
@@ -3674,8 +3694,6 @@ sub print_first_users_upload_form {
.'<input type="submit" name="fileupload" value="'.&mt('Next').'" />'
.'</p>';
- $str .= &Apache::loncommon::end_page();
-
$r->print($str);
return;
}