Ticket #3636: trac3636_1.patch

a/sage/server/notebook/all.py

@@ -14 +14 @@
-
-from sagetex import sagetex
-
-
+, text_control

a/sage/server/notebook/interact.py

@@ -1001 +1001 @@
-        return html_slider('slider-%s-%s'%(self.var(), self.cell_id()),
-                           s, self.interact(), steps=len(self.__values),
-                           default=self.default_position())
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class InteractCanvas:
-    def __init__(self, controls, id):
@@ -1092 +1131 @@
-            sage: sage.server.notebook.interact.InteractCanvas([B], 3).render_controls()
-            '<table>...'
-        """
-
-
+
+
+
+
+
+
+
-        return '<table>%s</table>'%tbl_body
-
-    def wrap_in_outside_frame(self, inside):
@@ -1980 +2024 @@
-                        nrows=self.__nrows, ncols=self.__ncols, width=self.__width,
-                        buttons=self.__buttons)
-    
+class text_control(control):
+    def __init__(self, value):
+        """
+        Text that can be inserted among other interact controls.
+
+        INPUT:
+            value -- HTML for the control
+
+        EXAMPLES:
+            sage: text_control('something')
+            Text field: something
+        """
+        self.__default = value
+        control.__init__(self, '')
+
+    def __repr__(self):
+        """
+        Return print representation of this control. 
+
+        EXAMPLES:
+            sage: text_control('something')
+            Text field: something
+        """
+        return "Text field: %s"%self.__default
+
+    def render(self, var):
+        """
+        Return rendering of the text field 
+        
+        INPUT:
+            var -- a string (variable; one of the variable names input to f)
+
+        OUTPUT:
+            TextControl -- a TextControl instance
+        """
+        return TextControl(var, self.__default)
+
-
-def automatic_control(default):
-    """