--- loncom/interface/spreadsheet/lonspreadsheet.pm	2006/04/06 20:24:13	1.44
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2006/10/31 18:35:51	1.49
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.44 2006/04/06 20:24:13 raeburn Exp $
+# $Id: lonspreadsheet.pm,v 1.49 2006/10/31 18:35:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -266,22 +266,13 @@ sub handler {
     $env{'form.sdomain'} = $domain;
     my $section = &Apache::lonnet::getsection($domain,$name,
 					      $env{'request.course.id'});
-    my $group;
-    my @groups = ();
+    my @groups;
     if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain)) {
-        @groups=&Apache::lonnet::sort_course_groups(
-                                                 $env{'request.course.groups'},
-                                                 $env{'request.course.id'});
+        @groups = &Apache::lonnet::sort_course_groups($env{'request.course.id'},
+                                    split(':',$env{'request.course.groups'}));
     } else {
-        my $grouplist = &Apache::lonnet::get_users_groups($domain,$name,
+        @groups = &Apache::lonnet::get_users_groups($domain,$name,
                                                     $env{'request.course.id'});
-        if ($grouplist) {
-            @groups=&Apache::lonnet::sort_course_groups($grouplist,
-                                                    $env{'request.course.id'});
-        }
-    }
-    if (@groups > 0) {
-        $group = $groups[0];
     }
 
     ##
@@ -334,11 +325,11 @@ sub handler {
     #
     # Header....
     #
-    $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
     ##
     ## Spit out the javascript required for editing
     ##
+    my $js;
     if ($allowed_to_edit) {
 	my %lt=(
 		'ce' => 'Cell',
@@ -347,7 +338,15 @@ sub handler {
 	);
         my $extra_javascript = 
             &Apache::loncommon::browser_and_searcher_javascript();
-        $r->print(<<ENDSCRIPT);
+	
+	my $cell_edit_start = 
+	    &Apache::loncommon::start_page('Cell Edit Window',undef,
+					   {'only_body' => 1,
+					    'js_ready'  => 1,});
+	my $cell_edit_end = 
+	    &Apache::loncommon::end_page({'js_ready'  => 1,});
+
+        $js = <<ENDSCRIPT;
 <script type="text/javascript">
 //<!--
     $extra_javascript
@@ -358,7 +357,7 @@ sub handler {
         var edit_text = '';
         // cellformula may contain less-than and greater-than symbols, so
         // we need to escape them?  
-        edit_text +='<html><head><title>Cell Edit Window</title></head><body>';
+        edit_text +='$cell_edit_start';
         edit_text += '<form name="editwinform">';
         edit_text += '<center><h3>$lt{'ce'} '+cellname+'</h3>';
         edit_text += '<textarea name="newformula" cols="60" rows="12"';
@@ -376,7 +375,7 @@ sub handler {
         edit_text += '<input type="button" name="abort" ';
         edit_text +=     'value="$lt{'dc'}"';
         edit_text += ' onClick="javascript:self.close()" />';
-        edit_text += '</center></body></html>';
+        edit_text += '</center>$cell_edit_end';
 
         if (editwin != null && !(editwin.closed) ) {
             editwin.close();
@@ -396,8 +395,9 @@ ENDSCRIPT
           text  => 'Spreadsheet',
           faq   => 134,
           bug   => 'Spreadsheet'});
-    $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
-              &Apache::lonhtmlcommon::breadcrumbs(undef,'Spreadsheet').
+    $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js).
+              &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet',
+						  'Spreadsheet_About').
               '<form action="'.$r->uri.'" name="sheet" method="post">');
     $r->print(&hiddenfield('sname'  ,$env{'form.sname'}).
               &hiddenfield('sdomain',$env{'form.sdomain'}).
@@ -459,15 +459,15 @@ ENDSCRIPT
     my $spreadsheet = undef;
     if ($sheettype eq 'classcalc') {
         $spreadsheet = Apache::classcalc->new($name,$domain,$filename,undef,
-					      $section,$group);
+					      $section,\@groups);
     } elsif ($sheettype eq 'studentcalc') {
         $spreadsheet = Apache::studentcalc->new($name,$domain,$filename,undef,
-						$section,$group);
+						$section,\@groups);
     } elsif ($sheettype eq 'assesscalc' && 
              defined($symb) && 
              $allowed_to_edit) {
         $spreadsheet = Apache::assesscalc->new($name,$domain,$filename,$symb,
-					       $section,$group);
+					       $section,\@groups);
     } else {
         return HTTP_NOT_ACCEPTABLE;
     }
@@ -550,7 +550,7 @@ END
         $r->rflush();
         $spreadsheet->display($r);
     }
-    $r->print('</form></body></html>');
+    $r->print('</form>'.&Apache::loncommon::end_page());
     $spreadsheet->clear_package();
     return OK;
 }
