--- loncom/interface/Attic/lonspreadsheet.pm	2002/11/08 15:28:03	1.136
+++ loncom/interface/Attic/lonspreadsheet.pm	2002/11/12 20:14:51	1.138
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.136 2002/11/08 15:28:03 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.138 2002/11/12 20:14:51 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1190,6 +1190,7 @@ sub html_editable_cell {
     if ($value =~ /^\s*$/ ) {
         $value = '<font color="'.$bgcolor.'">#</font>';
     }
+    $formula =~ s/\n/\\n/gs;
     $result .= '<a href="javascript:celledit(\''.
         $name.'\',\''.$formula.'\');">'.$value.'</a>';
     return $result;
@@ -1520,7 +1521,6 @@ sub create_excel_spreadsheet {
     my $filename = '/prtspool/'.
         $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
         time.'_'.rand(1000000000).'.xls';
-    #&Apache::lonnet::logthis("spreadsheet:filename = ".$filename);
     my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
     if (! defined($workbook)) {
         $r->log_error("Error creating excel spreadsheet $filename: $!");
@@ -2573,7 +2573,6 @@ sub exportsheet {
     my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
     my $found='';
     if ($oldsheets{$key}) {
-        &Apache::lonnet::logthis("got cached $stype for $uname");
         foreach (split(/___&\___/,$oldsheets{$key})) {
             my ($name,$value)=split(/___=___/,$_);
             if ($name eq $fn) {
@@ -2584,7 +2583,6 @@ sub exportsheet {
     unless ($found) {
         &cachedssheets($sheet,$uname,$udom);
         if ($oldsheets{$key}) {
-            &Apache::lonnet::logthis("got cached $stype for $uname");
             foreach (split(/___&\___/,$oldsheets{$key})) {
                 my ($name,$value)=split(/___=___/,$_);
                 if ($name eq $fn) {
@@ -2723,7 +2721,6 @@ sub cachedssheets {
                 $oldsheets{$key} = $value;
                 $count++;
             }
-            &Apache::lonnet::logthis('saved '.$count.' cached sheets for '.$uname);
             $loadedcaches{$sheet->{'uname'}.'_'.$sheet->{'udom'}}=1;
         }
     }
@@ -2832,17 +2829,45 @@ sub handler {
     # Header....
     #
     $r->print('<html><head><title>LON-CAPA Spreadsheet</title>');
+    my $nothing = "''";
+    if ($ENV{'browser.type'} eq 'explorer') {
+        $nothing = "'javascript:void(0);'";
+    }
+
     if ($ENV{'request.role'} !~ /^st\./) {
         $r->print(<<ENDSCRIPT);
 <script language="JavaScript">
 
-    function celledit(cn,cf) {
-        var cnf=prompt(cn,cf);
-        if (cnf!=null) {
-            document.sheet.unewfield.value=cn;
-            document.sheet.unewformula.value=cnf;
-            document.sheet.submit();
+    var editwin;
+
+    function celledit(cellname,cellformula) {
+        var edit_text = '';
+        edit_text +='<html><head><title>Cell Edit Window</title></head><body>';
+        edit_text += '<form name="editwinform">';
+        edit_text += '<center><h3>Cell '+cellname+'</h3>';
+        edit_text += '<textarea name="newformula" cols="40" rows="6"';
+        edit_text += ' wrap="off" >'+cellformula+'</textarea>';
+        edit_text += '</br>';
+        edit_text += '<input type="button" name="accept" value="Accept"';
+        edit_text += ' onClick=\\\'javascript:';
+        edit_text += 'opener.document.sheet.unewfield.value=';
+        edit_text +=     '"'+cellname+'";';
+        edit_text += 'opener.document.sheet.unewformula.value=';
+        edit_text +=     'document.editwinform.newformula.value;';
+        edit_text += 'opener.document.sheet.submit();';
+        edit_text += 'self.close()\\\' />';
+        edit_text += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        edit_text += '<input type="button" name="abort" ';
+        edit_text +=     'value="Discard Changes"';
+        edit_text += ' onClick="javascript:self.close()" />';
+        edit_text += '</center></body></html>';
+
+        if (editwin != null && !(editwin.closed) ) {
+            editwin.close();
         }
+
+        editwin = window.open($nothing,'CellEditWin','height=200,width=350,scrollbars=no,resizeable=yes,alwaysRaised=yes,dependent=yes',true);
+        editwin.document.write(edit_text);
     }
 
     function changesheet(cn) {
@@ -2861,7 +2886,7 @@ sub handler {
 ENDSCRIPT
     }
     $r->print('</head>'.&Apache::loncommon::bodytag('Grades Spreadsheet').
-              '<form action="'.$r->uri.'" name=sheet method=post>');
+              '<form action="'.$r->uri.'" name="sheet" method="post">');
     $r->print(&hiddenfield('uname',$ENV{'form.uname'}).
               &hiddenfield('udom',$ENV{'form.udom'}).
               &hiddenfield('usymb',$ENV{'form.usymb'}).
