Ticket #3844: sage-3844.patch

sage/server/notebook/css.py

@@ -1421 +1421 @@
     background-color: white;
     padding: 3px;
     overflow:auto;
-    /* width: 100%; */
+    width: 98%; 
     margin-top: 0.5em;
 }
 
@@ -1693 +1693 @@
 blockquote,q {
 quotes:"" ""
 }
-"""
- No newline at end of file
+"""

sage/server/notebook/notebook.py

@@ -1748 +1748 @@
         elif ext in ['.txt', '.tex', '.sage', '.spyx', '.py', '.f', '.f90', '.c']:
             body += '<form method="post" action="savedatafile" enctype="multipart/form-data">'
             body += '<input type="submit" value="Save Changes" name="button_save"> <input type="submit" value="Cancel" name="button_cancel"><br>'
-            body += '<textarea class="edit" name="textfield" rows=17 cols=70 id="textfield">%s</textarea>'%open('%s/%s'%(ws.data_directory(), filename)).read()
+            body += '<textarea class="edit" name="textfield" rows=17 cols=90 id="textfield">%s</textarea>'%open('%s/%s'%(ws.data_directory(), filename)).read()
             body += '<input type="hidden" name="filename" value="%s" id="filename">'%filename
             body += '</form>'
 

sage/server/notebook/tutorial.py

@@ -379 +379 @@
                 ('Input Rules', "Code is evaluated by exec'ing (after preparsing).  Only the output of the last line of the cell is implicitly printed.  If any line starts with \"sage:\" or \">>>\" the entire block is assumed to contain text and examples, so only lines that begin with a prompt are executed.   Thus you can paste in complete examples from the docs without any editing, and you can write input cells that contains non-evaluated plain text mixed with examples by starting the block with \">>>\" or including an example."),
                 ('Working Directory', 'Each block of code is run from its own directory.  If any images are created as a side effect, they will automatically be displayed.'),
             ('DIR variable', 'The variable DIR contains the directory from which you started the SAGE notebook.  For example, to open a file in that directory, do "open(DIR+\'filename\')".'),
-            ('DATA variable', 'The variable DATA contains the directory with data files that you upload into the worksheet.  For example, to open a file in that directory, do "open(DATA+\'filename\')".'),
+            ('Data...', 'Use the Data menu to upload images and other files, and create new files that can be shared between worksheets.  The DATA variable contains the path to the data files.  For example, to open a file in that directory, do "open(DATA+\'filename\')".  If foo.sage is a Sage file that you uploaded, type "load foo.sage"; if foo.py is a Python, you can import it by typing "import foo".'),
             ('Split and join cells', 'Press ctrl-; in a cell to split it into two cells, and ctrl-backspace to join them.  Press ctrl-enter to split a cell and evaluate both pieces.'),
 #                ('Emacs Keybindings', 'If you are using GNU/Linux, you can change (or create) a <tt>.gtkrc-2.0</tt> file.  Add the line <tt>gtk-key-theme-name = "Emacs"</tt> to it.  See <a target="_blank" href="http://kb.mozillazine.org/Emacs_Keybindings_(Firefox)">this page</a> [mozillazine.org] for more details.'),
  #               ('More Help', 'Type "help(sage.server.notebook.notebook)" for a detailed discussion of the architecture of the SAGE notebook and a tutorial (or see the SAGE reference manual).'),

sage/server/notebook/worksheet.py

@@ -2398 +2398 @@
         S = self.sage()
         try:
             cmd = '__DIR__="%s/"; DIR=__DIR__; DATA="%s/"; '%(self.DIR(), os.path.abspath(self.data_directory()))
+            cmd += 'sys.path.append(DATA); '
             cmd += '_support_.init(None, globals()); '
             S._send(cmd)   # non blocking
         except Exception, msg: