--- loncom/interface/lonrequestcourse.pm	2009/08/05 23:44:52	1.4
+++ loncom/interface/lonrequestcourse.pm	2009/08/06 20:40:59	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.4 2009/08/05 23:44:52 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.7 2009/08/06 20:40:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,7 +115,7 @@ sub handler {
     my %trail = (
                  crstype  => 'Course Request Action',
                  codepick => 'Category',
-                 courseinfo => 'Information',
+                 courseinfo => 'Description',
                  enrollment => 'Enrollment',
                  personnel => 'Personnel',
                  review => 'Review',
@@ -190,8 +190,9 @@ sub handler {
 sub header {
     my ($bodytitle,$jscript,$loaditems,$jsextra) = @_;
     if ($jscript) {
-        $jscript = '<script type="text/javascript">'.
-                   $jscript.'</script>'."\n";
+        $jscript = '<script type="text/javascript">'."\n".
+                   '// <![CDATA['."\n".
+                   $jscript."\n".'// ]]>'."\n".'</script>'."\n";
     }
     if ($loaditems) {
         $loaditems = {'add_entries' => $loaditems,};
@@ -857,13 +858,13 @@ sub print_personnel_menu {
     for (my $i=0; $i<$persontotal; $i++) { 
         my @linkargs = map { 'person_'.$i.'_'.$_ } (@items);
         my $linkargstr = join("','",@linkargs);
-        my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$userlinktxt);
+        my $userlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom,$userlinktxt);
         my $uname_form = '<input type="text" name="person_'.$i.'_uname" value=""'.
                          ' onFocus="this.blur();'.
-                         'openuserbrowser('."'$formname','$linkargstr'".');" />';
+                         'openuserbrowser('."'$formname','$linkargstr','$dom'".');" />';
         my $onchange = 'javascript:fix_domain('."'$formname','person_".$i."_dom',".
                        "'person_".$i."_hidedom'".');'.
-                       'openuserbrowser('."'$formname','$linkargstr'".');';
+                       'openuserbrowser('."'$formname','$linkargstr','$dom'".');';
         my $udom_form = &Apache::loncommon::select_dom_form($dom,'person_'.$i.'_dom','',
                                                             1,$onchange).
                         '<input type="hidden" name="person_'.$i.'_hidedom" value="'.$dom.'" />';
@@ -968,41 +969,56 @@ sub print_review {
                              '<td>'.$autoroster[$env{'form.autodrops'}].'</td>'.
                              '<td>'.&Apache::lonlocal::locallocaltime($startenroll).'</td>'.
                              '<td>'.&Apache::lonlocal::locallocaltime($endenroll).'</td>';
-            $section_values = '<td>';
+            $section_values = '<td><table class="LC_innerpickbox"><tr><th>'.
+                              &mt('Institutional section').'</th>'.
+                              '<th>'.&mt('LON-CAPA section').'</th></tr>';
+            my $secinfo;
             if ($env{'form.sectotal'} > 0) {
                 for (my $i=0; $i<$env{'form.sectotal'}; $i++) {
                     if ($env{'form.sec_'.$i}) {
-                        $section_values .= $env{'form.secnum_'.$i};
+                        $secinfo .= '<tr><td>'.$env{'form.secnum_'.$i}.'</td><td>';
                         if ($env{'form.loncapasec_'.$i} ne '') {
-                            $section_values .= ' => '.$env{'form.loncapasec_'.$i};
+                            $secinfo .= $env{'form.loncapasec_'.$i};
+                        } else {
+                            $secinfo .= &mt('None');
                         }
-                        $section_values .= '<br />';
+                        $secinfo .= '</td></tr>';
                     }
                 }
             }
-            $section_values .= '</td><td>';
+            if ($secinfo eq '') {
+                $secinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';
+            }
+            $section_values .= $secinfo.'</table></td><td>'.
+                               '<table class="LC_innerpickbox"><tr><th>'.
+                               &mt('Institutional course/section').'</th>'.
+                               '<th>'.&mt('LON-CAPA section').'</th></tr>';
+            my $xlistinfo;
             if ($env{'form.crosslisttotal'}) {
                 for (my $i=0; $i<$env{'form.crosslisttotal'}; $i++) {
                     if ($env{'form.crosslist_'.$i}) {
-                        if (ref($codetitles) eq 'ARRAY') {
-                            if (@{$codetitles} > 0) {
-                                foreach my $item (@{$codetitles}) {
-                                    $section_values .= $env{'form.crosslist_'.$i.'_'.$item};
+                        $xlistinfo .= '<tr><td>';
+                        if (ref($code_order) eq 'ARRAY') {
+                            if (@{$code_order} > 0) {
+                                foreach my $item (@{$code_order}) {
+                                    $xlistinfo .= $env{'form.crosslist_'.$i.'_'.$item};
                                 }
-                            } else {
-                                $section_values .= $env{'form.crosslist_'.$i.'_instsec'};
                             }
-                        } else {
-                            $section_values .= $env{'form.crosslist_'.$i.'_instsec'};
                         }
+                        $xlistinfo .= $env{'form.crosslist_'.$i.'_instsec'}.'</td><td>';
                         if ($env{'form.crosslist_'.$i.'_lcsec'}) {
-                            $section_values .= ' => '.$env{'form.crosslist_'.$i.'_lcsec'};                            
+                            $xlistinfo .= $env{'form.crosslist_'.$i.'_lcsec'};
+                        } else {
+                            $xlistinfo .= &mt('None');
                         }
-                        $section_values .= '<br />';
+                        $xlistinfo .= '</td></tr>';
                     }
                 }
             }
-            $section_values .= '</td>';
+            if ($xlistinfo eq '') {
+                $xlistinfo = '<tr><td colspan="2">'.&mt('None').'</td></tr>';
+            }
+            $section_values .= $xlistinfo.'</table></td>';
         }
     }
 
@@ -1076,7 +1092,7 @@ sub print_review {
     my $output =  '<p>'.&mt('Review the details of the course request before submission.').'</p>'.  
                   '<div>'.&Apache::lonhtmlcommon::start_pick_box().
                   &Apache::lonhtmlcommon::row_title(&mt('Owner')).
-                  '<table class="LC_innerpickbox">'.
+                  '<table class="LC_innerpickbox"><tr>'.
                   '<th>'.&mt('Name').'</th>'.
                   '<th>'.&mt('Username:Domain').'</th>'.
                   '<th>'.&mt('E-mail address').'</th>'.
@@ -1085,7 +1101,7 @@ sub print_review {
                   '<td>'.$owneremail.'</td>'.
                   '</tr></table>'."\n".
                   &Apache::lonhtmlcommon::row_closure().
-                  &Apache::lonhtmlcommon::row_title(&mt('Information')).
+                  &Apache::lonhtmlcommon::row_title(&mt('Description')).
                   '<table class="LC_innerpickbox"><tr>'.$inst_headers.'</tr>'."\n".
                   '<tr>'.$inst_values.'</tr></table>'."\n".
                   &Apache::lonhtmlcommon::row_closure().