Merge branch 'htmlnotebook_publish' of https://github.com/stefanv/ipython into stefanv-htmlnotebook_publish

IPython/frontend/html/notebook/static/js/notebook_main.js

@@ -32,6 +32,7 @@ $(document).ready(function () {
     IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter');
     IPython.left_panel = new IPython.LeftPanel('div#left_panel', 'div#left_panel_splitter');
     IPython.save_widget = new IPython.SaveWidget('span#save_widget');
+    IPython.print_widget = new IPython.PrintWidget('span#print_widget');
     IPython.notebook = new IPython.Notebook('div#notebook');
     IPython.kernel_status_widget = new IPython.KernelStatusWidget('#kernel_status');
     IPython.kernel_status_widget.status_idle();

IPython/frontend/html/notebook/static/js/savewidget.js

@@ -90,20 +90,23 @@ var IPython = (function (IPython) {
 
 
     SaveWidget.prototype.status_save = function () {
-        this.element.find('span.ui-button-text').text('Save');
+        this.element.find('button#save_notebook').button('option', 'label', 'Save');
         this.element.find('button#save_notebook').button('enable');
-    };    
+        IPython.print_widget.enable();
+    };
 
 
     SaveWidget.prototype.status_saving = function () {
-        this.element.find('span.ui-button-text').text('Saving');
+        this.element.find('button#save_notebook').button('option', 'label', 'Saving');
         this.element.find('button#save_notebook').button('disable');
-    };    
+        IPython.print_widget.disable();
+    };
 
 
     SaveWidget.prototype.status_loading = function () {
-        this.element.find('span.ui-button-text').text('Loading');
+        this.element.find('button#save_notebook').button('option', 'label', 'Loading');
         this.element.find('button#save_notebook').button('disable');
+        IPython.print_widget.disable();
     };    
 
 

IPython/frontend/html/notebook/templates/notebook.html

@@ -68,6 +68,10 @@
                         </select>
                     </span>
                     <span class="section_row_buttons">
+                        <span id="print_widget">
+                            <button id="print_notebook">Print/HTML</button>
+                        </span>
+
                         <button id="download_notebook">Export</button>
                     </span>
                 </div>
@@ -212,6 +216,7 @@
 <script src="static/js/savewidget.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/pager.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/panelsection.js" type="text/javascript" charset="utf-8"></script>
+<script src="static/js/printwidget.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/leftpanel.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/notebook.js" type="text/javascript" charset="utf-8"></script>
 <script src="static/js/notebook_main.js" type="text/javascript" charset="utf-8"></script>