--- loncom/interface/spreadsheet/lonspreadsheet.pm	2006/04/06 20:24:13	1.44
+++ loncom/interface/spreadsheet/lonspreadsheet.pm	2009/06/05 12:24:14	1.54
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.44 2006/04/06 20:24:13 raeburn Exp $
+# $Id: lonspreadsheet.pm,v 1.54 2009/06/05 12:24:14 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,12 +73,12 @@ use HTML::Entities();
 sub textfield {
     my ($title,$name,$value)=@_;
     return "\n<p><b>$title:</b><br />".
-        '<input type=text name="'.$name.'" size=80 value="'.$value.'" />';
+        '<input type="text" name="'.$name.'" size="80" value="'.$value.'" />';
 }
 
 sub hiddenfield {
     my ($name,$value)=@_;
-    return '<input type=hidden name="'.$name.'" value="'.$value.'" />'."\n";
+    return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'."\n";
 }
 
 sub selectbox {
@@ -86,7 +86,7 @@ sub selectbox {
     my $selout="\n<p><b>$title:</b><br />".'<select name="'.$name.'">';
     foreach (sort keys(%options)) {
         $selout.='<option value="'.$_.'"';
-        if ($_ eq $value) { $selout.=' selected'; }
+        if ($_ eq $value) { $selout.=' selected="selected"'; }
         $selout.='>'.&mt($options{$_}).'</option>';
     }
     return $selout.'</select>';
@@ -140,11 +140,11 @@ sub file_dialogs {
     if ($spreadsheet->is_default()) {
         $filename = 'Default';
     }
-    my $save_dialog = '<nobr>'.
+    my $save_dialog = '<span class="LC_nobreak">'.
         '<input type="submit" name="save" value="'.&mt('Save as').'" /> '.
         '<input type="text" name="savefilename" size="30" value="'.
         $truefilename.'" />'.
-        '</nobr>';
+        '</span>';
     my $makedefault_dialog = '<input type="submit" name="makedefault" '.
         'value="'.&mt('Save as & Make This Sheet the Default').'"/>';
     #
@@ -154,9 +154,9 @@ sub file_dialogs {
     my $load_dialog = <<END;
 <table bgcolor="$bgcolor">
 <tr><td><input type="submit" name="load" value="$load" /></td>
-    <td><nobr>
+    <td><span class="LC_nobreak">
         <input type="text" name="loadfilename" size="20" value="$filename" />
-        $link</nobr>
+        $link</span>
     </td></tr>
 <tr><td>&nbsp;</td><td>
     <select name="fileselect" onchange="document.sheet.loadfilename.value=document.sheet.fileselect.value" >
@@ -165,17 +165,18 @@ END
     foreach my $sheetfilename ($spreadsheet->othersheets()) {
         $load_dialog .= '    <option value="'.$sheetfilename.'"';
         if ($filename eq $sheetfilename) {
-            $load_dialog .= ' selected';
+            $load_dialog .= ' selected="selected"';
             $default_filename_set = 1;
         }
         $load_dialog .= '>'.$sheetfilename."</option>\n";
     }
     $load_dialog .= "</select>\n</td><td>&nbsp;</td></tr>\n</table>\n";
         #
+    my $headline = &mt('File Dialogs');
     $result .=<<END;
 <!-- 
     <fieldset title="File Dialogs" >
-    <legend>File Dialogs</legend>
+    <legend>$headline</legend>
   -->
 <!-- load / save dialogs -->
 <table cellspacing="2">
@@ -266,22 +267,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 +326,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 +339,20 @@ sub handler {
 	);
         my $extra_javascript = 
             &Apache::loncommon::browser_and_searcher_javascript();
-        $r->print(<<ENDSCRIPT);
+	
+	my $cell_extra_js   = &Apache::loncommon::resize_textarea_js();
+	my $cell_edit_start = 
+	    &Apache::loncommon::start_page('Cell Edit Window',$cell_extra_js,
+					   {'only_body' => 1,
+					    'js_ready'  => 1,
+					    'add_entries'  => {
+						'onresize' => "resize_textarea('LC_newformula','LC_aftertextarea')",
+						'onload'   => "resize_textarea('LC_newformula','LC_aftertextarea')",
+					    }});
+	my $cell_edit_end = 
+	    &Apache::loncommon::end_page({'js_ready'  => 1,});
+
+        $js = <<ENDSCRIPT;
 <script type="text/javascript">
 //<!--
     $extra_javascript
@@ -358,12 +363,13 @@ 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"';
-        edit_text += ' wrap="off" >'+cellformula+'</textarea>';
-        edit_text += '</br>';
+        edit_text += '<textarea id="LC_newformula" name="newformula" ';
+        edit_text += ' cols="60" rows="12"; wrap="off" style="width:100%">';
+	edit_text += cellformula+'</textarea>';
+        edit_text += '<div id="LC_aftertextarea"><br />';
         edit_text += '<input type="button" name="accept" value="$lt{'ac'}"';
         edit_text += ' onClick=\\\'javascript:';
         edit_text += 'opener.document.sheet.cell.value=';
@@ -376,7 +382,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></div></form>$cell_edit_end';
 
         if (editwin != null && !(editwin.closed) ) {
             editwin.close();
@@ -384,6 +390,7 @@ sub handler {
 
         editwin = window.open($nothing,'CellEditWin','height=280,width=480,scrollbars=no,resizable=yes,alwaysRaised=yes,dependent=yes',true);
         editwin.document.write(edit_text);
+        editwin.document.close();
     }
 //-->
 </script>
@@ -396,8 +403,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 +467,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 +558,7 @@ END
         $r->rflush();
         $spreadsheet->display($r);
     }
-    $r->print('</form></body></html>');
+    $r->print('</form>'.&Apache::loncommon::end_page());
     $spreadsheet->clear_package();
     return OK;
 }