Ticket #6568: sage-trac-6568.5.patch

sage/server/notebook/notebook.py

@@ -1328 +1328 @@
         """
         worksheet = self.get_worksheet_with_filename(filename)
         return template("notebook/worksheet.html", worksheet_name = worksheet.name(),
-                 worksheet_html = worksheet.html(include_title=False, do_print=do_print))
+                 worksheet_html = worksheet.html(include_title=False, do_print=do_print),
+                        do_print = do_print)
 
     
 

sage/server/notebook/templates/notebook/beforepublish_window.html

@@ -11 +11 @@
 - sage_jsmath_macros - an array containing strings of Javascript of Sage macros for jsMath
 #}
 
-{% set title = '<p>You can publish your worksheet to the Internet, where anyone will be able to access and view it online.</p><p>Your worksheet will be assigned a unique address (URL) that you can send to your friends and colleagues.</p><p>Do you want to publish this worksheet?</p><form method="get" action="."><input type="hidden" name="yes" value="" /><input type="submit" value="Yes" style="margin-left:10px" /><input type="button" value="No" style="margin-left:5px" onClick="parent.location=\\\'../\'"><br/><br/><input type="checkbox" name="auto" style="margin-left:13px" /> Automatically re-publish when changes are made</form>' %}
+{% set title = '<p>You can publish your worksheet to the Internet, where anyone will be able to access and view it online.</p><p>Your worksheet will be assigned a unique address (URL) that you can send to your friends and colleagues.</p><p>Do you want to publish this worksheet?</p><form method="get" action="."><input type="hidden" name="yes" value="" /><input type="submit" value="Yes" style="margin-left:10px" /><input type="button" value="No" style="margin-left:5px" onClick="parent.location=\'../\'"><br/><br/><input type="checkbox" name="auto" style="margin-left:13px" /> Automatically re-publish when changes are made</form>' %}
 {% set select = "publish" %}
 {% set backwards = true %}
+ No newline at end of file

sage/server/notebook/templates/notebook/worksheet.html

@@ -3 +3 @@
 INPUT:
      - worksheet_name - a string containing a worksheet's name
      - worksheet_html - a string containing the html for a worksheet
+     - do_print - a boolean stating whether to render a print version of the
+                  worksheet
   #}
 {% extends "base.html" %}
 

sage/server/notebook/templates/worksheet/published_worksheet.html

@@ -2 +2 @@
 INPUT:
 - cell_id_list - a list of cell id's
 - cells_html - string of cells HTML
-- do_print - a boolean
 #}
 {% set published = true %}
 {% set do_print = true %}

sage/server/notebook/templates/worksheet/worksheet.html

@@ -10 +10 @@
 {% include "worksheet/worksheet_body.html" %}
 
 {% if do_print %}
-<script language=javascript>jsMath.ProcessBeforeShowing();</script>
+<script language="javascript">jsMath.ProcessBeforeShowing();</script>
 {% else %}
 <script type="text/javascript">cell_id_list={{ cell_id_list }};</script>
 {% endif %}