--- loncom/interface/slotrequest.pm	2009/04/23 17:33:54	1.95
+++ loncom/interface/slotrequest.pm	2009/10/15 23:53:46	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.95 2009/04/23 17:33:54 bisitz Exp $
+# $Id: slotrequest.pm,v 1.104 2009/10/15 23:53:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -707,7 +707,8 @@ $lt{'or'}
 STUFF
 
     if (!$inhibit_return_link) { 
-        $r->print(&mt('or').'</p>').&return_link($r);
+        $r->print(&mt('or').'</p>');
+        &return_link($r);
     } else {
         $r->print('</p>');
     }
@@ -1434,8 +1435,6 @@ sub manage_reservations {
              .&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
              .'<br />'
              .&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.')
-             .'</p><p>'
-             .&mt('Your reservation status for any such assignments is listed below:')
              .'</p>'
     );
     if (!defined($navmap)) {
@@ -1450,7 +1449,11 @@ sub manage_reservations {
     my @backgrounds = ("LC_odd_row","LC_even_row");
     my $numcolors = scalar(@backgrounds);
     my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
-    $r->print('<table class="LC_data_table LC_tableOfContent">'."\n");
+    my $slotheader = '<p>'.
+                 &mt('Your reservation status for any such assignments is listed below:').
+                 '</p>'.
+                 '<table class="LC_data_table LC_tableOfContent">'."\n";
+    my $shownheader = 0;
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
     while (my $resource = $it->next()) {
         if ($resource == $it->BEGIN_MAP()) {
@@ -1545,11 +1548,19 @@ sub manage_reservations {
                     foreach my $item (@maprows) {
                         $rownum ++;
                         my $bgcolor = $backgrounds[$rownum % $numcolors];
+                        if (!$shownheader) {
+                            $r->print($slotheader);
+                            $shownheader = 1;
+                        }
                         $r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n");
                     }
                 }
                 $rownum ++;
                 my $bgcolor = $backgrounds[$rownum % $numcolors];
+                if (!$shownheader) {
+                    $r->print($slotheader);
+                    $shownheader = 1;
+                }
                 $r->print('<tr class="'.$bgcolor.'"><td>'."\n");
                 for (my $i=0; $i<$depth; $i++) {
                     $r->print('<img src="'.$location.'" alt="" />');
@@ -1584,11 +1595,13 @@ sub manage_reservations {
             }
         }
     }
+    if ($shownheader) {
+        $r->print('</table>');
+    }
     if (!$reservable) {
         $r->print('<span class="LC_info">'.&mt('No course items currently require a reservation to gain access.').'</span>');
     }
-    $r->print('</table>'.
-              '<p><a href="/adm/slotrequest?command=showresv">'.
+    $r->print('<p><a href="/adm/slotrequest?command=showresv">'.
               &mt('Reservation History').'</a></p>');
 }
 
@@ -1599,9 +1612,9 @@ sub show_map_row {
         $output .= '<img src="'.$location.'" alt="" />';
     }
     if ($type eq 'page') {
-        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";
+        $output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
     } else {
-        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
+        $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
     }
     $output .= $title.'</td><td colspan="2">&nbsp;</td>'."\n";
     unshift (@{$maprows},$output);
@@ -1735,7 +1748,7 @@ ENDSCRIPT
         }
     } else {
         $r->print('<span class="LC_info">'
-                 .&mt('There are no transactions to display')
+                 .&mt('There are no transactions to display.')
                  .'</span>'
         );
     }
@@ -1932,7 +1945,7 @@ function chgPage(caller) {
 ENDSCRIPT
         }
     } else {
-        $r->print(&mt('There are no records to display'));
+        $r->print(&mt('There are no records to display.'));
     }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               '<input type="hidden" name="slotname" value="'.$env{'form.slotname'}.'" />'.
@@ -2051,36 +2064,41 @@ sub display_filter {
     }
     $output .= '<td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
                &mt('Update Display').'" /></tr></table>'.
-               '<span class="LC_roleslog_note">'.
-               &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.8.99.0 or later are displayed.');
+               '<p class="LC_info">'.
+               &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+                  ,'2.9.0');
     if ($version) {
-        $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);
+        $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
     }
-    $output .= '</span><hr noshade><br />';
+    $output .= '</p><hr /><br />';
     return $output;
 }
 
 sub upload_start {
     my ($r)=@_;    
-    $r->print(&Apache::grades::checkforfile_js());
-    my $result.='<table width="100%" border="0"><tr bgcolor="#E6FFFF"><td>'."\n";
-    $result.='&nbsp;<b>'.
-	&mt('Specify a file containing the slot definitions.').
-	'</b></td></tr>'."\n";
-    $result.='<tr bgcolor="#ffffe6"><td>'."\n";
-    my $upfile_select=&Apache::loncommon::upfile_select_html();
-    my $ignore=&mt('Ignore First Line');
-    $result.=<<ENDUPFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<input type="hidden" name="command" value="csvuploadmap" />
-$upfile_select
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Data" />
-<label><input type="checkbox" name="noFirstLine" />$ignore</label>
-</form>
-ENDUPFORM
-    $result.='</td></tr></table>'."\n";
-    $result.='</td></tr></table>'."\n";
-    $r->print($result);
+    $r->print(
+        &Apache::grades::checkforfile_js()
+       .'<h3>'.&mt('Specify a file containing the slot definitions.').'</h3>'
+       .'<form method="post" enctype="multipart/form-data"'
+       .' action="/adm/slotrequest" name="slotupload">'
+       .'<input type="hidden" name="command" value="csvuploadmap" />'
+       .&Apache::lonhtmlcommon::start_pick_box()
+       .&Apache::lonhtmlcommon::row_title(&mt('File'))
+       .&Apache::loncommon::upfile_select_html()
+       .&Apache::lonhtmlcommon::row_closure()
+       .&Apache::lonhtmlcommon::row_title(
+            '<label for="noFirstLine">'
+           .&mt('Ignore First Line')
+           .'</label>')
+       .'<input type="checkbox" name="noFirstLine" id="noFirstLine" />'
+       .&Apache::lonhtmlcommon::row_closure(1)
+       .&Apache::lonhtmlcommon::end_pick_box()
+       .'<p>'
+       .'<input type="button" onclick="javascript:checkUpload(this.form);"'
+       .' value="'.&mt('Next').'" />'
+       .'</p>'
+      .'</form>'
+    );
 }
 
 sub csvuploadmap_header {
@@ -2102,8 +2120,8 @@ sub csvuploadmap_header {
 Total number of records found in file: $distotal <hr />
 Enter as many fields as you can. The system will inform you and bring you back
 to this page if the data selected is insufficient to create the slots.<hr />
-<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
-<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
+<input type="button" value="Reverse Association" onclick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<label><input type="checkbox" name="noFirstLine"$checked />$ignore</label>
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
 <input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
@@ -2127,7 +2145,7 @@ sub csvuploadmap_footer {
 </table>
 <input type="hidden" name="nfields" value="$i" />
 <input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onClick="javascript:verify(this.form)" value="$buttontext" /><br />
+<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br />
 </form>
 ENDPICK
 }