[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm loncoursegroups.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 07 Jul 2006 19:34:21 -0000
albertel Fri Jul 7 15:34:21 2006 EDT
Modified files:
/loncom/interface loncommon.pm loncoursegroups.pm
Log:
- css user addition to groups
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.424 loncom/interface/loncommon.pm:1.425
--- loncom/interface/loncommon.pm:1.424 Fri Jul 7 15:17:19 2006
+++ loncom/interface/loncommon.pm Fri Jul 7 15:34:20 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.424 2006/07/07 19:17:19 albertel Exp $
+# $Id: loncommon.pm,v 1.425 2006/07/07 19:34:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3276,11 +3276,14 @@
}
table.LC_data_table tr td {
background-color: $data_table_light;
- padding: 1px;
+ padding: 2px;
}
table.LC_data_table tr.LC_even_row td {
background-color: $data_table_dark;
}
+table.LC_data_table tr.LC_data_table_highlight td {
+ background-color: $data_table_darker;
+}
table.LC_data_table tr.LC_empty_row td {
background-color: #FFFFFF;
font-weight: bold;
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.42 loncom/interface/loncoursegroups.pm:1.43
--- loncom/interface/loncoursegroups.pm:1.42 Fri Jul 7 15:17:19 2006
+++ loncom/interface/loncoursegroups.pm Fri Jul 7 15:34:20 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.42 2006/07/07 19:17:19 albertel Exp $
+# $Id: loncoursegroups.pm,v 1.43 2006/07/07 19:34:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1688,33 +1688,31 @@
}
$r->print('</tr></table>
');
- $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row());
$r->print('
- <table border="0" cellpadding="4" cellspacing="1">
- <tr bgcolor="'.$tabcol.'" align="center">
- <td><b>'.&mt('Add?').'</b></td>
- <td><b><a href="javascript:changeSort('."'fullname'".')">'.&mt('Name').'</a></b></td>
- <td><b><a href="javascript:changeSort('."'username'".')">'.&mt('Username').'</a></b>
- </td>
- <td><b><a href="javascript:changeSort('."'domain'".')">'.&mt('Domain').'</a></b></td>
- <td><b><a href="javascript:changeSort('."'id'".')">ID</a></b></td>
- <td><b><a href="javascript:changeSort('."'section'".')">Section</a></b></td>
+ <th>'.&mt('Add?').'</b></td>
+ <th><a href="javascript:changeSort('."'fullname'".')">'.&mt('Name').'</a></td>
+ <th><a href="javascript:changeSort('."'username'".')">'.&mt('Username').'</a></td>
+ <th><a href="javascript:changeSort('."'domain'".')">'.&mt('Domain').'</a></td>
+ <th><a href="javascript:changeSort('."'id'".')">'.&mt('ID').'</a></td>
+ <th><a href="javascript:changeSort('."'section'".')">'.&mt('Section').'</a></td>
');
if (@{$available} > 0) {
- $r->print('<td><b>'.$lt{'func'}.'</b></td>');
+ $r->print('<th>'.$lt{'func'}.'</th>');
}
- $r->print('</tr>');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
if (@{$available} > 0) {
if ($granularity eq 'Yes') {
- $r->print('<tr bgcolor="#cccccc">
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'
<td colspan="6"> </td>
- <td align="center"><small><nobr><b>'.&mt('All:').'</b> ');
+ <td align="center"><nobr><b>'.&mt('All:').'</b> ');
foreach my $tool (@{$available}) {
$r->print('<label><input type="checkbox" name="togglefunc" '.
'onclick="javascript:toggleTools(document.'.$formname.'.user_'.$tool.',this);"'.
' value="'.$tool.'">'.'<b>'.$tool.'</b></label> ');
}
- $r->print('</nobr></small></td></tr>');
+ $r->print('</nobr></td></tr>');
}
}
my %Sortby = ();
@@ -1733,27 +1731,22 @@
push(@{$Sortby{$members{$user}[$$idx{fullname}]}},$user);
}
}
- my $rowNum = 0;
- my $rowColor;
foreach my $key (sort(keys(%Sortby))) {
foreach my $user (@{$Sortby{$key}}) {
- if ($rowNum %2 == 1) {
- $rowColor = $rowColor1;
- } else {
- $rowColor = $rowColor2;
- }
my $id = $members{$user}[$$idx{id}];
my $fullname = $members{$user}[$$idx{fullname}];
my $udom = $members{$user}[$$idx{udom}];
my $uname = $members{$user}[$$idx{uname}];
my $section = $members{$user}[$$idx{section}];
- $r->print('<tr bgcolor="'.$rowColor.'"><td align="right">
- <input type="checkbox" name="member" value="'.$user.'" /></td><td><small>'.
- $fullname.'</small></td><td><small>'.$uname.'</small></td><td><small>'.
- $udom.'</small></td><td><small>'.$id.'</small></td>'.
- '<td><small>'.$section.'</small></td>');
+ $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').
+ '<td align="right"><input type="checkbox" name="member" value="'.$user.'" /></td>'.
+ '<td>'.$fullname.'</td>'.
+ '<td>'.$uname.'</td>'.
+ '<td>'.$udom.'</td>'.
+ '<td>'.$id.'</td>'.
+ '<td>'.$section.'</td>');
if (@{$available} > 0) {
- $r->print('<td align="center"><nobr><small>'.
+ $r->print('<td align="center"><nobr>'.
' ');
foreach my $tool (@{$available}) {
if ($granularity eq 'Yes') {
@@ -1764,13 +1757,12 @@
$tool.'" value="'.$user.'" />'.$tool.' ');
}
}
- $r->print('</small></nobr></td>');
+ $r->print('</nobr></td>');
}
- $r->print('</tr>'."\n");
- $rowNum ++;
+ $r->print(&Apache::loncommon::end_data_table_row()."\n");
}
}
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print(&Apache::loncommon::end_data_table());
} else {
if ($totalusers > 0) {
$r->print($lt{'nnew'}.'<br /><br />'.$lt{'yoma'});
@@ -2596,9 +2588,6 @@
my %total;
if (keys(%{$usertools}) > 1) {
$r->print('
- <tr>
- <td> </td>
- <td colspan="3">
<table border="0" cellspacing="2" cellpadding="2" border="0">
<tr>
');
@@ -2663,30 +2652,22 @@
\@excluded);
$r->print('</td>');
$r->print(&Apache::lonhtmlcommon::end_pick_box());
- $r->print('</td></tr>
- <tr>
- <td colspan="4"> </td>
- </tr>
-');
} else {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'forf'}.
- '<br />');
+ $r->print($lt{'forf'}.'<br />');
&display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
$toolprivs,\@defprivs);
}
} else {
if (keys(%{$usertools}) > 0) {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'algr'}.
- '<br /><br />');
+ $r->print($lt{'algr'}.'<br /><br />');
&display_defprivs($r,$tabcol,$rowColor1,$rowColor2,$tools,
$toolprivs,\@defprivs);
} else {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'asno'}.
- '<br />');
+ $r->print($lt{'asno'}.'<br />');
}
}
} else {
- $r->print('<tr><td> </td><td colspan="3">'.$lt{'asng'});
+ $r->print($lt{'asng'});
}
return $numchgs;
}