--- loncom/interface/Attic/londropadd.pm	2006/02/07 16:21:26	1.135
+++ loncom/interface/Attic/londropadd.pm	2006/03/21 18:34:23	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.135 2006/02/07 16:21:26 albertel Exp $
+# $Id: londropadd.pm,v 1.138 2006/03/21 18:34:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,15 +43,9 @@ use Apache::lonlocal;
 ###############################################################
 ###############################################################
 sub header {
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
-    my $title = &mt('LON-CAPA Enrollment Manager');
+    my $start_page=&Apache::loncommon::start_page('Enrollment Manager');
     return(<<ENDHEAD);
-$html
-<head>
-<title>$title</title>
-</head>
-$bodytag
+$start_page
 <form method="post" enctype="multipart/form-data"  
       action="/adm/dropadd" name="studentform">
 ENDHEAD
@@ -172,26 +166,26 @@ sub print_main_menu {
             permission => &Apache::lonnet::auto_run($cnum,$cdom),
             url  => '/adm/populate',
             },
-#          { text => 'Create a new group',
-#            help => 'Course_Create_Group',
-#            permission => $grp_manage_permission,
-#            url => '/adm/coursegroups?refpage=enrl&action=create',
-#            },
-#          { text => 'Modify an existing group',
-#            help => 'Course_Modify_Group',
-#            permission => $grp_manage_permission,
-#            url => '/adm/coursegroups?refpage=enrl&action=modify',
-#            },
-#          { text => 'Delete an existing group',
-#            help => 'Course_Delete_Group',
-#            permission => $grp_manage_permission,
-#            url => '/adm/coursegroups?refpage=enrl&action=delete',
-#            },
-#          { text => 'Enter an existing group',
-#            help => 'Course_Display_Group',
-#            permission => $grp_view_permission,
-#            url => '/adm/coursegroups?refpage=enrl&action=view',
-#            },
+          { text => 'Create a new group',
+            help => 'Course_Create_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=create',
+            },
+          { text => 'Modify an existing group',
+            help => 'Course_Modify_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=modify',
+            },
+          { text => 'Delete an existing group',
+            help => 'Course_Delete_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=delete',
+            },
+          { text => 'Enter an existing group',
+            help => 'Course_Display_Group',
+            permission => $grp_view_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=view',
+            },
           );
     my $menu_html = '';
     foreach my $menu_item (@menu) {
@@ -1295,7 +1289,7 @@ END
 <input type="hidden" name="sdom"   value="" />
 END
         }
-        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphotos'}) {
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
             $r->print('
 <script type="text/javascript">
 function photowindow(photolink) {
@@ -1339,7 +1333,7 @@ function photowindow(photolink) {
        <a href="javascript:document.studentform.sortby.value='end';document.studentform.submit();">$lt{'end'}</a>
     </th>
 END
-        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphotos'}) {
+        if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
             my %photo_options = &Apache::lonlocal::texthash(
                                                             'on' => 'Show',
                                                             'off' => 'Hide',
@@ -1494,7 +1488,7 @@ END
     <td>$end</td>
 END
             if ($env{'course.'.$env{'request.course.id'}.
-			 '.internal.showphotos'}) {
+			 '.internal.showphoto'}) {
                 if ($displayphotos eq 'on') {
                     my $imgurl = 
 			&Apache::lonnet::retrievestudentphoto($domain,
@@ -1586,7 +1580,7 @@ sub print_modify_student_form {
                   '<p>'.
                   &mt('Unable to retrieve environment data for').' '.$sname.
                   &mt('in domain').' '.$sdom.'</p><p>'.
-                  &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p></body></html>');
+                  &mt('Please contact your LON-CAPA administrator regarding this situation.').'</p>'.&Apache::loncommon::end_page());
         return;
     }
     # determine the students starting and ending times and section
@@ -1675,8 +1669,8 @@ $lt{'disn'}
 <p>$current_date_description</p>
 <p>$date_table</p>
 <input type="submit" value="$lt{'sm'}" />
-</body></html>
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -1684,7 +1678,7 @@ END
 # modify a single students section 
 #
 sub modify_single_student {
-    my $r = shift;
+    my ($r) = @_;
     #
     # Remove non alphanumeric values from the section
     $env{'form.section'} =~ s/\W//g;
@@ -1826,8 +1820,8 @@ END
 <input type="hidden" name="sortby" value="$sortby" />
 <input type="hidden" name="Status" value="$status" />
 <a href="javascript:document.studentform.submit();">$Masd</a>
-</body></html>
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -2056,7 +2050,7 @@ sub print_first_courselist_upload_form {
     $str .= &Apache::loncommon::help_open_topic("Course_Convert_To_CSV",
                            &mt("How do I create a CSV file from a spreadsheet")).
                                "<br />\n";
-    $str .= "</body>\n</html>\n";
+    $str .= &Apache::loncommon::end_page();
     $r->print($str);
     return;
 }
@@ -2112,7 +2106,7 @@ sub upfile_drop_add {
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<font color="#ff0000">'.&mt('Error').'</font>'.
                       &mt('Invalid home server specified'));
-            $r->print("</body>\n</html>\n");
+            $r->print(&Apache::loncommon::end_page());
             return;
         }
     }
@@ -2484,7 +2478,7 @@ sub handler {
     }
     #
     # Finish up
-    $r->print('</form></body></html>');
+    $r->print('</form>'.&Apache::loncommon::end_page());
     return OK;
 }