--- loncom/interface/loncommon.pm 2007/09/27 15:36:23 1.590
+++ loncom/interface/loncommon.pm 2007/11/06 02:23:49 1.608
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.590 2007/09/27 15:36:23 raeburn Exp $
+# $Id: loncommon.pm,v 1.608 2007/11/06 02:23:49 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -367,7 +367,7 @@ sub selectstudent_link {
return '';
}
return "".&mt('Select User')." ";
+ '","'.$udomele.'");'."'>".&mt('Select User')."";
}
if ($env{'request.role'}=~/^(au|dc|su)/) {
return "
$hostid $servers{$hostid}
@@ -1798,19 +1798,16 @@ END
}
my $radioval = "'nochange'";
- if (exists($in{'curr_authtype'}) &&
- defined($in{'curr_authtype'}) &&
- $in{'curr_authtype'} ne '') {
- $radioval = "'$in{'curr_authtype'}arg'";
+ if (defined($in{'curr_authtype'})) {
+ if ($in{'curr_authtype'} ne '') {
+ $radioval = "'".$in{'curr_authtype'}."arg'";
+ }
}
my $argfield = 'null';
- if ( grep/^mode$/,(keys %in) ) {
+ if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {
- if ( grep/^curr_authtype$/,(keys %in) ) {
- $radioval = "'$in{'curr_authtype'}'";
- }
- if ( grep/^curr_autharg$/,(keys %in) ) {
- unless ($in{'curr_autharg'} eq '') {
+ if (defined($in{'curr_autharg'})) {
+ if ($in{'curr_autharg'} ne '') {
$argfield = "'$in{'curr_autharg'}'";
}
}
@@ -1907,7 +1904,7 @@ sub authform_nochange{
return $result;
}
-sub authform_kerberos{
+sub authform_kerberos {
my %in = (
formname => 'document.cu',
kerb_def_dom => 'MSU.EDU',
@@ -1923,22 +1920,23 @@ sub authform_kerberos{
$check4 = ' checked="on"';
}
$krbarg = $in{'kerb_def_dom'};
- if (grep(/^curr_authtype$/,(keys(%in)))) {
- if ($in{'curr_authtype'} =~ m/^krb(\d+)$/) {
- $krbver = $1;
+ if (defined($in{'curr_authtype'})) {
+ if ($in{'curr_authtype'} eq 'krb') {
$krbcheck = ' checked="on"';
- if ($krbver eq '5') {
- $check5 = ' checked="on"';
- $check4 = '';
- } else {
- $check4 = ' checked="on"';
- $check5 = '';
+ if (defined($in{'curr_kerb_ver'})) {
+ if ($in{'curr_krb_ver'} eq '5') {
+ $check5 = ' checked="on"';
+ $check4 = '';
+ } else {
+ $check4 = ' checked="on"';
+ $check5 = '';
+ }
}
- if (grep(/^curr_autharg$/,(keys(%in)))) {
+ if (defined($in{'curr_autharg'})) {
$krbarg = $in{'curr_autharg'};
}
if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
- if (grep(/^curr_autharg$/,(keys(%in)))) {
+ if (defined($in{'curr_autharg'})) {
$result =
&mt('Currently Kerberos authenticated with domain [_1] Version [_2].',
$in{'curr_autharg'},$krbver);
@@ -1957,7 +1955,7 @@ sub authform_kerberos{
if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
return;
} elsif ($authtype eq '') {
- if (grep(/^mode$/,(keys(%in)))) {
+ if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {
$authtype = ' ';
@@ -2018,11 +2016,11 @@ sub authform_internal{
);
my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
- if (grep(/^curr_authtype$/,(keys(%in)))) {
- if ($in{'curr_authtype'} eq 'internal:') {
+ if (defined($in{'curr_authtype'})) {
+ if ($in{'curr_authtype'} eq 'int') {
if ($can_assign{'int'}) {
$intcheck = 'checked="on" ';
- if (grep(/^curr_autharg$/,(keys(%in)))) {
+ if (defined($in{'curr_autharg'})) {
$intarg = $in{'curr_autharg'};
}
} else {
@@ -2038,7 +2036,7 @@ sub authform_internal{
if (!$can_assign{'int'}) {
return;
} elsif ($authtype eq '') {
- if (grep(/^mode$/,(keys(%in)))) {
+ if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {
$authtype = ' ';
@@ -2051,7 +2049,7 @@ sub authform_internal{
$authtype = ' ';
}
- $autharg = ' ';
$result = &mt
('[_1] Internally authenticated (with initial password [_2])',
@@ -2067,11 +2065,11 @@ sub authform_local{
);
my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
- if (grep(/^curr_authtype$/,(keys(%in)))) {
- if ($in{'curr_authtype'} eq 'localauth:') {
+ if (defined($in{'curr_authtype'})) {
+ if ($in{'curr_authtype'} eq 'loc') {
if ($can_assign{'loc'}) {
$loccheck = 'checked="on" ';
- if (grep(/^curr_autharg$/,(keys(%in)))) {
+ if (defined($in{'curr_autharg'})) {
$locarg = $in{'curr_autharg'};
}
} else {
@@ -2087,7 +2085,7 @@ sub authform_local{
if (!$can_assign{'loc'}) {
return;
} elsif ($authtype eq '') {
- if (grep(/^mode$/,(keys(%in)))) {
+ if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {
$authtype = ' ';
@@ -2116,8 +2114,8 @@ sub authform_filesystem{
);
my ($fsyscheck,$result,$authtype,$autharg,$jscall);
my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
- if (grep(/^curr_authtype$/,(keys(%in)))) {
- if ($in{'curr_authtype'} eq 'unix:') {
+ if (defined($in{'curr_authtype'})) {
+ if ($in{'curr_authtype'} eq 'fsys') {
if ($can_assign{'fsys'}) {
$fsyscheck = 'checked="on" ';
} else {
@@ -2133,7 +2131,7 @@ sub authform_filesystem{
if (!$can_assign{'fsys'}) {
return;
} elsif ($authtype eq '') {
- if (grep(/^mode$/,(keys(%in)))) {
+ if (defined($in{'mode'})) {
if ($in{'mode'} eq 'modifycourse') {
if ($authnum == 1) {
$authtype = ' ';
@@ -2153,7 +2151,7 @@ sub authform_filesystem{
('[_1] Filesystem Authenticated (with initial password [_2])',
' ',
- ' ');
return $result;
}
@@ -2950,14 +2948,14 @@ sub get_previous_attempt {
$lasthash{$key}=$returnhash{$version.':'.$key};
}
}
- $prevattempts='
';
- $prevattempts.='History ';
+ $prevattempts=&start_data_table().&start_data_table_header_row();
+ $prevattempts.=''.&mt('History').' ';
foreach my $key (sort(keys(%lasthash))) {
my ($ign,@parts) = split(/\./,$key);
if ($#parts > 0) {
my $data=$parts[-1];
pop(@parts);
- $prevattempts.='Part '.join('.',@parts).' '.$data.' ';
+ $prevattempts.=''.&mt('Part ').join('.',@parts).' '.$data.' ';
} else {
if ($#parts == 0) {
$prevattempts.=''.$parts[0].' ';
@@ -2966,28 +2964,37 @@ sub get_previous_attempt {
}
}
}
+ $prevattempts.=&end_data_table_header_row();
if ($getattempt eq '') {
for ($version=1;$version<=$returnhash{'version'};$version++) {
- $prevattempts.='Transaction '.$version.' ';
+ $prevattempts.=&start_data_table_row().
+ ''.&mt('Transaction [_1]',$version).' ';
foreach my $key (sort(keys(%lasthash))) {
my $value = &format_previous_attempt_value($key,
$returnhash{$version.':'.$key});
$prevattempts.=''.$value.' ';
}
+ $prevattempts.=&end_data_table_row();
}
}
- $prevattempts.='Current ';
+ $prevattempts.=&start_data_table_row().''.&mt('Current').' ';
foreach my $key (sort(keys(%lasthash))) {
my $value = &format_previous_attempt_value($key,$lasthash{$key});
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
$prevattempts.=''.$value.' ';
}
- $prevattempts.='
';
+ $prevattempts.= &end_data_table_row().&end_data_table();
} else {
- $prevattempts='Nothing submitted - no attempts.';
+ $prevattempts=
+ &start_data_table().&start_data_table_row().
+ ''.&mt('Nothing submitted - no attempts.').' '.
+ &end_data_table_row().&end_data_table();
}
} else {
- $prevattempts='No data.';
+ $prevattempts=
+ &start_data_table().&start_data_table_row().
+ ''.&mt('No data.').' '.
+ &end_data_table_row().&end_data_table();
}
}
@@ -3162,9 +3169,9 @@ sub pprmlink {
if (!$symb) { $symb=&Apache::lonnet::symbread(); }
$symb=&escape($symb);
if ($target) { $target="target=\"$target\""; }
- return ''.$text.' ';
+ return ''.$text.' ';
}
##############################################
@@ -4092,7 +4099,7 @@ sub standard_css {
my $vlink = &designparm($function.'.vlink', $domain);
my $link = &designparm($function.'.link', $domain);
- my $sans = 'Arial,Helvetica,sans-serif';
+ my $sans = 'Verdana,Arial,Helvetica,sans-serif';
my $mono = 'monospace';
my $data_table_head = $tabbg;
my $data_table_light = '#EEEEEE';
@@ -4110,8 +4117,9 @@ sub standard_css {
my $table_header = '#DDDDDD';
my $feedback_link_bg = '#BBBBBB';
- my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
- : '0px 3px 0px 4px';
+ my $border = ($env{'browser.type'} eq 'explorer' ||
+ $env{'browser.type'} eq 'safari' ) ? '0px 2px 0px 2px'
+ : '0px 3px 0px 4px';
return <'
@@ -6659,20 +6805,21 @@ sub csv_print_samples {
my ($r,$records) = @_;
my $samples = &get_samples($records,3);
- $r->print(&mt('Samples').'');
+ $r->print(&mt('Samples').' '.&start_data_table().
+ &start_data_table_header_row());
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
$r->print(''.&mt('Column [_1]',($sample+1)).' '); }
- $r->print(' ');
+ $r->print(&end_data_table_header_row());
foreach my $hash (@$samples) {
- $r->print('');
+ $r->print(&start_data_table_row());
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
$r->print('');
if (defined($$hash{$sample})) { $r->print($$hash{$sample}); }
$r->print(' ');
}
- $r->print(' ');
+ $r->print(&end_data_table_row());
}
- $r->print('
'."\n");
+ $r->print(&end_data_table().' '."\n");
}
######################################################
@@ -6697,12 +6844,13 @@ sub csv_print_select_table {
my $i=0;
my $samples = &get_samples($records,1);
$r->print(&mt('Associate columns with student attributes.')."\n".
- ''.
+ &start_data_table().&start_data_table_header_row().
''.&mt('Attribute').' '.
- ''.&mt('Column').' '."\n");
+ ''.&mt('Column').' '.
+ &end_data_table_header_row()."\n");
foreach my $array_ref (@$d) {
my ($value,$display,$defaultcol)=@{ $array_ref };
- $r->print(''.$display.' ');
+ $r->print(&start_data_table_row().''.$display.' ');
$r->print('');
@@ -6712,9 +6860,10 @@ sub csv_print_select_table {
($sample eq $defaultcol ? ' selected="selected" ' : '').
'>Column '.($sample+1).'');
}
- $r->print(' '."\n");
+ $r->print(''.&end_data_table_row()."\n");
$i++;
}
+ $r->print(&end_data_table());
$i--;
return $i;
}
@@ -6741,11 +6890,13 @@ sub csv_samples_select_table {
my $i=0;
#
my $samples = &get_samples($records,3);
- $r->print(''.
- &mt('Field').' '.&mt('Samples').' ');
+ $r->print(&start_data_table().
+ &start_data_table_header_row().''.
+ &mt('Field').' '.&mt('Samples').' '.
+ &end_data_table_header_row());
foreach my $key (sort(keys(%{ $samples->[0] }))) {
- $r->print('print(&start_data_table_row().'');
foreach my $option (@$d) {
my ($value,$display,$defaultcol)=@{ $option };
@@ -6759,9 +6910,10 @@ sub csv_samples_select_table {
$r->print($samples->[$line]{$key}." \n");
}
}
- $r->print(' ');
+ $r->print(''.&end_data_table_row());
$i++;
}
+ $r->print(&end_data_table());
$i--;
return($i);
}