--- loncom/interface/loncommon.pm 2009/08/04 19:53:42 1.876
+++ loncom/interface/loncommon.pm 2009/08/06 20:40:59 1.881
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.876 2009/08/04 19:53:42 raeburn Exp $
+# $Id: loncommon.pm,v 1.881 2009/08/06 20:40:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -602,7 +602,7 @@ sub userbrowser_javascript {
my $id_functions = &javascript_index_functions();
return <<"ENDUSERBRW";
-function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom) {
+function openuserbrowser(formname,uname,udom,ulast,ufirst,uemail,hideudom,crsdom) {
var url = '/adm/pickuser?';
var userdom = getDomainFromSelectbox(formname,udom);
if (userdom != null) {
@@ -615,7 +615,8 @@ function openuserbrowser(formname,uname,
'&ulastelement='+ulast+
'&ufirstelement='+ufirst+
'&uemailelement='+uemail+
- '&hideudomelement='+hideudom;
+ '&hideudomelement='+hideudom+
+ '&coursedom='+crsdom;
var title = 'User_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';
@@ -713,9 +714,11 @@ sub selectauthor_link {
}
sub selectuser_link {
- my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,$linktext) = @_;
+ my ($form,$unameelem,$domelem,$lastelem,$firstelem,$emailelem,$hdomelem,
+ $coursedom,$linktext) = @_;
return ''.$linktext.'';
+ "'$lastelem','$firstelem','$emailelem','$hdomelem','$coursedom'".
+ ');">'.$linktext.'';
}
sub check_uncheck_jscript {
@@ -1194,8 +1197,8 @@ sub help_menu_js {
my $template .= <<"ENDTEMPLATE";
ENDTEMPLATE
return $template;
@@ -4912,10 +4915,6 @@ td.LC_menubuttons_text {
font-weight: bold;
}
-.LC_roleslog_note {
- font-size: small;
-}
-
table.LC_data_table,
table.LC_mail_list {
border: 1px solid #000000;
@@ -4935,6 +4934,7 @@ table.LC_nested_outer {
width: 100%;
}
+table.LC_innerpickbox,
table.LC_nested {
border: none;
border-collapse: collapse;
@@ -4945,13 +4945,19 @@ table.LC_nested {
table.LC_data_table tr th,
table.LC_calendar tr th,
table.LC_mail_list tr th,
-table.LC_prior_tries tr th {
+table.LC_prior_tries tr th,
+table.LC_innerpickbox tr th {
font-weight: bold;
background-color: $data_table_head;
color:$fontmenu;
font-size:90%;
}
+table.LC_innerpickbox tr th,
+table.LC_innerpickbox tr td {
+ vertical-align: top;
+}
+
table.LC_data_table tr.LC_info_row > td {
background-color: #CCCCCC;
font-weight: bold;
@@ -7529,6 +7535,7 @@ sub user_picker {
# loncreateuser::print_user_query_page()
# has been completed.
next if ($option eq 'alc');
+ next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs'));
next if ($option eq 'crs' && !$env{'request.course.id'});
if ($curr_selected{'srchin'} eq $option) {
$srchinsel .= '