Changeset 2683:555dfe784a86

Timestamp:

01/27/07 00:03:00 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

Cleaned up the doc browser a little (much simpler to use?); fixed some tiny bugs (made more robust).

Location:

sage

Files:

• rings/polynomial_quotient_ring_element.py (modified) (1 diff)
• rings/power_series_ring.py (modified) (1 diff)
• server/notebook/notebook.py (modified) (6 diffs)
• server/notebook/server.py (modified) (2 diffs)
• version.py (modified) (1 diff)

sage/rings/polynomial_quotient_ring_element.py

@@ -9 +9 @@
     -6*a + 2
 
-Next we make a univeriate polynomial ring over $$\Z[x]/(x^3+3x-1)$.
+Next we make a univeriate polynomial ring over $\Z[x]/(x^3+3x-1)$.
     sage: S.<y> = S[]
 

sage/rings/power_series_ring.py

@@ -1 @@
-"""
+r"""
 Univariate Power Series Rings
 

sage/server/notebook/notebook.py

@@ -806 +806 @@
         m = max([len(x) for x in names] + [30])
         for n in names:
+            if n == 'doc_browser': continue
             W = self.__worksheets[n]
             if W == current_worksheet:
@@ -982 +983 @@
         body += '    <a class="history_link" onClick="history_window()">History</a>' + vbar 
         #body += '     <a onClick="toggle_left_pane()" class="worksheets_button" id="worksheets_button">Worksheets</a>' + vbar
-        body += '    <a class="doc_browser" onClick="show_doc_browser()">Documentation</a>' + vbar
+        #body += '    <a class="doc_browser" onClick="show_doc_browser()">Documentation</a>' + vbar
+        body += '    <a href="/doc_browser?/?index.html">Documentation</a>' + vbar
         body += '    <a class="help" onClick="show_help_window()">Help</a>' + vbar
         body += '    <a class="slide_mode" onClick="slide_mode()">Slideshow</a>' 
@@ -1208 +1210 @@
                 ('Hide Cell Input',
                  'Put %hide at the beginning of the cell.  This can be followed by %gap, %latex, %maxima, etc.  Note that %hide must be first.  From the edit screen, use %hideall to hide a complete cell.'),
-                ('Detailed Help',
-                 'Type "help(object)" and press shift-return.'),
+                ('Documentation',
+                 'Click on <a href="/doc_browser?/?index.html">Documentation</a> in the upper right to browse the SAGE tutorial, reference manual, and other documentation.'),
                 ('Insert New Cell',
                  'Put mouse between an output and input until the horizontal line appears and click.  Also if you press control-enter in a cell, a new cell is inserted after it.'),
@@ -1227 +1229 @@
                 ('Attaching Scripts', 'Use "attach filename.sage" or "attach filename.py".  Attached files are automatically reloaded when the file changes.  The file $HOME/.sage/init.sage is attached on startup if it exists.'),
                 ('Downloading and Uploading Worksheets',
-                 'Click <u>Download</u> in the upper right to download a complete worksheet to a local .sws file, and click <u>Upload</u> to upload a saved worksheet to the notebook.  Note that <i>everything</i> that has been submitted is automatically saved to disk when you quit the notebook server (or type "%save_server" into a cell).'),
+                 'Click <u>Download</u> in the upper right to download a complete worksheet to a local .sws file, and click <a href="__upload__.html">Upload</a> to upload a saved worksheet to the notebook.  Note that <i>everything</i> that has been submitted is automatically saved to disk when you quit the notebook server (or type "%save_server" into a cell).'),
                 ('Restart', 'Type "restart" to restart the SAGE interpreter for a given worksheet.  (You have to interrupt first.)'),
                 ('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."),
@@ -1269 +1271 @@
         }
         </style>
+        <h1 align=center><font color='darkred'>SAGE</font> Notebook Quickstart</h1>
         <div class="help_window">
         
@@ -1329 +1332 @@
         body = self._doc_html_body(worksheet_id)
         if worksheet_id is not None:
-            body += '<script language=javascript>worksheet_id="%s"; worksheet_filename="%s"; worksheet_name="%s"; toggle_left_pane(); </script>;'%(worksheet_id, W.filename(), W.name())
+           body += '<script language=javascript>worksheet_id="%s"; worksheet_filename="%s"; worksheet_name="%s"; toggle_left_pane(); </script>;'%(worksheet_id, W.filename(), W.name())
 
         return """

sage/server/notebook/server.py

@@ -459 +459 @@
     #  Doc-browser functionality
     #######################################################################
+    # TODO: this will not work right on a multi-user system, since if
+    # multiple people viewer the browser at the same time and eval cells,
+    # this will conflict. 
 
     def doc_browser(self, path):
@@ -507 +510 @@
         W = worksheet
         Wid = W.id()
-        s = notebook.doc_html(Wid, css_href)
-        self.wfile.write(s)
+        #s = notebook.doc_html(Wid, css_href)
+        #self.wfile.write(s)
+        self.show_page(Wid)
+        #s = notebook.html(Wid)
     
     #######################################################################

sage/version.py

@@ -1 +1 @@
 """nodoctests"""
-version='1.8.2.1'; date='2007-01-24'
+version='1.9.alpha1'; date='2007-01-26'