Changeset 7944:f53a4900be48

Timestamp:

01/04/08 18:17:08 (5 years ago)

Author:

mabshoff@…

Branch:

default

Parents:

7941:4330d50e65f7 (diff), 7943:0068bcfdf101 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

Location:

sage/server/notebook

Files:

• cell.py (modified) (1 diff)
• cell.py (modified) (1 diff)
• css.py (modified) (1 diff)
• css.py (modified) (1 diff)
• js.py (modified) (1 diff)
• js.py (modified) (5 diffs)

sage/server/notebook/cell.py

@@ -536 +536 @@
               onInput    = 'cell_input_resize(this); return true;'
               onBlur     = 'cell_blur(%s); return true;'
-              onFocus    = 'this.className = "cell_input_active"; return true;'
+              onFocus    = 'this.className = "cell_input_active"; set_class("eval_button%s","eval_button_active"); return true;'
               %s
            >%s</textarea>
-        """%(cls, r, ncols, id, id, id, id,'readonly=1' if do_print else '', t)
+        """%(cls, r, ncols, id, id, id, id, id, 'readonly=1' if do_print else '', t)
+
+        if not do_print:
+           s+= '<a href="javascript:evaluate_cell(%s,0)" class="eval_button" id="eval_button%s">evaluate</a>'%(id,id)
 
         t = t.replace("<","&lt;")+" "

sage/server/notebook/cell.py

@@ -603 +603 @@
                     size = F[i+5:-5]
                 else:
-                    size = 400
-                script = 'jmolSetDocument(cell_writer); jmolApplet(%s, "script %s?");' % (size, url)
-                images.append('<script>%s</script>' % script)
-            elif F.endswith('.pmesh'):
+                    size = 500
+
+                #popup  = """<br><a href="javascript:jmol_popup('%s');">Enlarge</a>"""%url
+                #script = '<script>jmol_applet(%s, "%s");</script>%s' % (size, url, popup)
+                #script = '<script>jmol_popup("%s");</script>' % (url)
+
+                script = '<div><script>jmol_applet(%s, "%s");</script></div>' % (size, url)
+                images.append(script)
+            elif F.endswith('.jmol.zip'):
                 pass # jmol data
             else:

sage/server/notebook/css.py

@@ -1050 +1050 @@
 }
 
-
-
-span.cell_evaluate {
+a.eval_button {
+  display:none;
+}
+a.eval_button_active {
+  display: block;
   position: relative;
   top: 2px;
-  cursor:pointer;
+  margin:0px;
+  padding:0px;
+  font-size:8pt;
 }
 

sage/server/notebook/css.py

@@ -1589 +1589 @@
    background-color: #990000;   
 }
-
 """
     if color == 'gmail':

sage/server/notebook/js.py

@@ -1221 +1221 @@
     if(cell == null) return;
 
+    setTimeout("set_class('eval_button"+id+"','eval_button')", 100); //this is unclickable if we don't add a little delay.
+
     /* Disable coloring and change to div for now */
     cell.className="cell_input";
     cell_input_minimize_size(cell);
     return true;  /* disable for now */
-
 
     cell.className="hidden";

sage/server/notebook/js.py

@@ -29 +29 @@
     s = async_lib()
     s += notebook_lib()
+    s += jmol_lib()
 
     return s
 
 
+def jmol_lib():
+    s = r"""
+function jmol_applet(size, url) {
+    jmolSetDocument(cell_writer);
+    jmolApplet(size, "script " + url);
+}
+
+function jmol_popup(url) {
+    win = window.open ("", "jmol viewer", "width=600,height=600,resizable=1,statusbar=0");
+    win.document.body.innerHTML = "";
+    win.document.title = "Sage 3d Viewer";
+    win.document.writeln("<h1 align=center>Sage 3d Viewer</h1>");
+    jmolSetDocument(win.document);
+    jmolApplet("100%", "script" + url);
+    win.focus(); 
+}
+    """
+
+    return s
 
 def async_lib():
@@ -801 +821 @@
     window.open ("/history", 
       "", "menubar=1,scrollbars=1,width=800,height=600, toolbar=1,resizable=1");
-
 }
 
@@ -1870 +1889 @@
 }
 
+/* When the page is loaded, let javascript write
+ * directly to the document. After that, make sure 
+ * javascript writes to a CellWriter object. */
+
 function CellWriter() {
     function write(s) {
@@ -1878 +1901 @@
 }
 
-var cell_writer = new CellWriter();
+cell_writer = document;
 
 function eval_script_tags(text) {
@@ -1887 +1910 @@
        var code = s.slice(8+i,j);
        try {
-           cell_writer.buffer = "";
+           cell_writer = new CellWriter();
            window.eval(code);
        } catch(e) {