--- loncom/interface/loncommon.pm	2007/09/27 15:36:23	1.590
+++ loncom/interface/loncommon.pm	2007/10/22 22:16:38	1.594
@@ -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.594 2007/10/22 22:16:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -407,7 +407,7 @@ sub coursebrowser_javascript {
 	                            '&cdomelement='+udom+
                                     '&cnameelement='+desc;
         if (extra_element !=null && extra_element != '') {
-            if (formname == 'rolechoice') {
+            if (formname == 'rolechoice' || formname == 'studentform') {
                 url += '&roleelement='+extra_element;
                 if (domainfilter == null || domainfilter == '') {
                     url += '&domainfilter='+extra_element;
@@ -1593,7 +1593,7 @@ input: 4 arguments (two required, two op
                             option, and selected by default. 
     $hide - Value of 'hide' causes hiding of the name of the server, 
                             if 1 server found, or default, if 0 found.
-output: returns 1 items: 
+output: returns 2 items: 
 (a) form element which contains either:
    (i) <select name="$name">
         <option value="$hostid1">$hostid $servers{$hostid}</option>
@@ -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 = '<input type="hidden" name="login" value="krb">';
@@ -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 = '<input type="hidden" name="login" value="int">';
@@ -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 = '<input type="hidden" name="login" value="loc">';
@@ -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 = '<input type="hidden" name="login" value="fsys">';
@@ -4131,7 +4129,7 @@ table.thinborder tr td {
 
 form, .inline { display: inline; }
 .center { text-align: center; }
-.LC_filename {font-family: $mono;}
+.LC_filename {font-family: $mono; white-space:pre;}
 .LC_error {
   color: red;
   font-size: larger;
@@ -4981,6 +4979,25 @@ table.LC_double_column tr td.LC_right_co
   vertical-align: top;
 }
 
+span.LC_role_level {
+  font-weight: bold;
+}
+
+div.LC_left_float {
+  float: left;
+  padding-right: 5%;
+  padding:bottom: 4px;
+}
+
+div.LC_clear_float_header {
+  padding:bottom: 2px;
+}
+
+div.LC_clear_float_footer {
+  padding:top: 10px;
+  clear: both;
+}
+
 END
 }
 
@@ -5097,7 +5114,9 @@ Inputs: none
 sub xml_begin {
     my $output='';
 
-    &Apache::lonhtmlcommon::init_htmlareafields();
+    if ($env{'internal.start_page'}==1) {
+	&Apache::lonhtmlcommon::init_htmlareafields();
+    }
 
     if ($env{'browser.mathml'}) {
 	$output='<?xml version="1.0"?>'
@@ -6659,20 +6678,21 @@ sub csv_print_samples {
     my ($r,$records) = @_;
     my $samples = &get_samples($records,3);
 
-    $r->print(&mt('Samples').'<br /><table border="2"><tr>');
+    $r->print(&mt('Samples').'<br />'.&start_data_table().
+              &start_data_table_header_row());
     foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) { 
         $r->print('<th>'.&mt('Column&nbsp;[_1]',($sample+1)).'</th>'); }
-    $r->print('</tr>');
+    $r->print(&end_data_table_header_row());
     foreach my $hash (@$samples) {
-	$r->print('<tr>');
+	$r->print(&start_data_table_row());
 	foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
 	    $r->print('<td>');
 	    if (defined($$hash{$sample})) { $r->print($$hash{$sample}); }
 	    $r->print('</td>');
 	}
-	$r->print('</tr>');
+	$r->print(&end_data_table_row());
     }
-    $r->print('</tr></table><br />'."\n");
+    $r->print(&end_data_table().'<br />'."\n");
 }
 
 ######################################################
@@ -6697,12 +6717,13 @@ sub csv_print_select_table {
     my $i=0;
     my $samples = &get_samples($records,1);
     $r->print(&mt('Associate columns with student attributes.')."\n".
-	     '<table border="2"><tr>'.
+	      &start_data_table().&start_data_table_header_row().
               '<th>'.&mt('Attribute').'</th>'.
-              '<th>'.&mt('Column').'</th></tr>'."\n");
+              '<th>'.&mt('Column').'</th>'.
+              &end_data_table_header_row()."\n");
     foreach my $array_ref (@$d) {
 	my ($value,$display,$defaultcol)=@{ $array_ref };
-	$r->print('<tr><td>'.$display.'</td>');
+	$r->print(&start_data_table_row().'<tr><td>'.$display.'</td>');
 
 	$r->print('<td><select name=f'.$i.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
@@ -6712,9 +6733,10 @@ sub csv_print_select_table {
                       ($sample eq $defaultcol ? ' selected="selected" ' : '').
                       '>Column '.($sample+1).'</option>');
 	}
-	$r->print('</select></td></tr>'."\n");
+	$r->print('</select></td>'.&end_data_table_row()."\n");
 	$i++;
     }
+    $r->print(&end_data_table());
     $i--;
     return $i;
 }
@@ -6741,11 +6763,13 @@ sub csv_samples_select_table {
     my $i=0;
     #
     my $samples = &get_samples($records,3);
-    $r->print('<table border=2><tr><th>'.
-              &mt('Field').'</th><th>'.&mt('Samples').'</th></tr>');
+    $r->print(&start_data_table().
+              &start_data_table_header_row().'<th>'.
+              &mt('Field').'</th><th>'.&mt('Samples').'</th>'.
+              &end_data_table_header_row());
 
     foreach my $key (sort(keys(%{ $samples->[0] }))) {
-	$r->print('<tr><td><select name="f'.$i.'"'.
+	$r->print(&start_data_table_row().'<td><select name="f'.$i.'"'.
 		  ' onchange="javascript:flip(this.form,'.$i.');">');
 	foreach my $option (@$d) {
 	    my ($value,$display,$defaultcol)=@{ $option };
@@ -6759,9 +6783,10 @@ sub csv_samples_select_table {
 		$r->print($samples->[$line]{$key}."<br />\n"); 
 	    }
 	}
-	$r->print('</td></tr>');
+	$r->print('</td>'.&end_data_table_row());
 	$i++;
     }
+    $r->print(&end_data_table());
     $i--;
     return($i);
 }